Feature/fancy terrain

Cargo.toml

@@ -12,17 +12,20 @@ bevy_rapier3d = "0.28.0"
 cgmath = "0.18.0"
 iyes_perf_ui = { git = "https://github.com/IyesGames/iyes_perf_ui.git", branch = "main" }
 noise = "0.9.0"
-bevy_renet = { version = "1.0.0" }
+bevy_renet = { git = "https://github.com/CuddlyBunion341/renet.git" }
 bincode = "1.3.3"
 rand = "0.8.5"
-renet = "1.0.0"
+renet = { git = "https://github.com/CuddlyBunion341/renet.git" }
 serde = { version = "1.0.203", features = ["derive"] }
 serde-big-array = "0.5.1"
 chrono = "0.4.38"
 rayon = "1.10.0"
 bevy_flair = "0.1.0"
-bevy-inspector-egui = "0.28.1"
-renet_visualizer = { version = "1.0.0", features = ["bevy"] }
+bevy-inspector-egui = "0.29"
+renet_visualizer = { git = "https://github.com/CuddlyBunion341/renet.git", features = [
+  "bevy",
+] }
+egui_plot = "0.30.0"
 
 [profile.dev.package."*"]
 opt-level = 3
@@ -39,10 +42,23 @@ name = "server"
 path = "src/server/main.rs"
 
 [features]
+default = ["chat"]
+dynamic_linking = ["bevy/dynamic_linking"]
+
+# both
+chat = ["dynamic_linking"]
+
+# server
+renet_visualizer = ["egui_layer"]
+generator_visualizer = ["egui_layer"]
+egui_layer = []
+skip_chunk_padding = []
+
+# client
 wireframe = []
 debug_ui = []
-renet_visualizer = []
+ortho_camera = []
+lock_player = []
 physics_debug = []
 raycast_debug = []
 visual_debug = ["wireframe", "physics_debug", "raycast_debug"]
-

README.md

@@ -59,3 +59,7 @@ Strongly inspired by the [Bevy NixOS installation guide](https://github.com/bevy
 nix-shell --run "cargo run --bin server"
 nix-shell --run "cargo run --bin client"
 ```
+
+## Notes
+
+Checkout the [Wiki](https://github.com/CuddlyBunion341/rsmc/wiki) for additional project information.

src/client/main.rs

@@ -62,6 +62,7 @@ fn main() {
         collider::ColliderPlugin,
         player::PlayerPlugin,
         remote_player::RemotePlayerPlugin,
+        #[cfg(feature = "chat")]
         chat::ChatPlugin,
     ));
     app.insert_state(GameState::Playing);

src/client/networking/systems.rs

@@ -9,8 +9,11 @@ pub fn receive_message_system(
     mut block_update_events: ResMut<Events<terrain_events::BlockUpdateEvent>>,
     mut chunk_manager: ResMut<ChunkManager>,
     mut chunk_mesh_events: ResMut<Events<terrain_events::ChunkMeshUpdateEvent>>,
-    mut chat_events: ResMut<Events<chat_events::ChatSyncEvent>>,
-    mut single_chat_events: ResMut<Events<chat_events::SingleChatSendEvent>>,
+    mut world_regenerate_events: ResMut<Events<terrain_events::WorldRegenerateEvent>>,
+    #[cfg(feature = "chat")] mut chat_events: ResMut<Events<chat_events::ChatSyncEvent>>,
+    #[cfg(feature = "chat")] mut single_chat_events: ResMut<
+        Events<chat_events::SingleChatSendEvent>,
+    >,
     mut spawn_area_loaded: ResMut<terrain_resources::SpawnAreaLoaded>,
 ) {
     while let Some(message) = client.receive_message(DefaultChannel::ReliableOrdered) {
@@ -35,10 +38,12 @@ pub fn receive_message_system(
                         from_network: true,
                     });
                 }
+                #[cfg(feature = "chat")]
                 NetworkingMessage::ChatMessageSync(messages) => {
                     info!("Client received {} chat messages", messages.len());
                     chat_events.send(chat_events::ChatSyncEvent(messages));
                 }
+                #[cfg(feature = "chat")]
                 NetworkingMessage::SingleChatMessageSync(message) => {
                     info!("Client received chat message {}", message.message);
                     single_chat_events.send(chat_events::SingleChatSendEvent(message));
@@ -91,6 +96,10 @@ pub fn receive_message_system(
                     player_sync_events
                         .send(remote_player_events::RemotePlayerSyncEvent { players: event });
                 }
+                NetworkingMessage::ServerAsksClientNicelyToRerequestChunkBatch() => {
+                    info!("Client asked for chunk batch.");
+                    world_regenerate_events.send(terrain_events::WorldRegenerateEvent);
+                }
                 _ => {
                     warn!("Received unknown message type. (ReliableUnordered)");
                 }

src/client/player/systems/controller.rs

@@ -1,14 +1,28 @@
 use crate::prelude::*;
 
+#[cfg(not(feature = "lock_player"))]
 const SPAWN_POINT: Vec3 = Vec3::new(0.0, 32.0, 0.0);
+#[cfg(feature = "lock_player")]
+const SPAWN_POINT: Vec3 = Vec3::new(128.0, 96.0, -128.0);
 
 pub fn setup_player_camera(mut commands: Commands) {
     commands.spawn((
+        Name::new("Player cam?"),
         Camera3d::default(),
+        #[cfg(not(feature = "ortho_camera"))]
         Projection::Perspective(PerspectiveProjection {
             fov: TAU / 5.0,
             ..default()
         }),
+        #[cfg(feature = "ortho_camera")]
+        Projection::Orthographic(OrthographicProjection {
+            scale: 0.125,
+            near: 0.0001,
+            far: 1000.0,
+            viewport_origin: Vec2::new(0.5, 0.5),
+            scaling_mode: ScalingMode::WindowSize,
+            area: Rect::new(-1.0, -1.0, 1.0, 1.0),
+        }),
         RenderPlayer {
             logical_entity: Entity::from_raw(0),
         },
@@ -36,6 +50,9 @@ pub fn setup_controller_on_area_ready_system(
             },
             ActiveEvents::COLLISION_EVENTS,
             Velocity::zero(),
+            #[cfg(feature = "lock_player")]
+            RigidBody::Fixed,
+            #[cfg(not(feature = "lock_player"))]
             RigidBody::Dynamic,
             Sleeping::disabled(),
             LockedAxes::ROTATION_LOCKED,
@@ -44,9 +61,16 @@ pub fn setup_controller_on_area_ready_system(
             Ccd { enabled: true }, // Prevent clipping when going fast
             Transform::from_translation(SPAWN_POINT),
             LogicalPlayer,
+            #[cfg(not(feature = "lock_player"))]
+            FpsControllerInput {
+                pitch: -TAU / 20.0,
+                yaw: TAU * 5.0 / 12.0,
+                ..default()
+            },
+            #[cfg(feature = "lock_player")]
             FpsControllerInput {
-                pitch: -TAU / 12.0,
-                yaw: TAU * 5.0 / 8.0,
+                pitch: 0.0,
+                yaw: 0.0,
                 ..default()
             },
             FpsController {

src/client/terrain/events.rs

@@ -11,3 +11,6 @@ pub struct BlockUpdateEvent {
     pub block: BlockId,
     pub from_network: bool,
 }
+
+#[derive(Event)]
+pub struct WorldRegenerateEvent;