Fix line endings

Author: janhohenheim

.gitattributes

@@ -1 +1,2 @@
 * text=auto eol=lf
+*.sln text eol=crlf

.gitignore

@@ -9,7 +9,4 @@ assets/scenes/*-[1-9].scn.ron
 blender_assets.cats.txt*
 *.blend1
 
-installer/
-Trunk.toml
-
 trace-*.json

assets/config/config.game.toml

@@ -1,37 +1,37 @@
-[camera]
-mouse_sensitivity_x = 8e-4
-mouse_sensitivity_y = 5e-4
-
-[camera.fixed_angle]
-min_distance = 10.0
-max_distance = 20.0
-zoom_speed = 0.7
-rotation_smoothing = 1.0
-translation_smoothing = 0.9
-zoom_in_smoothing = 0.2
-zoom_out_smoothing = 1.2
-pitch = -80.0
-
-[camera.first_person]
-translation_smoothing = 0.05
-rotation_smoothing = 0.1
-max_pitch = 80
-min_pitch = -80
-tracking_smoothing = 1.5
-
-[camera.third_person]
-translation_smoothing = 1.2
-rotation_smoothing = 0.5
-tracking_smoothing = 1.0
-max_pitch = 80
-min_pitch = -80
-min_distance = 1.0
-max_distance = 10.0
-zoom_speed = 0.7
-min_distance_to_objects = 4e-1
-zoom_in_smoothing = 0.2
-zoom_out_smoothing = 1.2
-
-[player]
-sprint_effect_speed_threshold = 8.1
-
+[camera]
+mouse_sensitivity_x = 8e-4
+mouse_sensitivity_y = 5e-4
+
+[camera.fixed_angle]
+min_distance = 10.0
+max_distance = 20.0
+zoom_speed = 0.7
+rotation_smoothing = 1.0
+translation_smoothing = 0.9
+zoom_in_smoothing = 0.2
+zoom_out_smoothing = 1.2
+pitch = -80.0
+
+[camera.first_person]
+translation_smoothing = 0.05
+rotation_smoothing = 0.1
+max_pitch = 80
+min_pitch = -80
+tracking_smoothing = 1.5
+
+[camera.third_person]
+translation_smoothing = 1.2
+rotation_smoothing = 0.5
+tracking_smoothing = 1.0
+max_pitch = 80
+min_pitch = -80
+min_distance = 1.0
+max_distance = 10.0
+zoom_speed = 0.7
+min_distance_to_objects = 4e-1
+zoom_in_smoothing = 0.2
+zoom_out_smoothing = 1.2
+
+[player]
+sprint_effect_speed_threshold = 8.1
+

build/macos/create_icns.sh

@@ -1,65 +1,65 @@
-use bevy::prelude::*;
-
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, PartialEq, Reflect, Asset, Serialize, Deserialize, Default, Resource)]
-#[reflect(Serialize, Deserialize, Resource)]
-pub(crate) struct GameConfig {
-    pub(crate) camera: Camera,
-    pub(crate) player: PlayerEffects,
-}
-
-#[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize, Default)]
-#[reflect(Serialize, Deserialize)]
-pub(crate) struct Camera {
-    pub(crate) fixed_angle: FixedAngle,
-    pub(crate) first_person: FirstPerson,
-    pub(crate) third_person: ThirdPerson,
-    pub(crate) mouse_sensitivity_x: f32,
-    pub(crate) mouse_sensitivity_y: f32,
-}
-
-#[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize, Default)]
-#[reflect(Serialize, Deserialize)]
-pub(crate) struct FixedAngle {
-    pub(crate) min_distance: f32,
-    pub(crate) max_distance: f32,
-    pub(crate) zoom_speed: f32,
-    pub(crate) rotation_smoothing: f32,
-    pub(crate) translation_smoothing: f32,
-    pub(crate) zoom_in_smoothing: f32,
-    pub(crate) zoom_out_smoothing: f32,
-    pub(crate) pitch: f32,
-}
-
-#[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize, Default)]
-#[reflect(Serialize, Deserialize)]
-pub(crate) struct FirstPerson {
-    pub(crate) translation_smoothing: f32,
-    pub(crate) rotation_smoothing: f32,
-    pub(crate) max_pitch: f32,
-    pub(crate) min_pitch: f32,
-    pub(crate) tracking_smoothing: f32,
-}
-
-#[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize, Default)]
-#[reflect(Serialize, Deserialize)]
-pub(crate) struct ThirdPerson {
-    pub(crate) translation_smoothing: f32,
-    pub(crate) rotation_smoothing: f32,
-    pub(crate) max_pitch: f32,
-    pub(crate) min_pitch: f32,
-    pub(crate) min_distance: f32,
-    pub(crate) max_distance: f32,
-    pub(crate) zoom_speed: f32,
-    pub(crate) min_distance_to_objects: f32,
-    pub(crate) tracking_smoothing: f32,
-    pub(crate) zoom_in_smoothing: f32,
-    pub(crate) zoom_out_smoothing: f32,
-}
-
-#[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize, Default)]
-#[reflect(Serialize, Deserialize)]
-pub(crate) struct PlayerEffects {
-    pub(crate) sprint_effect_speed_threshold: f32,
-}
+use bevy::prelude::*;
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, PartialEq, Reflect, Asset, Serialize, Deserialize, Default, Resource)]
+#[reflect(Serialize, Deserialize, Resource)]
+pub(crate) struct GameConfig {
+    pub(crate) camera: Camera,
+    pub(crate) player: PlayerEffects,
+}
+
+#[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize, Default)]
+#[reflect(Serialize, Deserialize)]
+pub(crate) struct Camera {
+    pub(crate) fixed_angle: FixedAngle,
+    pub(crate) first_person: FirstPerson,
+    pub(crate) third_person: ThirdPerson,
+    pub(crate) mouse_sensitivity_x: f32,
+    pub(crate) mouse_sensitivity_y: f32,
+}
+
+#[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize, Default)]
+#[reflect(Serialize, Deserialize)]
+pub(crate) struct FixedAngle {
+    pub(crate) min_distance: f32,
+    pub(crate) max_distance: f32,
+    pub(crate) zoom_speed: f32,
+    pub(crate) rotation_smoothing: f32,
+    pub(crate) translation_smoothing: f32,
+    pub(crate) zoom_in_smoothing: f32,
+    pub(crate) zoom_out_smoothing: f32,
+    pub(crate) pitch: f32,
+}
+
+#[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize, Default)]
+#[reflect(Serialize, Deserialize)]
+pub(crate) struct FirstPerson {
+    pub(crate) translation_smoothing: f32,
+    pub(crate) rotation_smoothing: f32,
+    pub(crate) max_pitch: f32,
+    pub(crate) min_pitch: f32,
+    pub(crate) tracking_smoothing: f32,
+}
+
+#[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize, Default)]
+#[reflect(Serialize, Deserialize)]
+pub(crate) struct ThirdPerson {
+    pub(crate) translation_smoothing: f32,
+    pub(crate) rotation_smoothing: f32,
+    pub(crate) max_pitch: f32,
+    pub(crate) min_pitch: f32,
+    pub(crate) min_distance: f32,
+    pub(crate) max_distance: f32,
+    pub(crate) zoom_speed: f32,
+    pub(crate) min_distance_to_objects: f32,
+    pub(crate) tracking_smoothing: f32,
+    pub(crate) zoom_in_smoothing: f32,
+    pub(crate) zoom_out_smoothing: f32,
+}
+
+#[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize, Default)]
+#[reflect(Serialize, Deserialize)]
+pub(crate) struct PlayerEffects {
+    pub(crate) sprint_effect_speed_threshold: f32,
+}

src/file_system_interaction/config.rs

@@ -1,16 +1,16 @@
-use bevy::prelude::*;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Eq, PartialEq, Component, Reflect, Serialize, Deserialize, Default)]
-#[reflect(Component, Serialize, Deserialize)]
-pub(crate) struct UiCamera;
-
-pub(crate) fn spawn_ui_camera(mut commands: Commands) {
-    commands.spawn((Camera2dBundle::default(), UiCamera, Name::new("UI Camera")));
-}
-
-pub(crate) fn despawn_ui_camera(mut commands: Commands, query: Query<Entity, With<UiCamera>>) {
-    for entity in &query {
-        commands.entity(entity).despawn_recursive();
-    }
-}
+use bevy::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Eq, PartialEq, Component, Reflect, Serialize, Deserialize, Default)]
+#[reflect(Component, Serialize, Deserialize)]
+pub(crate) struct UiCamera;
+
+pub(crate) fn spawn_ui_camera(mut commands: Commands) {
+    commands.spawn((Camera2dBundle::default(), UiCamera, Name::new("UI Camera")));
+}
+
+pub(crate) fn despawn_ui_camera(mut commands: Commands, query: Query<Entity, With<UiCamera>>) {
+    for entity in &query {
+        commands.entity(entity).despawn_recursive();
+    }
+}

src/player_control/camera/ui.rs

@@ -1,11 +1,11 @@
-use crate::player_control::actions::ActionsFrozen;
-use bevy::prelude::*;
-
-pub(crate) fn is_frozen(actions_frozen: Res<ActionsFrozen>) -> bool {
-    actions_frozen.is_frozen()
-}
-
-#[allow(unused)]
-pub(crate) fn never() -> bool {
-    false
-}
+use crate::player_control::actions::ActionsFrozen;
+use bevy::prelude::*;
+
+pub(crate) fn is_frozen(actions_frozen: Res<ActionsFrozen>) -> bool {
+    actions_frozen.is_frozen()
+}
+
+#[allow(unused)]
+pub(crate) fn never() -> bool {
+    false
+}