feat(engine): make texture shader binding values specified by object ID

2 files changed, 13 insertions, 8 deletions

diff --git a/engine/src/shader/cursor.rs b/engine/src/shader/cursor.rs
index 0522858..8011012 100644
--- a/engine/src/shader/cursor.rs
+++ b/engine/src/shader/cursor.rs
@@ -1,8 +1,7 @@
-use crate::asset::Handle as AssetHandle;
-use crate::matrix::Matrix;
+use crate::data_types::matrix::Matrix;
+use crate::data_types::vector::Vec3;
+use crate::rendering::object::Id as RenderingObjectId;
 use crate::shader::{TypeKind, TypeLayout, VariableLayout};
-use crate::texture::Texture;
-use crate::vector::Vec3;
 
 /// Shader cursor
 #[derive(Clone)]
@@ -116,7 +115,7 @@ pub enum BindingValue
     Float(f32),
     FVec3(Vec3<f32>),
     FMat4x4(Matrix<f32, 4, 4>),
-    Texture(AssetHandle<Texture>),
+    Texture(RenderingObjectId),
 }
 
 impl From<u32> for BindingValue
diff --git a/engine/src/shader/default.rs b/engine/src/shader/default.rs
index 27a38b6..c174e8b 100644
--- a/engine/src/shader/default.rs
+++ b/engine/src/shader/default.rs
@@ -282,7 +282,9 @@ pub fn enqueue_set_shader_bindings(
                         assets
                             .get_handle_to_loaded(TEXTURE_WHITE_1X1_ASSET_LABEL.clone())
                             .expect("Not possible")
-                    }),
+                    })
+                    .id()
+                    .into(),
             ),
         ));
 
@@ -297,7 +299,9 @@ pub fn enqueue_set_shader_bindings(
                         assets
                             .get_handle_to_loaded(TEXTURE_WHITE_1X1_ASSET_LABEL.clone())
                             .expect("Not possible")
-                    }),
+                    })
+                    .id()
+                    .into(),
             ),
         ));
 
@@ -312,7 +316,9 @@ pub fn enqueue_set_shader_bindings(
                         assets
                             .get_handle_to_loaded(TEXTURE_WHITE_1X1_ASSET_LABEL.clone())
                             .expect("Not possible")
-                    }),
+                    })
+                    .id()
+                    .into(),
             ),
         ));