Merge pull request #12 from Davidster/optimization

Optimization

Cargo.toml

@@ -13,6 +13,7 @@ log = "0.4"
 pollster = "0.2"
 puffin = "0.14"
 puffin_http = "0.11"
+twox-hash = "1.6.3"
 
 # assets
 gltf = "1"

src/animation.rs

@@ -6,6 +6,7 @@ use super::*;
 
 #[derive(Debug)]
 pub struct Animation {
+    pub name: Option<String>,
     pub length_seconds: f32,
     pub speed: f32,
     pub channels: Vec<Channel>,

src/ball.rs

@@ -38,7 +38,7 @@ impl BallComponent {
                 -1.0 + rand::random::<f32>() * 2.0,
                 -1.0 + rand::random::<f32>() * 2.0,
             ),
-            0.5 + (rand::random::<f32>() * 0.75),
+            0.05 + (rand::random::<f32>() * 0.2),
             1.0 + (rand::random::<f32>() * 15.0),
         )
     }

src/buffer.rs

@@ -12,7 +12,7 @@ pub struct GpuBuffer {
 impl GpuBuffer {
     pub fn empty(
         device: &wgpu::Device,
-        capacity: usize,
+        capacity: usize, // TODO: make this optional?
         stride: usize,
         usage: wgpu::BufferUsages,
     ) -> Self {
@@ -80,7 +80,7 @@ impl GpuBuffer {
         &self.src
     }
 
-    pub fn _stride(&self) -> usize {
+    pub fn stride(&self) -> usize {
         self.stride
     }
 

src/camera.rs

@@ -39,7 +39,7 @@ pub struct CameraUniform {
     position: [f32; 4],
     near_plane_distance: f32,
     far_plane_distance: f32,
-    padding: [f32; 2], // TODO: remove
+    padding: [f32; 2],
 }
 
 impl CameraUniform {
@@ -58,7 +58,7 @@ impl CameraUniform {
 
 impl ShaderCameraView {
     pub fn from_transform(
-        transform: crate::transform::Transform,
+        transform: Matrix4<f32>,
         aspect_ratio: f32,
         near_plane_distance: f32,
         far_plane_distance: f32,
@@ -72,10 +72,10 @@ impl ShaderCameraView {
             aspect_ratio,
             reverse_z,
         );
-        let rotation_only_matrix = clear_translation_from_matrix(transform.matrix());
+        let rotation_only_matrix = clear_translation_from_matrix(transform);
         let rotation_only_view = rotation_only_matrix.inverse_transform().unwrap();
-        let view = transform.matrix().inverse_transform().unwrap();
-        let position = get_translation_from_matrix(transform.matrix());
+        let view = transform.inverse_transform().unwrap();
+        let position = get_translation_from_matrix(transform);
         Self {
             proj,
             view,
@@ -142,7 +142,7 @@ pub fn build_cubemap_face_camera_views(
     )
     .map(|camera| {
         ShaderCameraView::from_transform(
-            camera.to_transform(),
+            camera.to_transform().matrix(),
             1.0,
             near_plane_distance,
             far_plane_distance,

src/character.rs

@@ -34,7 +34,8 @@ impl Character {
     }
 
     pub fn update(&mut self, scene: &mut Scene, physics_state: &mut PhysicsState) {
-        let root_node_global_transform = scene.get_global_transform_for_node(self.root_node_id);
+        let root_node_global_transform: crate::transform::Transform = scene
+            .get_global_transform_for_node(self.root_node_id);
         let should_fill_collision_boxes = self.collision_box_colliders.is_empty();
         if let Some((skin_node_id, first_skin_bounding_box_transforms)) =
             scene.skins.get(self.skin_index).map(|skin| {
@@ -55,6 +56,7 @@ impl Character {
             {
                 let transform = {
                     let skin = &scene.skins[self.skin_index];
+                    // TODO: optimize this like get_global_transform_for_node
                     let skeleton_space_transform = {
                         let node_ancestry_list = scene.get_skeleton_node_ancestry_list(
                             skin.bone_node_ids[bone_index],

src/default_textures.rs

@@ -0,0 +1,51 @@
+use super::*;
+use std::collections::hash_map::Entry;
+use std::collections::HashMap;
+use std::rc::Rc;
+
+pub struct DefaultTextures {
+    textures: HashMap<DefaultTextureType, Rc<Texture>>,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum DefaultTextureType {
+    BaseColor,
+    Normal,
+    MetallicRoughness,
+    MetallicRoughnessGLTF,
+    Emissive,
+    EmissiveGLTF,
+    AmbientOcclusion,
+}
+
+impl DefaultTextures {
+    pub fn new() -> Self {
+        Self {
+            textures: HashMap::new(),
+        }
+    }
+
+    pub fn get_default_texture(
+        &mut self,
+        device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        default_texture_type: DefaultTextureType,
+    ) -> anyhow::Result<Rc<Texture>> {
+        match self.textures.entry(default_texture_type) {
+            Entry::Occupied(texture) => Ok(texture.get().clone()),
+            Entry::Vacant(entry) => {
+                let color: [u8; 4] = match default_texture_type {
+                    DefaultTextureType::BaseColor => [255, 255, 255, 255],
+                    DefaultTextureType::Normal => [127, 127, 255, 255],
+                    DefaultTextureType::MetallicRoughness => [255, 255, 255, 255],
+                    DefaultTextureType::MetallicRoughnessGLTF => [255, 127, 0, 255],
+                    DefaultTextureType::Emissive => [0, 0, 0, 255],
+                    DefaultTextureType::EmissiveGLTF => [255, 255, 255, 255],
+                    DefaultTextureType::AmbientOcclusion => [255, 255, 255, 255],
+                };
+                let texture = Rc::new(Texture::from_color(device, queue, color)?);
+                Ok(entry.insert(texture).clone())
+            }
+        }
+    }
+}