- flip rt pipeline output, tweak colours and positions for demo

Author: GBDixonAlex

plugins/ecs_examples/src/raytraced_shadows.rs

@@ -66,10 +66,11 @@ pub fn setup_raytraced_shadows_scene(
     mut commands: Commands) -> Result<(), hotline_rs::Error> {
 
     let cube_mesh = hotline_rs::primitives::create_cube_mesh(&mut device.0);
-    let tourus_mesh = hotline_rs::primitives::create_tourus_mesh(&mut device.0, 32);
+
+    let dodeca_mesh = hotline_rs::primitives::create_dodecahedron_mesh(&mut device.0);
     let teapot_mesh = hotline_rs::primitives::create_teapot_mesh(&mut device.0, 32);
-    let tube_mesh = hotline_rs::primitives::create_tube_prism_mesh(&mut device.0, 32, 0, 32, true, true, 1.0, 0.66, 1.0);
-    let triangle_mesh = hotline_rs::primitives::create_tube_prism_mesh(&mut device.0, 3, 0, 3, false, true, 0.33, 0.66, 1.0);
+    let tube_mesh = hotline_rs::primitives::create_tube_prism_mesh(&mut device.0, 5, 0, 4, false, true, 0.33, 0.33, 1.0);
+    let triangle_mesh = hotline_rs::primitives::create_pyramid_mesh(&mut device.0, 4, false, true);
 
     let bounds = 100.0;
 
@@ -80,7 +81,7 @@ pub fn setup_raytraced_shadows_scene(
     commands.spawn((
         Position(light_pos),
         Velocity(Vec3f::unit_z()),
-        Colour(vec4f(0.125, 0.5, 0.25, 1.0)),
+        Colour(vec4f(0.5, 0.125, 0.25, 1.0)),
         LightComponent {
             light_type: LightType::Point,
             radius: light_radius,
@@ -100,22 +101,22 @@ pub fn setup_raytraced_shadows_scene(
     });
 
     let shape_bounds = bounds * 0.6;
+    let shape_size = bounds * 0.1;
 
-    // tourus
-    let tourus_size = bounds * 0.1;
-    let tourus_blas = commands.spawn((
+    // dodeca
+    let dodeca_blas = commands.spawn((
         Position(vec3f(shape_bounds * -0.75, shape_bounds * 0.7, -shape_bounds * 0.1)),
-        Scale(splat3f(tourus_size)),
+        Scale(splat3f(shape_size * 2.0)),
         Rotation(Quatf::identity()),
-        MeshComponent(tourus_mesh.clone()),
+        MeshComponent(dodeca_mesh.clone()),
         WorldMatrix(Mat34f::identity()),
-        blas_from_mesh(&mut device, &tourus_mesh)?
+        blas_from_mesh(&mut device, &dodeca_mesh)?
     )).id();
 
     // helix
     commands.spawn((
         Position(vec3f(shape_bounds * -0.3, shape_bounds * -0.6, shape_bounds * 0.8)),
-        Scale(splat3f(tourus_size * 2.0)),
+        Scale(splat3f(shape_size * 2.0)),
         Rotation(Quatf::identity()),
         MeshComponent(teapot_mesh.clone()),
         WorldMatrix(Mat34f::identity()),
@@ -125,7 +126,7 @@ pub fn setup_raytraced_shadows_scene(
     // tube
     commands.spawn((
         Position(vec3f(shape_bounds * 1.0, shape_bounds * 0.1, shape_bounds * -1.0)),
-        Scale(splat3f(tourus_size)),
+        Scale(splat3f(shape_size)),
         Rotation(Quatf::identity()),
         MeshComponent(tube_mesh.clone()),
         WorldMatrix(Mat34f::identity()),
@@ -135,7 +136,7 @@ pub fn setup_raytraced_shadows_scene(
     // tri prsim
     commands.spawn((
         Position(vec3f(shape_bounds * 0.123, shape_bounds * -0.6, shape_bounds * -0.8)),
-        Scale(splat3f(tourus_size * 2.0)),
+        Scale(splat3f(shape_size * 2.0)),
         Rotation(Quatf::identity()),
         MeshComponent(triangle_mesh.clone()),
         WorldMatrix(Mat34f::identity()),
@@ -146,9 +147,11 @@ pub fn setup_raytraced_shadows_scene(
     let thickness = bounds * 0.1;
     let face_size = bounds * 2.0;
 
+    let wall_offset = (bounds * 2.0) - thickness;
+
     // -y
     commands.spawn((
-        Position(vec3f(0.0, -bounds, 0.0)),
+        Position(vec3f(0.0, -wall_offset, 0.0)),
         Scale(vec3f(face_size, thickness, face_size)),
         Rotation(Quatf::identity()),
         MeshComponent(cube_mesh.clone()),
@@ -159,7 +162,7 @@ pub fn setup_raytraced_shadows_scene(
 
     // + y
     commands.spawn((
-        Position(vec3f(0.0, bounds, 0.0)),
+        Position(vec3f(0.0, wall_offset, 0.0)),
         Scale(vec3f(face_size, thickness, face_size)),
         Rotation(Quatf::identity()),
         MeshComponent(cube_mesh.clone()),
@@ -170,7 +173,7 @@ pub fn setup_raytraced_shadows_scene(
 
     // -z
     commands.spawn((
-        Position(vec3f(0.0, 0.0, -bounds)),
+        Position(vec3f(0.0, 0.0, -wall_offset)),
         Scale(vec3f(face_size, face_size, thickness)),
         Rotation(Quatf::identity()),
         MeshComponent(cube_mesh.clone()),
@@ -181,7 +184,7 @@ pub fn setup_raytraced_shadows_scene(
 
     // -x
     commands.spawn((
-        Position(vec3f(-bounds, 0.0, 0.0)),
+        Position(vec3f(-wall_offset, 0.0, 0.0)),
         Scale(vec3f(thickness, face_size, face_size)),
         Rotation(Quatf::identity()),
         MeshComponent(cube_mesh.clone()),
@@ -215,9 +218,10 @@ pub fn setup_tlas(
             let translate = Mat34f::from_translation(position.0);
             let rotate = Mat34f::from(rotation.0);
             let scale = Mat34f::from_scale(scale.0);
+            let flip = Mat34f::from_scale(vec3f(1.0, 1.0, 1.0));
             instances.push(
                 gfx::RaytracingInstanceInfo::<gfx_platform::Device> {
-                    transform: (translate * rotate * scale).m,
+                    transform: (flip * translate * rotate * scale).m,
                     instance_id: index as u32,
                     instance_mask: 0xff,
                     hit_group_index: 0,
@@ -236,7 +240,6 @@ pub fn setup_tlas(
             )?;
             let tlas_srv =  tlas.get_srv_index().expect("expect tlas to have an srv");
             pmfx.push_constant_user_data[0] = tlas_srv as u32;
-            println!("tlas_srv = {tlas_srv}");
             t.tlas = Some(tlas);
         }
     }
@@ -276,9 +279,10 @@ pub fn update_tlas(
             let translate = Mat34f::from_translation(position.0);
             let rotate = Mat34f::from(rotation.0);
             let scale = Mat34f::from_scale(scale.0);
+            let flip = Mat34f::from_scale(vec3f(1.0, 1.0, 1.0));
             instances.push(
                 gfx::RaytracingInstanceInfo::<gfx_platform::Device> {
-                    transform: (translate * rotate * scale).m,
+                    transform: (flip * translate * rotate * scale).m,
                     instance_id: index as u32,
                     instance_mask: 0xff,
                     hit_group_index: 0,
@@ -298,11 +302,7 @@ pub fn update_tlas(
     Ok(())
 }
 
-// TODO_RT
-// mesh vertex count
-// crash when switching demo
-
-// TODO clean
+// TODO cleanup
 // fix: Ignoring InitialState D3D12_RESOURCE_STATE_COPY_DEST. Buffers are effectively created in state D3D12_RESOURCE_STATE_COMMON.
 
 #[export_compute_fn]

shaders/material.hlsl

@@ -312,6 +312,9 @@ void scene_raygen_shader()
     float2 uv = (float2)DispatchRaysIndex() / (float2)DispatchRaysDimensions();
     float2 ndc = uv * 2.0 - 1.0;
 
+    float2 output_location = DispatchRaysIndex();
+    output_location.y = DispatchRaysDimensions().y - output_location.y;
+
     // unproject ray
     float4 near = float4(ndc.x, ndc.y, 0.0, 1.0);
     float4 far = float4(ndc.x, ndc.y, 1.0, 1.0);
@@ -384,11 +387,11 @@ void scene_raygen_shader()
             }
         }
 
-        rw_textures[resource_indices.x][DispatchRaysIndex().xy] = payload.col;
+        rw_textures[resource_indices.x][output_location] = payload.col;
     }
     else
     {
-        rw_textures[resource_indices.x][DispatchRaysIndex().xy] = float4(0.0, 1.0, 0.0, 1.0);
+        rw_textures[resource_indices.x][output_location] = float4(0.0, 1.0, 0.0, 1.0);
     }
 }
 

shaders/material.jsn

@@ -167,23 +167,19 @@
             }
         }
         mesh_lit_rt_shadow: {
-            debug: {
-                view: "main_view"
-                pipelines: ["imdraw_3d"]
-                function: "render_debug"
-            }
             update_tlas: {
                 pipelines: []
                 function: "update_tlas"
-                depends_on: ["debug"]
             }
-            meshes: {
+            render_meshes_raytraced: {
                 pipelines: ["mesh_lit_rt_shadow"]
                 function: "render_meshes_raytraced"
-                depends_on: ["update_tlas"]
-				uses: [
+                uses: [
 					["staging_output", "Write"]
 				]
+                depends_on: [
+                    "update_tlas"
+                ]
             }
 			blit_main_colour: {
                 view: "main_view"
@@ -193,7 +189,7 @@
                 ]
                 target_dimension: "staging_output"
                 function: "blit"
-                depends_on: ["meshes"]
+                depends_on: ["render_meshes_raytraced"]
             }
         }
         mesh_pbr: {

src/gfx/d3d12.rs

@@ -3355,7 +3355,7 @@ impl super::Device for Device {
                             IndexFormat: to_dxgi_format(tris.index_format),
                             VertexFormat: to_dxgi_format(tris.vertex_format),
                             IndexCount: tris.index_count as u32,
-                            VertexCount: tris.index_count as u32,
+                            VertexCount: tris.vertex_count as u32,
                             IndexBuffer: tris.index_buffer.d3d_virtual_address(),
                             VertexBuffer: D3D12_GPU_VIRTUAL_ADDRESS_AND_STRIDE {
                                 StartAddress: tris.vertex_buffer.d3d_virtual_address(),
@@ -4403,7 +4403,6 @@ impl super::CmdBuf<Device> for CmdBuf {
     }
 
     fn update_raytracing_tlas(&self, tlas: &RaytracingTLAS, instance_buffer: &Buffer, instance_count: usize, mode: AccelerationStructureRebuildMode) {
-
         // create acceleration structure inputs
         let inputs = D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS {
             Type: D3D12_RAYTRACING_ACCELERATION_STRUCTURE_TYPE_TOP_LEVEL,
@@ -4432,6 +4431,18 @@ impl super::CmdBuf<Device> for CmdBuf {
             let cmd = self.command_list[bb].cast::<ID3D12GraphicsCommandList4>()
                 .expect("hotline_rs::gfx::d3d12: expected ID3D12GraphicsCommandList4 availability to create raytracing blas");
             cmd.BuildRaytracingAccelerationStructure(&blas_desc, None);
+
+            // resource barrier
+            let barrier = D3D12_RESOURCE_BARRIER {
+                Type: D3D12_RESOURCE_BARRIER_TYPE_UAV,
+                Flags: D3D12_RESOURCE_BARRIER_FLAG_NONE,
+                Anonymous: D3D12_RESOURCE_BARRIER_0 {
+                    UAV: std::mem::ManuallyDrop::new(D3D12_RESOURCE_UAV_BARRIER {
+                        pResource: std::mem::ManuallyDrop::new(tlas.tlas_buffer.resource.clone())
+                    })
+                }
+            };
+            cmd.ResourceBarrier(&[barrier]);
         }
     }