Rendering Optimisations - Part 2

.gitignore

@@ -18,3 +18,6 @@ sponza*
 
 # Don't ignore images from rendering tests
 !render_*.jpg
+
+# Ignore compiled shaders
+*.spv

.vscode/tasks.json

@@ -39,7 +39,7 @@
 			"label": "Run a specific test",
 			"group": {
 				"kind": "test",
-				"isDefault": true
+				"isDefault": false
 			}
 		},
 		{
@@ -81,6 +81,25 @@
 				"kind": "test",
 				"isDefault": false,
 			}
-		}
+		},
+		{
+			"type": "cargo",
+			"command": "run",
+			"args": [
+				"--bin",
+				"hotham_asset_server",
+			],
+			"env": {
+				"RUST_BACKTRACE": "1"
+			},
+			"problemMatcher": [
+				"$rustc"
+			],
+			"label": "Run Hotham simple scene on the simulator",
+			"group": {
+				"kind": "test",
+				"isDefault": true,
+			}
+		},
 	]
 }

Cargo.toml

@@ -1,13 +1,15 @@
 [workspace]
 members = [
-    "hotham",
-    "hotham-simulator",
-    "examples/shared",
-    "examples/simple-scene",
-    "examples/complex-scene",
-    "examples/custom-rendering",
-    "examples/crab-saber",
-    "benchmarks/stress-test",
+  "benchmarks/stress-test",
+  "examples/complex-scene",
+  "examples/crab-saber",
+  "examples/custom-rendering",
+  "examples/shared",
+  "examples/simple-scene",
+  "hotham-asset-client",
+  "hotham-asset-server",
+  "hotham-simulator",
+  "hotham",
 ]
 
 # Make performance critical packages compile with optimizations

benchmarks/stress-test/src/lib.rs

@@ -16,7 +16,6 @@ use hotham::{
         material::Material,
         mesh_data::MeshData,
         primitive::{calculate_bounding_sphere, Primitive},
-        vertex::Vertex,
     },
     systems::{
         animation_system, debug::debug_system, grabbing_system, hands_system, physics_system,
@@ -327,7 +326,7 @@ fn rearrange_models(world: &mut World) {
         column += 1;
     }
 
-    println!("[HOTHAM_STRESS_TEST] There are now {} models", num_models);
+    println!("[HOTHAM_STRESS_TEST] There are now {num_models} models");
 }
 
 fn create_mesh(render_context: &mut RenderContext, world: &mut World) {
@@ -402,7 +401,10 @@ fn update_mesh(step: usize, mesh: &Mesh, render_context: &mut RenderContext) {
     // DON'T DO THIS in a real application!
     unsafe {
         render_context.resources.index_buffer.overwrite(&indices);
-        render_context.resources.vertex_buffer.overwrite(&vertices);
+        render_context
+            .resources
+            .position_buffer
+            .overwrite(&vertices);
     }
 
     println!(
@@ -412,9 +414,6 @@ fn update_mesh(step: usize, mesh: &Mesh, render_context: &mut RenderContext) {
     );
 }
 
-fn vertex(x: f32, y: f32) -> Vertex {
-    Vertex {
-        position: [x, y, -1.0].into(),
-        ..Default::default()
-    }
+fn vertex(x: f32, y: f32) -> Vec3 {
+    [x, y, -1.0].into()
 }

examples/crab-saber/src/game_context.rs

@@ -67,7 +67,7 @@ impl GameContext {
         let sabers = [Color::Blue, Color::Red].map(|color| add_saber(color, &models, world));
 
         // Spawn cubes
-        for _ in 0..20 {
+        for _ in 0..30 {
             pre_spawn_cube(world, &models);
         }
 
@@ -121,7 +121,7 @@ impl GameContext {
             red_saber: sabers[1],
             songs: Default::default(),
             models,
-            last_spawn_time: Instant::now() - Duration::new(100, 0),
+            last_spawn_time: Instant::now().checked_sub(Duration::new(100, 0)).unwrap(),
             sound_effects: Default::default(),
         }
     }

examples/crab-saber/src/lib.rs

@@ -107,10 +107,7 @@ fn init(engine: &mut Engine) -> GameContext {
 
 fn hide(world: &mut World, entity: Entity) {
     if world.remove_one::<Visible>(entity).is_err() {
-        println!(
-            "[STATE_CHANGE] Tried to make {:?} hidden but it had no Visible component",
-            entity
-        )
+        println!("[STATE_CHANGE] Tried to make {entity:?} hidden but it had no Visible component")
     }
 }
 

examples/crab-saber/src/systems/game.rs

@@ -144,7 +144,7 @@ fn transition(
                 .get::<&mut UIPanel>(game_context.main_menu_panel)
                 .unwrap();
 
-            panel.text = format!("Game Over\n{}", message);
+            panel.text = format!("Game Over\n{message}");
             panel.buttons = vec![UIPanelButton::new("Back to main menu")];
         }
         _ => panic!(
@@ -249,7 +249,7 @@ fn check_for_hits(
                     }
                 }
                 haptic_context.request_haptic_feedback(1., Handedness::Right);
-                println!("Hit BLUE: Adding cube to dispose list: {:?}", c);
+                println!("Hit BLUE: Adding cube to dispose list: {c:?}");
                 cubes_to_dispose.push(*c);
             }
         }
@@ -274,7 +274,7 @@ fn check_for_hits(
                     }
                 }
                 haptic_context.request_haptic_feedback(1., Handedness::Left);
-                println!("Hit RED: Adding cube to dispose list: {:?}", c);
+                println!("Hit RED: Adding cube to dispose list: {c:?}");
                 cubes_to_dispose.push(*c);
             }
         }
@@ -290,7 +290,7 @@ fn check_for_hits(
             if e.get::<&Cube>().is_some() {
                 game_context.current_score -= 1;
                 pending_sound_effects.push((*c, "Miss"));
-                println!("MISSED: Adding cube to dispose list: {:?}", c);
+                println!("MISSED: Adding cube to dispose list: {c:?}");
                 cubes_to_dispose.push(*c);
             }
         }
@@ -306,7 +306,7 @@ fn is_cube(e: hotham::hecs::EntityRef) -> bool {
 
 fn dispose_of_cubes(cubes_to_dispose: Vec<Entity>, world: &mut World) {
     for e in cubes_to_dispose.into_iter() {
-        println!("Removing visibilty of cube: {:?}", e);
+        println!("Removing visibilty of cube: {e:?}");
         world.remove_one::<Visible>(e).unwrap();
         world.get::<&mut RigidBody>(e).unwrap().linear_velocity = glam::Vec3::ZERO;
     }
@@ -712,7 +712,7 @@ mod tests {
                 .get::<&UIPanel>(game_context.score_panel)
                 .unwrap()
                 .text,
-            format!("Score: {}", score)
+            format!("Score: {score}")
         );
     }
 }

examples/custom-rendering/src/custom_render_context.rs

@@ -2,7 +2,7 @@ use hotham::{
     anyhow::Result,
     ash,
     contexts::{render_context::create_shader, VulkanContext},
-    glam::{Affine3A, Mat4, Vec4},
+    glam::{Affine3A, Mat4, Vec3, Vec4},
     rendering::{buffer::Buffer, primitive::Primitive, vertex::Vertex},
     vk,
     vk_shader_macros::include_glsl,
@@ -158,12 +158,17 @@ fn create_quadrics_pipeline(
     let stages = [vertex_stage, fragment_stage];
 
     // Vertex input state
-    let vertex_binding_description = vk::VertexInputBindingDescription::builder()
+    let position_binding_description = vk::VertexInputBindingDescription::builder()
         .binding(0)
+        .stride(size_of::<Vec3>() as _)
+        .input_rate(vk::VertexInputRate::VERTEX)
+        .build();
+    let vertex_binding_description = vk::VertexInputBindingDescription::builder()
+        .binding(1)
         .stride(size_of::<Vertex>() as _)
         .input_rate(vk::VertexInputRate::VERTEX)
         .build();
-    let vertex_binding_descriptions = [vertex_binding_description];
+    let vertex_binding_descriptions = [position_binding_description, vertex_binding_description];
     let vertex_attribute_descriptions = Vertex::attribute_descriptions();
 
     let vertex_input_state = vk::PipelineVertexInputStateCreateInfo::builder()

examples/custom-rendering/src/shaders/quadric.frag

@@ -1,5 +1,10 @@
 #version 460
+
 #extension GL_GOOGLE_include_directive : require
+#extension GL_EXT_shader_explicit_arithmetic_types_int16 : require
+#extension GL_EXT_shader_explicit_arithmetic_types_float16 : require
+#extension GL_EXT_shader_16bit_storage : require
+
 #include "../../../../hotham/src/shaders/common.glsl"
 #include "../../../../hotham/src/shaders/lights.glsl"
 #include "../../../../hotham/src/shaders/brdf.glsl"
@@ -77,8 +82,8 @@ void main() {
     gl_FragDepth = v_clip_coord.z / v_clip_coord.w;
 
     // Set globals that are read inside functions for lighting etc.
-    p = hitPoint.xyz;
-    v = normalize(sceneData.cameraPosition[gl_ViewIndex].xyz - p);
+    pos = hitPoint.xyz;
+    v = normalize(sceneData.cameraPosition[gl_ViewIndex].xyz - pos);
 
     // Compute normal from gradient of surface quadric
     n = normalize((d.surfaceQ * hitPoint).xyz);
@@ -89,62 +94,49 @@ void main() {
     // Unpack the material parameters
     materialFlags = material.flagsAndBaseTextureID & 0xFFFF;
     baseTextureID = material.flagsAndBaseTextureID >> 16;
-    metallicRoughnessAlphaMaskCutoff = unpackUnorm4x8(
-        material.packedMetallicRoughnessFactorAlphaMaskCutoff).xyz;
 
     // Determine the base color
-    vec4 baseColor = unpackUnorm4x8(material.packedBaseColor);
-
-    if ((materialFlags & HAS_BASE_COLOR_TEXTURE) != 0) {
-        baseColor *= texture(textures[baseTextureID], uv);
-    }
+    f16vec3 baseColor = V16(unpackUnorm4x8(material.packedBaseColor));
 
-    // Handle transparency
-    if (metallicRoughnessAlphaMaskCutoff.z > 0.0f) {
-        if (baseColor.a < metallicRoughnessAlphaMaskCutoff.z) {
-            // TODO: Apparently Adreno GPUs don't like discarding.
-            discard;
-        }
+    if ((materialFlags & MATERIAL_FLAG_HAS_BASE_COLOR_TEXTURE) != 0) {
+        baseColor *= V16(texture(textures[baseTextureID], uv));
     }
 
     // Choose the correct workflow for this material
     if ((materialFlags & PBR_WORKFLOW_UNLIT) == 0) {
         outColor.rgb = getPBRMetallicRoughnessColor(baseColor);
     } else {
-        outColor = baseColor;
+        outColor.rgb = tonemap(baseColor);
     }
 
-    // Finally, tonemap the color.
-    outColor.rgb = tonemap(outColor.rgb);
-
     // Debugging
     // Shader inputs debug visualization
     if (sceneData.params.z > 0.0) {
         int index = int(sceneData.params.z);
         switch (index) {
             // Base Color Texture
             case 1:
-                outColor.rgba = baseColor;
+                outColor.rgb = baseColor;
                 break;
             // Normal
             case 2:
                 outColor.rgb = n * 0.5 + 0.5;
                 break;
             // Occlusion
             case 3:
-                outColor.rgb = ((materialFlags & TEXTURE_FLAG_HAS_AO_TEXTURE) != 0) ? ERROR_MAGENTA.rgb : texture(textures[baseTextureID + 1], uv).rrr;
+                outColor.rgb = ((materialFlags & MATERIAL_FLAG_HAS_AO_TEXTURE) != 0) ? ERROR_MAGENTA.rgb : texture(textures[baseTextureID + 1], uv).rrr;
                 break;
             // Emission
             case 4:
-                outColor.rgb = ((materialFlags & TEXTURE_FLAG_HAS_EMISSION_TEXTURE) != 0) ? ERROR_MAGENTA.rgb : texture(textures[baseTextureID + 3], uv).rgb;
+                outColor.rgb = ((materialFlags & MATERIAL_FLAG_HAS_EMISSION_TEXTURE) != 0) ? ERROR_MAGENTA.rgb : texture(textures[baseTextureID + 3], uv).rgb;
                 break;
             // Roughness
             case 5:
-                outColor.rgb = ((materialFlags & HAS_METALLIC_ROUGHNESS_TEXTURE) != 0) ? ERROR_MAGENTA.rgb : texture(textures[baseTextureID + 1], uv).ggg;
+                outColor.rgb = ((materialFlags & MATERIAL_FLAG_HAS_METALLIC_ROUGHNESS_TEXTURE) != 0) ? ERROR_MAGENTA.rgb : texture(textures[baseTextureID + 1], uv).ggg;
                 break;
             // Metallic
             case 6:
-                outColor.rgb = ((materialFlags & HAS_METALLIC_ROUGHNESS_TEXTURE) != 0) ? ERROR_MAGENTA.rgb : texture(textures[baseTextureID + 1], uv).bbb;
+                outColor.rgb = ((materialFlags & MATERIAL_FLAG_HAS_METALLIC_ROUGHNESS_TEXTURE) != 0) ? ERROR_MAGENTA.rgb : texture(textures[baseTextureID + 1], uv).bbb;
                 break;
         }
         outColor = outColor;

examples/simple-scene/src/lib.rs

@@ -60,6 +60,10 @@ fn init(engine: &mut Engine) -> Result<(), hotham::HothamError> {
         include_bytes!("../../../test_assets/left_hand.glb"),
         include_bytes!("../../../test_assets/right_hand.glb"),
     ];
+    let models =
+        asset_importer::load_models_from_glb(&glb_buffers, vulkan_context, render_context)?;
+    add_hand(&models, Handedness::Left, world);
+    add_hand(&models, Handedness::Right, world);
 
     #[cfg(target_os = "android")]
     glb_buffers.push(include_bytes!(
@@ -72,8 +76,7 @@ fn init(engine: &mut Engine) -> Result<(), hotham::HothamError> {
     let models =
         asset_importer::load_models_from_glb(&glb_buffers, vulkan_context, render_context)?;
     add_helmet(&models, world);
-    add_hand(&models, Handedness::Left, world);
-    add_hand(&models, Handedness::Right, world);
+    add_model_to_world("Cube", &models, world, None);
 
     Ok(())
 }

hotham-asset-client/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+edition = "2021"
+name = "hotham-asset-client"
+version = "0.1.0"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0"
+futures-util = {version = "0.3.11", default-features = false}
+quinn = {version = "0.8.5", features = ["tls-rustls"]}
+rustls = {version = "0.20.3", features = ["dangerous_configuration", "quic"]}
+tokio = {version = "1.0.1", default-features = false, features = ["sync"]}
+
+[dev-dependencies]
+tokio = {version = "1.0.1", default-features = false, features = ["rt"]}