workspace improvements + support more platforms for hot reloading

Author: mrDIMAS

Cargo.toml

@@ -2,10 +2,21 @@
 members = ["editor", "executor", "game", "executor-wasm", "game-dylib"]
 resolver = "2"
 
+# Separate build profiles for hot reloading. These profiles ensures that build artifacts for
+# hot reloading will be placed into their own folders and does not interfere with standard (static)
+# linking.
+[profile.dev-hot-reload]
+inherits = "dev"
+[profile.release-hot-reload]
+inherits = "release"
+
 [profile.dev.package."*"]
 opt-level = 3
 
 [workspace.dependencies.fyrox]
 path = "../Fyrox/fyrox"
+default-features = false
 [workspace.dependencies.fyroxed_base]
 path = "../Fyrox/editor"
+default-features = false
+

data/maps/drake.rgs

@@ -4,13 +4,11 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-fish_fall = { path = "../game",optional = true }
+fish_fall = { path = "../game", optional = true }
 
 [dependencies.fyroxed_base]
-version = "0.20.1"
-path = "../../Fyrox/editor"
-features = ["dylib_engine"]
+workspace = true
 
 [features]
-default = ["fish_fall"]
-dylib = []
+default = ["fish_fall", "fyroxed_base/default"]
+dylib = ["fyroxed_base/dylib_engine"]

editor/Cargo.toml

@@ -10,19 +10,20 @@ fn main() {
     }));
 
     #[cfg(feature = "dylib")]
-    editor
-        .add_dynamic_plugin(
-            // TODO: Windows-only
-            "fish_fall_dylib.dll",
-            true,
-            true,
-        )
-        .unwrap();
+    {
+        #[cfg(target_os = "windows")]
+        let file_name = "game_dylib.dll";
+        #[cfg(target_os = "linux")]
+        let file_name = "libgame_dylib.so";
+        #[cfg(target_os = "macos")]
+        let file_name = "libgame_dylib.dylib";
+        editor.add_dynamic_plugin(file_name, true, true).unwrap();
+    }
 
     #[cfg(not(feature = "dylib"))]
     {
         use fish_fall::Game;
-        editor.add_plugin(Game::new());
+        editor.add_game_plugin(Game::new());
     }
 
     editor.run(event_loop)

editor/src/main.rs

@@ -6,8 +6,8 @@ edition = "2021"
 [dependencies]
 fyrox = { version = "0.33.1", path = "../../Fyrox/fyrox", default-features = false, features = ["dylib"] }
 fish_fall = { path = "../game", optional = true }
-fish_fall_dylib = { path = "../game-dylib", optional = true }
+game_dylib = { path = "../game-dylib", optional = true }
 
 [features]
 default = ["fish_fall"]
-dylib = ["fish_fall_dylib"]
+dylib = ["game_dylib"]

executor/Cargo.toml

@@ -19,14 +19,15 @@ fn main() {
     );
 
     #[cfg(feature = "dylib")]
-    executor
-        .add_dynamic_plugin(
-            // TODO: Windows-only
-            "fish_fall_dylib.dll",
-            true,
-            true,
-        )
-        .unwrap();
+    {
+        #[cfg(target_os = "windows")]
+        let file_name = "game_dylib.dll";
+        #[cfg(target_os = "linux")]
+        let file_name = "libgame_dylib.so";
+        #[cfg(target_os = "macos")]
+        let file_name = "libgame_dylib.dylib";
+        executor.add_dynamic_plugin(file_name, true, true).unwrap();
+    }
 
     #[cfg(not(feature = "dylib"))]
     {

executor/src/main.rs

@@ -1,10 +1,14 @@
 [package]
-name = "fish_fall_dylib"
+name = "game_dylib"
 version = "0.1.0"
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-fish_fall = { path = "../game" }
+fish_fall = { path = "../game", default-features = false }
+
+[features]
+default = ["fish_fall/default"]
+dylib-engine = ["fish_fall/dylib-engine"]

game-dylib/Cargo.toml

@@ -9,4 +9,8 @@ strum_macros = "0.26.1"
 serde = { version = "1.0.174", features = ["derive"] }
 walkdir = "2.4.0"
 ron = "0.8.1"
-fyrox = { version = "0.33.1", path = "../../Fyrox/fyrox", default-features = false, features = ["dylib"] }
+fyrox = { workspace = true }
+
+[features]
+default = ["fyrox/default"]
+dylib-engine = ["fyrox/dylib"]

game/Cargo.toml

@@ -1,14 +1,11 @@
 //! Main player (host) script.
 
 use crate::actor::ActorKind;
-use crate::net::{InstanceDescriptor, ServerMessage};
 use crate::{
     actor::{Actor, ActorMessage},
     net::ClientMessage,
     CameraController, Event, Game,
 };
-use fyrox::core::futures::executor::block_on;
-use fyrox::resource::model::{Model, ModelResourceExtension};
 use fyrox::{
     core::{
         algebra::{UnitQuaternion, Vector3},
@@ -206,33 +203,6 @@ impl ScriptTrait for Player {
             return;
         }
 
-        // Spawn a ball on left mouse button click.
-        if let Event::WindowEvent { event, .. } = event {
-            if let WindowEvent::MouseInput { button, state, .. } = event {
-                if *button == MouseButton::Left && *state == ElementState::Pressed {
-                    if let Some(server) = game.server.as_mut() {
-                        if let Ok(ball_prefab) = block_on(
-                            ctx.resource_manager
-                                .request::<Model>("data/models/cannon_ball.rgs"),
-                        ) {
-                            let rigid_body = &ctx.scene.graph[self.actor.rigid_body];
-                            let forward_vec = rigid_body.look_vector();
-                            let self_position = rigid_body.global_position();
-                            server.broadcast_message_to_clients(ServerMessage::Instantiate(vec![
-                                InstanceDescriptor {
-                                    path: ball_prefab.kind().path().unwrap().to_path_buf(),
-                                    position: self_position + forward_vec,
-                                    rotation: Default::default(),
-                                    velocity: Default::default(),
-                                    ids: ball_prefab.generate_ids(),
-                                },
-                            ]));
-                        }
-                    }
-                }
-            }
-        }
-
         let this = &ctx.scene.graph[ctx.handle];
         if self.input_controller.on_os_event(
             event,
@@ -376,7 +346,6 @@ impl ScriptTrait for Player {
 
                 ctx.scene.graph[self.model]
                     .local_transform_mut()
-                    .set_scale(Vector3::repeat(0.01))
                     .set_rotation(UnitQuaternion::from_axis_angle(
                         &Vector3::y_axis(),
                         180.0f32.to_radians() + self.model_angle.angle(),

game/src/player.rs

@@ -32,8 +32,6 @@ pub enum Action {
 #[visit(optional)]
 pub struct Trigger {
     action: InheritableVariable<Action>,
-    lulw: i32,
-    azaza: i32,
 }
 
 impl ScriptTrait for Trigger {