More tidy up

Author: Matt Kleinschafer

modules/graphics/src/rendering/culling.rs

@@ -67,9 +67,9 @@ impl From<&Material> for MaterialSortingKey {
 
 /// Represents an object that is visible to a camera, along with it's material
 /// properties that are used to render it.
-pub struct VisibleObject<'a, I> {
-  /// The identifier of the object.
-  pub identifier: I,
+pub struct VisibleObject<'a> {
+  /// The object itself.
+  pub object: &'a dyn RenderObject,
   /// The sorting key for the material of the object.
   pub material: &'a Material,
 }
@@ -79,16 +79,16 @@ pub struct VisibleObject<'a, I> {
 /// This is a subset of the objects in a scene that are visible to a specific
 /// camera, and can be used to optimize rendering by only rendering the objects
 /// that are visible to the camera.
-pub struct VisibleObjectSet<'a, I> {
+pub struct VisibleObjectSet<'a> {
   /// The frustum of the camera that was used to cull the objects.
   pub frustum: Frustum,
   /// The objects that are visible to the camera.
-  pub objects: Vec<VisibleObject<'a, I>>,
+  pub objects: Vec<VisibleObject<'a>>,
 }
 
-impl<'a, I> VisibleObjectSet<'a, I> {
+impl<'a> VisibleObjectSet<'a> {
   /// Gets an iterator over the objects in the set.
-  pub fn group_by_material(&self) -> impl Iterator<Item = (&'a Material, &[VisibleObject<'a, I>])> {
+  pub fn group_by_material(&self) -> impl Iterator<Item = (&'a Material, &[VisibleObject<'a>])> {
     self
       .objects
       .chunk_by(|a, b| MaterialSortingKey::from(a.material) == MaterialSortingKey::from(b.material))

modules/graphics/src/rendering/pipelines.rs

@@ -19,10 +19,8 @@ impl<'a> RenderFrame<'a> {
     for (material, group) in visible_object_set.group_by_material() {
       self.queue.set_material(material);
 
-      for object in group {
-        let render_object = scene.get_object(object.identifier).unwrap();
-
-        render_object.render(self);
+      for entry in group {
+        entry.object.render(self)
       }
     }
   }
@@ -33,11 +31,8 @@ pub trait RenderScene {
   /// Gets the cameras that should be used to render this scene.
   fn cameras(&self) -> Vec<&dyn Camera>;
 
-  /// Gets the object with the given identifier.
-  fn get_object(&self, identifier: u64) -> Option<&dyn RenderObject>;
-
   /// Gets the objects that should be rendered by the given camera.
-  fn cull_visible_objects(&self, camera: &dyn Camera) -> VisibleObjectSet<u64>;
+  fn cull_visible_objects(&self, camera: &dyn Camera) -> VisibleObjectSet;
 }
 
 /// Represents an object capable of being rendered.

modules/scene/src/graph/rendering.rs

@@ -1,6 +1,6 @@
 //! Rendering support for scene graphs
 
-use graphics::{RenderFrame, RenderObject, RenderScene, VisibleObjectSet};
+use graphics::{RenderFrame, RenderObject, RenderScene, VisibleObject, VisibleObjectSet};
 
 use super::*;
 
@@ -10,7 +10,7 @@ impl<'a, T: Transform> RenderScene for SceneGraph<'a, T> {
     todo!()
   }
 
-  fn cull_visible_objects(&self, camera: &dyn Camera) -> VisibleObjectSet<u64> {
+  fn cull_visible_objects(&self, camera: &dyn Camera) -> VisibleObjectSet<'a> {
     let frustum = camera.frustum();
     let objects = Vec::new();
 
@@ -20,24 +20,13 @@ impl<'a, T: Transform> RenderScene for SceneGraph<'a, T> {
         return false;
       }
 
-      // TODO: fix this up
-      // objects.push(VisibleObject {
-      //   material: todo!(),
-      //   identifier: node.id().into(),
-      // });
+      // TODO: push the object to the list
 
       true
     });
 
     VisibleObjectSet { frustum, objects }
   }
-
-  fn get_object(&self, identifier: u64) -> Option<&dyn RenderObject> {
-    self
-      .root
-      .find_by_id(SceneNodeId::from(identifier))
-      .map(|node| node as &dyn RenderObject)
-  }
 }
 
 impl<'a, T: Transform> Debug for SceneGraph<'a, T> {