Merge pull request #82 from FilipRuman/minor-hud-&-improvements

Minor hud improvements

Author: FilipRuman

godot/Bike/HUD/BikeHudMain.cs

@@ -45,10 +45,10 @@ public override void _Process(double delta) {
             workoutLength.Text = $"{(int)workout.totalTime_s / 60}";
             totalDescent.Text = $"{(int)workout.totalDescent}";
             totalAscent.Text = $"{(int)workout.totalAscent}";
-            caloriesBurnt.Text = $"{(int)workout.caloriesBurnt}󰆘";
+            caloriesBurnt.Text = $"{(int)(workout.caloriesBurnt)}󰆘";
 
             cadence.Text = $" {bikeInput.currentCadence_RPM}";
-            cadenceAvr.Text = $"{workout.averageCadence}";
+            cadenceAvr.Text = $"{((int)workout.averageCadence)}";
 
             speed.Text = $"{(int)bikePhysics.speed_kmH}󰓅";
             speedAvr.Text = $"{(int)workout.averageSpeed_kmH}";
@@ -57,7 +57,7 @@ public override void _Process(double delta) {
             powerAvr.Text = $"{(int)workout.averageWatts}";
 
             heartRate.Text = $"{bikeInput.heartRate}";
-            heartRateAvr.Text = $"{workout.averageHeartRate}";
+            heartRateAvr.Text = $"{((int)workout.averageHeartRate)}";
 
             fps.Text = $"FPS: {Engine.GetFramesPerSecond()}";
             base._Process(delta);

godot/Bike/HUD/hud.tscn

@@ -287,27 +287,35 @@ alignment = 1
 [node name="totalDescent" type="Label" parent="workout stat/VBoxContainer"]
 layout_mode = 2
 size_flags_vertical = 6
+tooltip_text = "total descent in meters made during whole activity"
+mouse_filter = 1
 theme_type_variation = &"H2Label"
 text = "100"
 horizontal_alignment = 1
 
 [node name="totalAscent" type="Label" parent="workout stat/VBoxContainer"]
 layout_mode = 2
 size_flags_vertical = 6
+tooltip_text = "total ascent in meters made during whole activity"
+mouse_filter = 1
 theme_type_variation = &"H2Label"
 text = "200"
 horizontal_alignment = 1
 
 [node name="caloriesBurnt" type="Label" parent="workout stat/VBoxContainer"]
 layout_mode = 2
 size_flags_vertical = 6
+tooltip_text = "kcalories burnt during whole activity"
+mouse_filter = 1
 theme_type_variation = &"H2Label"
 text = "1300󰆘"
 horizontal_alignment = 1
 
 [node name="workoutLength" type="Label" parent="workout stat/VBoxContainer"]
 layout_mode = 2
 size_flags_vertical = 6
+tooltip_text = "total workout length in minutes"
+mouse_filter = 1
 theme_type_variation = &"H2Label"
 text = "120"
 horizontal_alignment = 1

godot/Menu/menu_main.tscn

@@ -235,6 +235,7 @@ visible = false
 [node name="heart rate device type" type="Node" parent="Panel/contents/device connection/HSplitContainer/device types/VBoxContainer2/heart rate tracker " node_paths=PackedStringArray("display")]
 script = ExtResource("7_lqkny")
 display = NodePath("..")
+bluetoothDeviceTypeName = "hr tracker"
 glyphIcon = " "
 
 [node name="other device type 󰤟" parent="Panel/contents/device connection/HSplitContainer/device types/VBoxContainer2" node_paths=PackedStringArray("icon") instance=ExtResource("6_bexj6")]

godot/Workout/Wourkout.cs

@@ -22,7 +22,7 @@ public class Workout {
         public float averageWatts;
         public float caloriesBurnt;
         const float humanMetabolicEfficiency = .24f;
-        const float julesToCalories = 4.184f;
+        const float julesToCalories = 1f / 4184f;
 
         public float totalAscent;
         public float totalDescent;
@@ -65,7 +65,8 @@ float currentHeight
             averageHeartRate = totalHeartRate / totalTime_s;
             averageSpeed_kmH = totalSpeed_kmH / totalTime_s;
             averageWatts = totalPower / totalTime_s;
-            caloriesBurnt = averageWatts * totalTime_s * humanMetabolicEfficiency * julesToCalories;
+
+            caloriesBurnt = averageWatts * totalTime_s * julesToCalories / humanMetabolicEfficiency;
         }
 
         public static Workout Load(string name) {