Merge pull request #287 from janhohenheim/blender-workflow

Former-commit-id: 1b4dc26

Author: janhohenheim

Cargo.lock

@@ -2,7 +2,7 @@
 authors = ["Jan Hohenheim <[email protected]>"]
 edition = "2021"
 name = "foxtrot"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT OR Apache-2.0"
 exclude = [
     "dist/",
@@ -22,44 +22,36 @@ dev = ["dep:bevy_editor_pls"]
 tracing = ["bevy/trace_chrome"]
 
 [dependencies]
+# keep the following in sync with Bevy's dependencies
+## https://github.com/bevyengine/bevy/blob/v0.12.1/crates/bevy_winit/Cargo.toml#L31
+winit = { version = "0.28.7", default-features = false }
+## https://github.com/bevyengine/bevy/blob/v0.12.1/crates/bevy_render/Cargo.toml#L57
+image = { version = "0.24", default-features = false }
+
 bevy_kira_audio = "0.18"
 bevy_asset_loader = { version = "0.19", features = ["progress_tracking"] }
 bevy_common_assets = { version = "0.9", features = ["ron", "toml"] }
 bevy_egui = "0.24"
 serde = { version = "1", features = ["derive"] }
-indexmap = { version = "2", features = ["serde"] }
-strum = "0.26"
-strum_macros = "0.26"
-ron = "0.8"
-regex = "1"
-chrono = "0.4"
-glob = "0.3"
+serde_json = "1"
 oxidized_navigation = { version = "0.8", features = ["xpbd", "debug_draw"] }
-bitflags = "2"
 iyes_progress = "0.10"
 unicode-segmentation = "1"
 anyhow = "1"
 # Activate the egui feature when https://github.com/Leafwing-Studios/leafwing-input-manager/pull/442 lands
 leafwing-input-manager = { version = "0.11", features = [] }
-rand = { version = "0.8", features = ["small_rng"] }
 bevy_dolly = "0.0.2"
-spew = "0.4"
 bevy_mod_sysfail = "5"
 seldom_fn_plugin = "0.5"
 bevy_editor_pls = { version = "0.7", optional = true }
 bevy_hanabi = "0.9"
-
 bevy_yarnspinner = "0.1"
 bevy_yarnspinner_example_dialogue_view = "0.1"
-
-# keep the following in sync with Bevy's dependencies
-## https://github.com/bevyengine/bevy/blob/v0.12.1/crates/bevy_winit/Cargo.toml#L31
-winit = { version = "0.28.7", default-features = false }
-## https://github.com/bevyengine/bevy/blob/v0.12.1/crates/bevy_render/Cargo.toml#L57
-image = { version = "0.24", default-features = false }
 bevy-tnua-xpbd3d = "0.1"
 bevy_xpbd_3d = { version = "0.3", features = ["simd"] }
 bevy-tnua = "0.14.1"
+ron = "0.8.1"
+bevy_atmosphere = "0.8.1"
 
 [dependencies.bevy]
 version = "0.12.1"

Cargo.toml

@@ -20,9 +20,9 @@ min_pitch = -80
 tracking_smoothing = 1.5
 
 [camera.third_person]
-translation_smoothing = 0.9
+translation_smoothing = 1.2
 rotation_smoothing = 0.5
-tracking_smoothing = 0.8
+tracking_smoothing = 1.0
 max_pitch = 80
 min_pitch = -80
 min_distance = 1.0
@@ -32,16 +32,6 @@ min_distance_to_objects = 4e-1
 zoom_in_smoothing = 0.2
 zoom_out_smoothing = 1.2
 
-[characters]
-model_sync_smoothing = 0.15
-rotation_smoothing = 1.0
-
 [player]
-rotate_to_speaker_smoothness = 3.0
-sprint_effect_speed_threshold = 7.0
-fov_saturation_speed = 12.0
-min_fov = 0.75
-max_fov = 1.5
+sprint_effect_speed_threshold = 8.1
 
-[dialog]
-base_letters_per_second = 60.0

assets/config/config.game.toml

@@ -0,0 +1 @@
+fbcb45c48a2f7d1b4ca0489bc3c88ece57745805

assets/levels/old_town.lvl.ron

@@ -0,0 +1 @@
+f4d227b6f3d4864327321e6b0fccbdb056a359c3