- merge and resolve conflicts with devx

Author: GBDixonAlex

config.jsn

@@ -76,9 +76,11 @@
 
                 // default imgui layouts form the client.. todo. move to target
                 ["plugins/imgui.ini", "target/debug/imgui.ini"]
-                ["plugins/imgui.ini", "target/debug/imgui.ini"]
                 ["plugins/imgui.ini", "target/debug/deps/imgui.ini"]
 
+                ["plugins/imgui.ini", "target/release/imgui.ini"]
+                ["plugins/imgui.ini", "target/release/deps/imgui.ini"]
+
                 // default user config for the client
                 ["plugins/user_config.json", "target/user_config.json"]
 
@@ -118,7 +120,6 @@
                 "-o ${data_dir}/shaders"
                 "-t ${temp_dir}/shaders"
                 "-num_threads 1"
-                "-f"
                 "-args"
                 "-Zpr"
             ]

examples/raytraced_triangle/main.rs

@@ -117,6 +117,7 @@ fn main() -> Result<(), hotline_rs::Error> {
                 index_format: gfx::Format::R16u,
                 vertex_count: 3,
                 vertex_format: gfx::Format::RGB32f,
+                vertex_stride: 12
             }),
         geometry_flags: gfx::RaytracingGeometryFlags::OPAQUE,
         build_flags: AccelerationStructureBuildFlags::PREFER_FAST_TRACE

plugins/ecs/src/lib.rs

@@ -6,7 +6,6 @@ use hotline_rs::prelude::*;
 use maths_rs::prelude::*;
 
 use bevy_ecs::prelude::*;
-use bevy_ecs::schedule::SystemConfig;
 use bevy_ecs::schedule::SystemConfigs;
 
 use std::collections::HashMap;

plugins/ecs_examples/src/dynamic_cubemap.rs

@@ -63,7 +63,7 @@ pub fn setup_dynamic_cubemap(
     let dist = rand::distributions::Uniform::from(0..orbit_meshes.len());
 
     let num_primitves = 32; 
-    for i in 0..num_primitves {
+    for _ in 0..num_primitves {
         let rv = normalize(vec3f(rng.gen(), rng.gen(), rng.gen()) * 2.0 - 1.0);
         let rr = vec3f(rng.gen(), rng.gen(), rng.gen()) * f32::tau();
         let offset : f32 = 20.0 + rng.gen::<f32>() * 20.0;

plugins/ecs_examples/src/generate_mip_maps.rs

@@ -28,18 +28,15 @@ pub fn setup_generate_mip_maps(
 
     let sphere_mesh = hotline_rs::primitives::create_sphere_mesh(&mut device.0, 32);
     let dim = 64;
-    let dim2 = dim / 2;
     let sphere_size = 5.0;
 
-    let half_extent = dim2 as f32 * sphere_size;
-
     let mut angle = 0.0;
     let mut offset = 0.0;
 
     let step = f32::tau() / dim as f32;
 
-    for y in 0..dim {    
-        for x in 0..dim {    
+    for _ in 0..dim {    
+        for _ in 0..dim {    
 
             let wave_x = f32::sin(angle) * (sphere_size + offset);
             let wave_y = f32::cos(angle) * (sphere_size + offset);

plugins/ecs_examples/src/gpu_frustum_culling.rs

@@ -7,6 +7,7 @@ use crate::prelude::*;
 /// GPU Frustum Culling
 /// 
 
+#[allow(unused)]
 #[repr(packed)]
 pub struct DrawIndirectArgs {
     pub vertex_buffer: gfx::VertexBufferView,

plugins/ecs_examples/src/lib.rs

@@ -29,6 +29,7 @@ mod shadow_map;
 mod omni_shadow_map;
 mod dynamic_cubemap;
 mod pbr;
+mod raytraced_shadows;
 
 use prelude::*;
 
@@ -583,7 +584,8 @@ pub fn get_demos_ecs_examples() -> Vec<String> {
         "shadow_map",
         "dynamic_cubemap",
         "omni_shadow_map",
-        "pbr"
+        "pbr",
+        "raytraced_shadows"
     ]
 }
 

plugins/ecs_examples/src/omni_shadow_map.rs

@@ -165,7 +165,7 @@ pub fn animate_omni_shadow (
 
     let extent = 60.0;
 
-    for (mut position, mut velocity, component) in &mut light_query {
+    for (mut position, _, component) in &mut light_query {
 
         position.0 = vec3f(sin(time.accumulated), cos(time.accumulated), cos(time.accumulated)) * extent;
 
@@ -179,10 +179,9 @@ pub fn animate_omni_shadow (
 #[export_update_fn]
 pub fn animate_meshes (
     time: Res<TimeRes>, 
-    mut pmfx: ResMut<PmfxRes>,
     mut mesh_query: Query<(&mut Rotation, &MeshComponent), Without<Billboard>>) -> Result<(), hotline_rs::Error> {
 
-    for (mut rotation, component) in &mut mesh_query {
+    for (mut rotation, _) in &mut mesh_query {
         rotation.0 *= Quat::from_euler_angles(f32::pi() * time.delta, f32::pi() * time.delta, f32::pi() * time.delta);
     }
 

plugins/ecs_examples/src/shadow_map.rs

@@ -83,7 +83,6 @@ pub fn setup_shadow_map(
     let hex_mesh = hotline_rs::primitives::create_prism_mesh(&mut device.0, 6, false, true, 1.0, 1.0);
 
     let dim = 128;
-    let dim2 = dim / 2;
     let tile_size = 5.0;
 
     let half_extent = dim as f32 * tile_size;
@@ -139,9 +138,9 @@ pub fn setup_shadow_map(
 
     let dist = rand::distributions::Uniform::from(tile_size..tile_size * 10.0);
 
-    for y in 0..dim {    
+    for _ in 0..dim {    
         pos.x = start.x;
-        for x in 0..dim {
+        for _ in 0..dim {
 
             let h = dist.sample(&mut rng) as f32;
 

plugins/export_macros/src/lib.rs

@@ -124,22 +124,27 @@ pub fn export_update_fn(attr: TokenStream, item: TokenStream) -> TokenStream {
     let parsed = parse_fn(&item);
     // emit code to move function args into closure and pass them to function
     let (moves, pass) = emit_moves_and_pass_args(&parsed, &Vec::new());
-
     let order = emit_update_order(attr, "SystemSets :: Update");
-
-    // emit the closure code itself
+    
+    // create wrapper
     let export_fn = format!("#[no_mangle] fn export_{}() -> SystemConfigs {{
         (move | {} | {{
             {} ({}).unwrap();
         }}).into_configs().{}
     }}", parsed.name, moves, parsed.name, pass, order);
+    let export_tokens : TokenStream = export_fn.parse().unwrap();
 
     let input = parse_macro_input!(item as ItemFn);
     let expanded = quote! {
         #input
     };
 
     let export_tokens : TokenStream = export_fn.parse().unwrap();
+    let expanded = quote! {
+        // The original function remains untouched
+        #input
+    };
+
     let mut output = TokenStream::from(expanded);
     output.extend(export_tokens);
     output

plugins/imgui.ini

@@ -1,53 +1,47 @@
-[Window][pmfx]
-Pos=710,1043
-Size=568,293
-Collapsed=0
-DockId=0x00000005,0
-
-[Window][ecs]
-Pos=0,1043
-Size=708,293
-Collapsed=0
-DockId=0x00000001,0
-
-[Window][textures]
-Pos=710,1043
-Size=568,293
-Collapsed=0
-DockId=0x00000005,1
-
 [Window][main_window_dockspace]
 Pos=0,0
-Size=1278,1336
+Size=1485,1307
 Collapsed=0
 
-[Window][main_viewport]
-Pos=0,22
-Size=1278,950
+[Window][Debug##Default]
+Pos=60,60
+Size=400,400
 Collapsed=0
-DockId=0x00000004,0
 
 [Window][main_dock]
 Pos=0,22
-Size=1278,1019
+Size=1485,804
 Collapsed=0
-DockId=0x00000004
+DockId=0x00000001
 
-[Window][Debug##Default]
-Pos=60,60
-Size=400,400
+[Window][textures]
+Pos=806,828
+Size=679,479
+Collapsed=0
+DockId=0x00000004,0
+
+[Window][pmfx]
+Pos=806,828
+Size=679,479
 Collapsed=0
+DockId=0x00000004,1
 
 [Window][perf]
-Pos=710,1043
-Size=568,293
+Pos=806,828
+Size=679,479
+Collapsed=0
+DockId=0x00000004,2
+
+[Window][ecs]
+Pos=0,828
+Size=804,479
 Collapsed=0
-DockId=0x00000005,2
+DockId=0x00000003,0
 
 [Docking][Data]
-DockSpace     ID=0x7E079D5E Window=0x62451DFA Pos=1281,53 Size=1278,1314 Split=Y Selected=0xA2888183
-  DockNode    ID=0x00000004 Parent=0x7E079D5E SizeRef=1278,1019 CentralNode=1 Selected=0xA2888183
-  DockNode    ID=0x00000002 Parent=0x7E079D5E SizeRef=1278,293 Split=X Selected=0xBDBFA952
-    DockNode  ID=0x00000001 Parent=0x00000002 SizeRef=708,290 Selected=0x3681C83B
-    DockNode  ID=0x00000005 Parent=0x00000002 SizeRef=568,290 Selected=0xBDBFA952
+DockSpace     ID=0x7E079D5E Window=0x62451DFA Pos=25,110 Size=1485,1285 Split=Y Selected=0xA2888183
+  DockNode    ID=0x00000001 Parent=0x7E079D5E SizeRef=1969,1399 CentralNode=1 Selected=0xA2888183
+  DockNode    ID=0x00000002 Parent=0x7E079D5E SizeRef=1969,479 Split=X Selected=0x3681C83B
+    DockNode  ID=0x00000003 Parent=0x00000002 SizeRef=1066,369 Selected=0x3681C83B
+    DockNode  ID=0x00000004 Parent=0x00000002 SizeRef=901,369 Selected=0xBDBFA952