water

Author: TiernanDeFranco

demos/Demo3D/res/scenes/demos/water.scn

@@ -729,19 +729,20 @@ parent = @FloatCrateF
 parent = @WaterDemo
     [WaterBody3D]
         shape = { type = "cube" size = (100, 15, 100) }
-        fidelity = 0.12
+        fidelity = 0.05
         depth = 8.0
-        wave_speed = 0.52
-        wave_scale = 0.72
-        wave_length = 16.0
+        wave_speed = 0.35
+        wave_scale = 0.75
+        wave_length = 24.0
         buoyancy = 4.0
         drag = 0.55
+        idle = "calm"
         foam_strength = 1.05
         sample_readback_rate = 1
-        shallow_depth = 7.5
+        shallow_depth = 1.0
         deep_color = (0.0, 0.018, 0.075, 1.0)
         shallow_color = (0.010, 0.115, 0.18, 1.0)
-        material = { transparency = 0.0 reflectivity = 0.58 roughness = 0.16 fresnel_power = 4.2 normal_strength = 1.85 ripple_scale = 0.74 foam_color = (0.76, 0.93, 1.0, 1.0) foam_amount = 0.88 crest_foam_threshold = 0.42 caustic_strength = 0.05 refraction_strength = 0.02 scattering_strength = 0.05 distance_fog_strength = 0.58 }
+        material = { transparency = 0.0 reflectivity = 0.58 roughness = 0.24 fresnel_power = 4.2 normal_strength = 1.95 ripple_scale = 0.74 foam_color = (0.78, 0.95, 1.0, 1.0) foam_amount = 0.89 crest_foam_threshold = 0.42 caustic_strength = 0.05 refraction_strength = 0.02 scattering_strength = 0.05 distance_fog_strength = 0.58 }
         lod_near = 25
         lod_mid = 100
         lod_far = 500.0

demos/Demo3D/res/scripts/demo_profiling_overlay.rs

@@ -6,7 +6,9 @@ const FPS_LABEL_NODE_NAME: &str = "profiling_overlay_fps";
 const SIM_LABEL_NODE_NAME: &str = "profiling_overlay_sim";
 const GRAPHICS_LABEL_NODE_NAME: &str = "profiling_overlay_graphics";
 const ROW_NODE_NAME: &str = "profiling_overlay_row";
-const REFRESH_SECONDS: f32 = 1.0;
+
+const REFRESH_SECONDS: f32 = 2.0;
+const PROFILE_SAMPLE_EVERY_FRAMES: u32 = 60;
 
 #[State]
 struct DemoProfilingOverlayState {
@@ -16,73 +18,103 @@ struct DemoProfilingOverlayState {
     pub sim_label: NodeID,
     #[default = NodeID::nil()]
     pub graphics_label: NodeID,
+
     pub refresh_timer: f32,
+
+    #[default = 0]
+    pub frame_counter: u32,
+
     pub fps_value: f32,
     pub dt_us_value: f32,
     pub sim_us_value: f32,
     pub graphics_us_value: f32,
+
+    pub fps_sum: f32,
     pub dt_us_sum: f32,
     pub sim_us_sum: f32,
     pub graphics_us_sum: f32,
+
     pub timing_samples: u32,
 }
 
 lifecycle!({
     fn on_init(&self, ctx: &mut ScriptContext<'_, API>) {
         let row = get_child!(ctx.run, ctx.id, ROW_NODE_NAME).unwrap_or(NodeID::nil());
-        let fps_label = get_child!(ctx.run, row, FPS_LABEL_NODE_NAME).unwrap_or(NodeID::nil());
-        let sim_label = get_child!(ctx.run, row, SIM_LABEL_NODE_NAME).unwrap_or(NodeID::nil());
+
+        let fps_label =
+            get_child!(ctx.run, row, FPS_LABEL_NODE_NAME).unwrap_or(NodeID::nil());
+
+        let sim_label =
+            get_child!(ctx.run, row, SIM_LABEL_NODE_NAME).unwrap_or(NodeID::nil());
+
         let graphics_label =
-            get_child!(ctx.run, row, GRAPHICS_LABEL_NODE_NAME).unwrap_or(NodeID::nil());
+            get_child!(ctx.run, row, GRAPHICS_LABEL_NODE_NAME)
+                .unwrap_or(NodeID::nil());
+
         with_state_mut!(ctx.run, DemoProfilingOverlayState, ctx.id, |state| {
             state.fps_label = fps_label;
             state.sim_label = sim_label;
             state.graphics_label = graphics_label;
         });
+
         self.refresh_text(ctx);
     }
 
     fn on_update(&self, ctx: &mut ScriptContext<'_, API>) {
         let dt = delta_time!(ctx.run).max(0.0);
-        let p = profiling!(ctx.run);
-        let fps = if p.fps.is_finite() && p.fps > 0.0 {
-            p.fps
-        } else {
-            0.0
-        };
-        let dt_us = dt * 1_000_000.0;
-        let sim_us = p.simulation_time.as_micros() as f32;
-        let graphics_us = p.graphics_time.as_micros() as f32;
-
-        let should_refresh = with_state_mut!(ctx.run, DemoProfilingOverlayState, ctx.id, |state| {
-            state.refresh_timer += dt;
-            if fps > 0.0 {
-                state.fps_value = fps;
-            }
-            if dt_us > 0.0 || sim_us > 0.0 || graphics_us > 0.0 {
-                state.dt_us_sum += dt_us;
-                state.sim_us_sum += sim_us;
-                state.graphics_us_sum += graphics_us;
-                state.timing_samples = state.timing_samples.saturating_add(1);
-            }
-            if state.refresh_timer >= REFRESH_SECONDS {
-                state.refresh_timer = 0.0;
-                if state.timing_samples > 0 {
-                    let samples = state.timing_samples as f32;
-                    state.dt_us_value = state.dt_us_sum / samples;
-                    state.sim_us_value = state.sim_us_sum / samples;
-                    state.graphics_us_value = state.graphics_us_sum / samples;
-                    state.dt_us_sum = 0.0;
-                    state.sim_us_sum = 0.0;
-                    state.graphics_us_sum = 0.0;
-                    state.timing_samples = 0;
+
+        let (should_sample, should_refresh) =
+            with_state_mut!(ctx.run, DemoProfilingOverlayState, ctx.id, |state| {
+                state.refresh_timer += dt;
+                state.frame_counter = state.frame_counter.wrapping_add(1);
+                let should_sample =
+                    state.frame_counter % PROFILE_SAMPLE_EVERY_FRAMES == 0;
+
+                if state.refresh_timer >= REFRESH_SECONDS {
+                    state.refresh_timer = 0.0;
+
+                    if state.timing_samples > 0 {
+                        let samples = state.timing_samples as f32;
+
+                        state.fps_value = state.fps_sum / samples;
+                        state.dt_us_value = state.dt_us_sum / samples;
+                        state.sim_us_value = state.sim_us_sum / samples;
+                        state.graphics_us_value =
+                            state.graphics_us_sum / samples;
+
+                        state.fps_sum = 0.0;
+                        state.dt_us_sum = 0.0;
+                        state.sim_us_sum = 0.0;
+                        state.graphics_us_sum = 0.0;
+
+                        state.timing_samples = 0;
+                    }
+
+                    (should_sample, true)
+                } else {
+                    (should_sample, false)
                 }
-                true
-            } else {
-                false
-            }
-        })
-        .unwrap_or(true);
+            })
+            .unwrap_or((false, false));
+
+        if should_sample {
+            let p = profiling!(ctx.run);
+
+            with_state_mut!(ctx.run, DemoProfilingOverlayState, ctx.id, |state| {
+                let fps = if p.fps.is_finite() && p.fps > 0.0 {
+                    p.fps
+                } else {
+                    0.0
+                };
+
+                state.fps_sum += fps;
+                state.dt_us_sum += dt * 1_000_000.0;
+                state.sim_us_sum += p.simulation_time.as_micros() as f32;
+                state.graphics_us_sum += p.graphics_time.as_micros() as f32;
+                state.timing_samples = state.timing_samples.saturating_add(1);
+            });
+        }
+
         if should_refresh {
             self.refresh_text(ctx);
         }
@@ -91,8 +123,19 @@ lifecycle!({
 
 methods!({
     fn refresh_text(&self, ctx: &mut ScriptContext<'_, API>) {
-        let (fps_label, sim_label, graphics_label, fps, dt_us, sim_us, graphics_us) =
-            with_state!(ctx.run, DemoProfilingOverlayState, ctx.id, |state| {
+        let (
+            fps_label,
+            sim_label,
+            graphics_label,
+            fps,
+            dt_us,
+            sim_us,
+            graphics_us,
+        ) = with_state!(
+            ctx.run,
+            DemoProfilingOverlayState,
+            ctx.id,
+            |state| {
                 (
                     state.fps_label,
                     state.sim_label,
@@ -102,11 +145,26 @@ methods!({
                     state.sim_us_value,
                     state.graphics_us_value,
                 )
-            });
+            }
+        );
+
+        set_label_text(
+            ctx,
+            fps_label,
+            format!("FPS {:.1}", fps),
+        );
 
-        set_label_text(ctx, fps_label, format!("FPS {:.1}", fps));
-        set_label_text(ctx, sim_label, format!("Sim {:.0} us | dt {:.0} us", sim_us, dt_us));
-        set_label_text(ctx, graphics_label, format!("Gfx {:.0} us", graphics_us));
+        set_label_text(
+            ctx,
+            sim_label,
+            format!("Sim {:.0} us | dt {:.0} us", sim_us, dt_us),
+        );
+
+        set_label_text(
+            ctx,
+            graphics_label,
+            format!("Gfx {:.0} us", graphics_us),
+        );
     }
 });
 
@@ -118,6 +176,7 @@ fn set_label_text<API: ScriptAPI + ?Sized>(
     if id.is_nil() {
         return;
     }
+
     with_node_mut!(ctx.run, UiLabel, id, |label| {
         label.text = text.into();
     });

perro_source/api_modules/perro_resource_api/src/sub_apis/draw_2d.rs

@@ -37,7 +37,10 @@ impl<'res, R: Draw2DAPI + ?Sized> Draw2DModule<'res, R> {
 
     #[inline]
     pub fn rect_stroke(&self, center: Vector2, size: Vector2, color: [f32; 4], thickness: f32) {
-        self.push(DrawShape2D::rect_stroke(size, color.into(), thickness), center);
+        self.push(
+            DrawShape2D::rect_stroke(size, color.into(), thickness),
+            center,
+        );
     }
 
     #[inline]

perro_source/build_pipeline/perro_static_pipeline/src/lib.rs

@@ -345,8 +345,8 @@ mod tests {
         size_min: 0.65,
         size_max: 1.35,
         force: [0.0, 0.0, 0.0],
-        color_start: [1.0, 1.0, 1.0, 1.0],
-        color_end: [1.0, 0.4, 0.1, 0.0],
+        color_start: Color::WHITE,
+        color_end: Color::new(1.0, 0.4, 0.1, 0.0),
         emissive: [0.0, 0.0, 0.0],
         spin_angular_velocity: 0.0,
     };
@@ -654,7 +654,7 @@ mod tests {
                 normal,
                 uv,
                 joints: [0, 0, 0, 0],
-                weights: [1.0, 0.0, 0.0, 0.0],
+                weights: perro_structs::Unorm8x4::new([1.0, 0.0, 0.0, 0.0]),
             });
         }
         let mut indices = Vec::with_capacity(index_count);

perro_source/build_pipeline/perro_static_pipeline/src/particles.rs

@@ -68,6 +68,7 @@ pub fn generate_static_particles(project_root: &Path) -> Result<(), StaticPipeli
     out.push_str(
         "use perro_render_bridge::{ParticleExprOp3D, ParticlePath3D, ParticleProfile3D};\n",
     );
+    out.push_str("use perro_structs::Color;\n");
     out.push_str("use std::borrow::Cow;\n\n");
 
     for (index, particle) in unique_particles.iter().enumerate() {
@@ -77,7 +78,7 @@ pub fn generate_static_particles(project_root: &Path) -> Result<(), StaticPipeli
     }
     out.push('\n');
     out.push_str(
-        "static EMPTY_PARTICLE: ParticleProfile3D = ParticleProfile3D { path: ParticlePath3D::None, expr_x_ops: None, expr_y_ops: None, expr_z_ops: None, lifetime_min: 0.6, lifetime_max: 1.4, speed_min: 1.0, speed_max: 3.0, spread_radians: core::f32::consts::FRAC_PI_3, size: 6.0, size_min: 0.65, size_max: 1.35, force: [0.0, 0.0, 0.0], color_start: [1.0, 1.0, 1.0, 1.0], color_end: [1.0, 0.4, 0.1, 0.0], emissive: [0.0, 0.0, 0.0], spin_angular_velocity: 0.0 };\n\n",
+        "static EMPTY_PARTICLE: ParticleProfile3D = ParticleProfile3D { path: ParticlePath3D::None, expr_x_ops: None, expr_y_ops: None, expr_z_ops: None, lifetime_min: 0.6, lifetime_max: 1.4, speed_min: 1.0, speed_max: 3.0, spread_radians: core::f32::consts::FRAC_PI_3, size: 6.0, size_min: 0.65, size_max: 1.35, force: [0.0, 0.0, 0.0], color_start: Color::WHITE, color_end: Color::new(1.0, 0.4, 0.1, 0.0), emissive: [0.0, 0.0, 0.0], spin_angular_velocity: 0.0 };\n\n",
     );
     for (index, (path, _)) in particle_refs.iter().enumerate() {
         write_hash_const(&mut out, &format!("PARTICLE_HASH_{index}"), path);
@@ -280,7 +281,7 @@ fn emit_particle_literal(particle: &ParticleLiteral) -> String {
         .map(|ops| format!("Some(Cow::Borrowed(&[{}]))", emit_ops_literal(ops)))
         .unwrap_or_else(|| "None".to_string());
     format!(
-        "ParticleProfile3D {{ path: {path}, expr_x_ops: {expr_x_ops}, expr_y_ops: {expr_y_ops}, expr_z_ops: {expr_z_ops}, lifetime_min: {:?}, lifetime_max: {:?}, speed_min: {:?}, speed_max: {:?}, spread_radians: {:?}, size: {:?}, size_min: {:?}, size_max: {:?}, force: [{:?}, {:?}, {:?}], color_start: [{:?}, {:?}, {:?}, {:?}], color_end: [{:?}, {:?}, {:?}, {:?}], emissive: [{:?}, {:?}, {:?}], spin_angular_velocity: {:?} }}",
+        "ParticleProfile3D {{ path: {path}, expr_x_ops: {expr_x_ops}, expr_y_ops: {expr_y_ops}, expr_z_ops: {expr_z_ops}, lifetime_min: {:?}, lifetime_max: {:?}, speed_min: {:?}, speed_max: {:?}, spread_radians: {:?}, size: {:?}, size_min: {:?}, size_max: {:?}, force: [{:?}, {:?}, {:?}], color_start: Color::new({:?}, {:?}, {:?}, {:?}), color_end: Color::new({:?}, {:?}, {:?}, {:?}), emissive: [{:?}, {:?}, {:?}], spin_angular_velocity: {:?} }}",
         particle.lifetime_min,
         particle.lifetime_max,
         particle.speed_min,

perro_source/render_stack/perro_app/src/threaded.rs

@@ -576,10 +576,10 @@ impl<B: GraphicsBackend> SnapshotPresenter<B> {
     where
         I: IntoIterator<Item = RenderCommand>,
     {
-        if let Some(snapshot) = bridge.take_latest_snapshot() {
-            if let Some(old_snapshot) = self.current_snapshot.replace(snapshot) {
-                bridge.recycle_command_buffer(old_snapshot.commands);
-            }
+        if let Some(snapshot) = bridge.take_latest_snapshot()
+            && let Some(old_snapshot) = self.current_snapshot.replace(snapshot)
+        {
+            bridge.recycle_command_buffer(old_snapshot.commands);
         }
         if let Some(snapshot) = &self.current_snapshot {
             self.graphics.submit_many(snapshot.commands.iter().cloned());
@@ -599,10 +599,10 @@ impl<B: GraphicsBackend> SnapshotPresenter<B> {
         I: IntoIterator<Item = RenderCommand>,
     {
         let total_start = Instant::now();
-        if let Some(snapshot) = bridge.take_latest_snapshot() {
-            if let Some(old_snapshot) = self.current_snapshot.replace(snapshot) {
-                bridge.recycle_command_buffer(old_snapshot.commands);
-            }
+        if let Some(snapshot) = bridge.take_latest_snapshot()
+            && let Some(old_snapshot) = self.current_snapshot.replace(snapshot)
+        {
+            bridge.recycle_command_buffer(old_snapshot.commands);
         }
         if let Some(snapshot) = &self.current_snapshot {
             self.graphics.submit_many(snapshot.commands.iter().cloned());

perro_source/render_stack/perro_graphics/src/gpu.rs

@@ -1010,8 +1010,7 @@ impl Gpu {
             && !accessibility_enabled
             && self.render_format == self.config.format;
         let depth_prepass_needed = !waters_3d.is_empty()
-            || (camera_post_enabled
-            && PostProcessor::uses_depth(camera_post_chain))
+            || (camera_post_enabled && PostProcessor::uses_depth(camera_post_chain))
             || (global_post_enabled && PostProcessor::uses_depth(global_post_chain));
         let mut frame = None;
         let mut swap_view = None;