1 files changed, 11 insertions, 9 deletions
diff --git a/src/3d/renderer_draw.cc b/src/3d/renderer_draw.cc
index dca7113..929f261 100644
--- a/src/3d/renderer_draw.cc
+++ b/src/3d/renderer_draw.cc
@@ -27,8 +27,8 @@ void Renderer3D::update_uniforms(const Scene& scene, const Camera& camera,
     float type_id = 0.0f;
     switch (obj.type) {
     case ObjectType::SPHERE: type_id = 1.0f; break;
+    case ObjectType::CUBE:   // fallthrough (legacy alias for BOX)
     case ObjectType::BOX:    type_id = 2.0f; break;
-    case ObjectType::CUBE:   type_id = 2.0f; break; // CUBE is same as BOX
     case ObjectType::TORUS:  type_id = 3.0f; break;
     case ObjectType::PLANE:  type_id = 4.0f; break;
     case ObjectType::MESH:   type_id = 5.0f; break;
@@ -63,7 +63,11 @@ void Renderer3D::draw(WGPURenderPassEncoder pass, const Scene& scene,
                       const Camera& camera, float time) {
   update_uniforms(scene, camera, time);
 
-  // Lazy Bind Group creation
+  // Recreate bind group only when textures or BVH mode change
+  if (!bind_group_dirty_) {
+    // Skip bind group rebuild — reuse existing
+  } else {
+    bind_group_dirty_ = false;
 
   if (bind_group_)
     wgpuBindGroupRelease(bind_group_);
@@ -115,11 +119,9 @@ void Renderer3D::draw(WGPURenderPassEncoder pass, const Scene& scene,
     bg_entries.push_back(e);
   }
 
-  // Select the correct pipeline and bind group layout
-  WGPURenderPipeline current_pipeline =
-      bvh_enabled_ ? pipeline_ : pipeline_no_bvh_;
+  WGPURenderPipeline cp = bvh_enabled_ ? pipeline_ : pipeline_no_bvh_;
   WGPUBindGroupLayout current_layout =
-      wgpuRenderPipelineGetBindGroupLayout(current_pipeline, 0);
+      wgpuRenderPipelineGetBindGroupLayout(cp, 0);
 
   WGPUBindGroupDescriptor bg_desc = {};
   bg_desc.layout = current_layout;
@@ -129,10 +131,10 @@ void Renderer3D::draw(WGPURenderPassEncoder pass, const Scene& scene,
   bind_group_ = wgpuDeviceCreateBindGroup(device_, &bg_desc);
 
   wgpuBindGroupLayoutRelease(current_layout);
+  } // end dirty block
 
-  wgpuRenderPassEncoderSetPipeline(pass, current_pipeline);
-
-  wgpuRenderPassEncoderSetBindGroup(pass, 0, bind_group_, 0, nullptr);
+  WGPURenderPipeline current_pipeline =
+      bvh_enabled_ ? pipeline_ : pipeline_no_bvh_;
 
   uint32_t instance_count =
       (uint32_t)std::min((size_t)kMaxObjects, scene.objects.size());