Merge pull request #22 from jameshiew/improv

Small fixes
jameshiew · Nov 30, 2024 · 7a6457a · 7a6457a
2 parents 66c369d + 28a4063
commit 7a6457a
Show file tree

Hide file tree

Showing 56 changed files with 139 additions and 137 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,9 +5,6 @@ edition = "2021"
 publish = false
 rust-version = "1.80.1"
 
-[lib]
-path = "src/lib/mod.rs"
-
 [dependencies]
 bevy = { version = "0.14.2" }
 bevy_common_assets = { version = "0.11.0", features = ["ron"] }

diff --git a/README.md b/README.md
@@ -5,8 +5,8 @@ This is a demo for Minecraft-like procedural generation using the [Bevy game eng
 - chunks along all axes (X, Y and Z)
 - adjustable zoom level for viewing a world at different levels of detail
 
-![Main screenshot](screenshots/main.png "Screenshot")
-![Zoomed out screenshot](screenshots/zoomed_out.png "Zoomed out")
+![Main screenshot](screenshots/main.webp "Screenshot")
+![Zoomed out screenshot](screenshots/zoomed_out.webp "Zoomed out")
 
 ## Quickstart
 

diff --git a/assets/shaders/line_material.wgsl b/assets/shaders/line_material.wgsl
@@ -1,10 +1,11 @@
+// From lines example of Bevy - https://github.com/bevyengine/bevy/blob/release-0.14.2/assets/shaders/line_material.wgsl 
 #import bevy_pbr::forward_io::VertexOutput
 
 struct LineMaterial {
     color: vec4<f32>,
 };
 
-@group(1) @binding(0) var<uniform> material: LineMaterial;
+@group(2) @binding(0) var<uniform> material: LineMaterial;
 
 @fragment
 fn fragment(

diff --git a/screenshots/main.png b/screenshots/main.png
diff --git a/screenshots/main.webp b/screenshots/main.webp
diff --git a/screenshots/zoomed_out.png b/screenshots/zoomed_out.png
diff --git a/screenshots/zoomed_out.webp b/screenshots/zoomed_out.webp
diff --git a/src/lib/camera/input.rs → src/camera/input.rs b/src/lib/camera/input.rs → src/camera/input.rs
diff --git a/src/lib/camera/mod.rs → src/camera/mod.rs b/src/lib/camera/mod.rs → src/camera/mod.rs
diff --git a/src/lib/camera/settings.rs → src/camera/settings.rs b/src/lib/camera/settings.rs → src/camera/settings.rs
@@ -27,6 +27,7 @@ pub fn setup(mut commands: Commands, config: Res<Config>) {
     transform.rotation.y = config.rotation_y;
     transform.rotation.z = config.rotation_z;
     transform.rotation.w = config.rotation_w;
+    transform.rotation = transform.rotation.normalize();
     dbg!(transform.rotation);
     commands
         .spawn((

diff --git a/src/lib/chunks/mod.rs → src/chunks/mod.rs b/src/lib/chunks/mod.rs → src/chunks/mod.rs
diff --git a/src/lib/chunks/registry.rs → src/chunks/registry.rs b/src/lib/chunks/registry.rs → src/chunks/registry.rs
diff --git a/src/lib/chunks/tasks.rs → src/chunks/tasks.rs b/src/lib/chunks/tasks.rs → src/chunks/tasks.rs
diff --git a/src/lib/common/backends/file.rs → src/common/backends/file.rs b/src/lib/common/backends/file.rs → src/common/backends/file.rs
diff --git a/src/lib/common/backends/mod.rs → src/common/backends/mod.rs b/src/lib/common/backends/mod.rs → src/common/backends/mod.rs
diff --git a/src/lib/common/chunks.rs → src/common/chunks.rs b/src/lib/common/chunks.rs → src/common/chunks.rs
diff --git a/src/lib/common/mod.rs → src/common/mod.rs b/src/lib/common/mod.rs → src/common/mod.rs
diff --git a/src/lib/common/world.rs → src/common/world.rs b/src/lib/common/world.rs → src/common/world.rs
diff --git a/src/lib/common/zoom.rs → src/common/zoom.rs b/src/lib/common/zoom.rs → src/common/zoom.rs
diff --git a/src/lib/cursor.rs → src/cursor.rs b/src/lib/cursor.rs → src/cursor.rs
diff --git a/src/lib/debug/chunk_borders.rs → src/debug/chunk_borders.rs b/src/lib/debug/chunk_borders.rs → src/debug/chunk_borders.rs
@@ -1,7 +1,7 @@
+/// Adapted from lines example of Bevy - https://github.com/bevyengine/bevy/blob/release-0.14.2/examples/3d/lines.rs
 use crate::common::chunks::CHUNK_SIZE_F32;
 use bevy::render::mesh::MeshVertexBufferLayoutRef;
 use bevy::render::render_asset::RenderAssetUsages;
-/// Adapted from lines example of Bevy
 use bevy::{
     pbr::{MaterialPipeline, MaterialPipelineKey},
     prelude::*,
@@ -31,11 +31,13 @@ pub struct LineList {
 
 impl From<LineList> for Mesh {
     fn from(line: LineList) -> Self {
-        let mut mesh = Mesh::new(PrimitiveTopology::LineList, RenderAssetUsages::default());
-
         let vertices: Vec<_> = line.lines.into_iter().flat_map(|(a, b)| [a, b]).collect();
-        mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, vertices);
-        mesh
+        let count = vertices.len();
+
+        Mesh::new(PrimitiveTopology::LineList, RenderAssetUsages::RENDER_WORLD)
+            .with_inserted_attribute(Mesh::ATTRIBUTE_POSITION, vertices)
+            // arbitrary normal
+            .with_inserted_attribute(Mesh::ATTRIBUTE_NORMAL, vec![Vec3::Y; count])
     }
 }
 

diff --git a/src/lib/debug/info.rs → src/debug/info.rs b/src/lib/debug/info.rs → src/debug/info.rs
@@ -21,15 +21,15 @@ pub fn display_debug_info(
     let (camera_wpos, mut camera) = camera.single_mut();
     egui::Window::new("Performance").show(egui.ctx_mut(), |ui| {
         ui.label(format!(
-            "FPS: {:.02}",
+            "FPS: {:.0}",
             diagnostics
                 .get(&FrameTimeDiagnosticsPlugin::FPS)
                 .unwrap()
                 .average()
                 .unwrap_or_default()
         ));
         ui.label(format!(
-            "Entities: {}",
+            "Entities: {:.0}",
             diagnostics
                 .get(&EntityCountDiagnosticsPlugin::ENTITY_COUNT)
                 .unwrap()

diff --git a/src/lib/debug/mod.rs → src/debug/mod.rs b/src/lib/debug/mod.rs → src/debug/mod.rs
diff --git a/src/lib/debug/wireframe.rs → src/debug/wireframe.rs b/src/lib/debug/wireframe.rs → src/debug/wireframe.rs
diff --git a/src/lib/extras/block_ids.rs → src/extras/block_ids.rs b/src/lib/extras/block_ids.rs → src/extras/block_ids.rs
diff --git a/src/lib/extras/chunks.rs → src/extras/chunks.rs b/src/lib/extras/chunks.rs → src/extras/chunks.rs
diff --git a/src/lib/extras/mod.rs → src/extras/mod.rs b/src/lib/extras/mod.rs → src/extras/mod.rs
diff --git a/src/lib/extras/worldgen.rs → src/extras/worldgen.rs b/src/lib/extras/worldgen.rs → src/extras/worldgen.rs
diff --git a/src/lib/extras/worldgen/alternating.rs → src/extras/worldgen/alternating.rs b/src/lib/extras/worldgen/alternating.rs → src/extras/worldgen/alternating.rs
diff --git a/src/lib/extras/worldgen/bordered_towers.rs → src/extras/worldgen/bordered_towers.rs b/src/lib/extras/worldgen/bordered_towers.rs → src/extras/worldgen/bordered_towers.rs
diff --git a/src/lib/extras/worldgen/bowl.rs → src/extras/worldgen/bowl.rs b/src/lib/extras/worldgen/bowl.rs → src/extras/worldgen/bowl.rs
diff --git a/src/lib/extras/worldgen/experiment1.rs → src/extras/worldgen/experiment1.rs b/src/lib/extras/worldgen/experiment1.rs → src/extras/worldgen/experiment1.rs
diff --git a/src/lib/extras/worldgen/flat.rs → src/extras/worldgen/flat.rs b/src/lib/extras/worldgen/flat.rs → src/extras/worldgen/flat.rs
diff --git a/src/lib/extras/worldgen/layered.rs → src/extras/worldgen/layered.rs b/src/lib/extras/worldgen/layered.rs → src/extras/worldgen/layered.rs
diff --git a/src/lib/extras/worldgen/mountain_islands.rs → src/extras/worldgen/mountain_islands.rs b/src/lib/extras/worldgen/mountain_islands.rs → src/extras/worldgen/mountain_islands.rs
diff --git a/src/lib/extras/worldgen/perlin_noise.rs → src/extras/worldgen/perlin_noise.rs b/src/lib/extras/worldgen/perlin_noise.rs → src/extras/worldgen/perlin_noise.rs
diff --git a/src/lib/extras/worldgen/random.rs → src/extras/worldgen/random.rs b/src/lib/extras/worldgen/random.rs → src/extras/worldgen/random.rs
diff --git a/src/lib/extras/worldgen/single_block.rs → src/extras/worldgen/single_block.rs b/src/lib/extras/worldgen/single_block.rs → src/extras/worldgen/single_block.rs
diff --git a/src/lib/extras/worldgen/water.rs → src/extras/worldgen/water.rs b/src/lib/extras/worldgen/water.rs → src/extras/worldgen/water.rs
diff --git a/src/lib/fake_client/mod.rs → src/fake_client/mod.rs b/src/lib/fake_client/mod.rs → src/fake_client/mod.rs
diff --git a/src/lib/mod.rs → src/lib.rs b/src/lib/mod.rs → src/lib.rs
diff --git a/src/main.rs b/src/main.rs
@@ -3,7 +3,7 @@ use std::process::ExitCode;
 use bevy::{
     log::LogPlugin,
     prelude::*,
-    window::{Window, WindowPlugin, WindowResolution},
+    window::{Window, WindowPlugin},
     DefaultPlugins,
 };
 use config::Config;
@@ -46,7 +46,6 @@ fn main() -> ExitCode {
                 .set(ImagePlugin::default_nearest())
                 .set(WindowPlugin {
                     primary_window: Some(Window {
-                        resolution: WindowResolution::new(1920., 1080.),
                         title: APP_NAME.into(),
                         ..default()
                     }),

diff --git a/src/lib/mesh/block.rs → src/mesh/block.rs b/src/lib/mesh/block.rs → src/mesh/block.rs
diff --git a/src/lib/mesh/faces.rs → src/mesh/faces.rs b/src/lib/mesh/faces.rs → src/mesh/faces.rs
diff --git a/src/lib/mesh/mod.rs → src/mesh/mod.rs b/src/lib/mesh/mod.rs → src/mesh/mod.rs
diff --git a/src/lib/mesh/shapes.rs → src/mesh/shapes.rs b/src/lib/mesh/shapes.rs → src/mesh/shapes.rs
diff --git a/src/lib/mesh/textures.rs → src/mesh/textures.rs b/src/lib/mesh/textures.rs → src/mesh/textures.rs
diff --git a/src/lib/render/mesh.rs → src/render/mesh.rs b/src/lib/render/mesh.rs → src/render/mesh.rs
diff --git a/src/lib/render/mod.rs → src/render/mod.rs b/src/lib/render/mod.rs → src/render/mod.rs
diff --git a/src/lib/scene/assets.rs → src/scene/assets.rs b/src/lib/scene/assets.rs → src/scene/assets.rs
diff --git a/src/lib/scene/handle.rs → src/scene/handle.rs b/src/lib/scene/handle.rs → src/scene/handle.rs
diff --git a/src/lib/scene/lights.rs → src/scene/lights.rs b/src/lib/scene/lights.rs → src/scene/lights.rs
diff --git a/src/lib/scene/mod.rs → src/scene/mod.rs b/src/lib/scene/mod.rs → src/scene/mod.rs
diff --git a/src/lib/scene/visible_chunks.rs → src/scene/visible_chunks.rs b/src/lib/scene/visible_chunks.rs → src/scene/visible_chunks.rs
diff --git a/src/lib/settings.rs → src/settings.rs b/src/lib/settings.rs → src/settings.rs