hdGatling/gi: track prototype transform in Gi object

pablode · Aug 5, 2024 · 273c846 · 273c846
1 parent cadad8c
commit 273c846
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 22 deletions.
diff --git a/src/gi/gtl/gi/Gi.h b/src/gi/gtl/gi/Gi.h
@@ -171,6 +171,7 @@ namespace gtl
   void giDestroyMaterial(GiMaterial* mat);
 
   GiMesh* giCreateMesh(const GiMeshDesc& desc);
+  void giSetMeshTransform(GiMesh* mesh, float transform[3][4]);
   void giDestroyMesh(GiMesh* mesh);
 
   GiBvh* giCreateBvh(GiScene* scene, const GiBvhParams& params);

diff --git a/src/gi/impl/Gi.cpp b/src/gi/impl/Gi.cpp
@@ -120,6 +120,7 @@ namespace gtl
   struct GiMesh
   {
     GiMeshDataVariant data;
+    glm::mat3x4 transform;
     bool flipFacing;
     int id;
   };
@@ -517,12 +518,18 @@ namespace gtl
 
     GiMesh* mesh = new GiMesh {
       .data = std::move(cpuData),
+      .transform = glm::mat3x4(1.0f),
       .flipFacing = desc.isLeftHanded,
       .id = desc.id
     };
     return mesh;
   }
 
+  void giSetMeshTransform(GiMesh* mesh, float transform[3][4])
+  {
+    memcpy(glm::value_ptr(mesh->transform), transform, sizeof(float) * 12);
+  }
+
   void giDestroyMesh(GiMesh* mesh)
   {
     if (GiMeshGpuData* data = std::get_if<GiMeshGpuData>(&mesh->data); data)
@@ -763,11 +770,13 @@ namespace gtl
       }
 
       // Create BLAS instance for TLAS.
+      glm::mat3x4 transform = glm::mat3x4(glm::mat4(mesh->transform) * glm::mat4(glm::make_mat3x4((float*) instance->transform)));
+
       CgpuBlasInstance blasInstance;
       blasInstance.as = data->blas;
       blasInstance.hitGroupIndex = materialIndex * 2; // always two hit groups per material: regular & shadow
       blasInstance.instanceCustomIndex = uint32_t(blasPayloads.size());
-      memcpy(blasInstance.transform, instance->transform, sizeof(float) * 12);
+      memcpy(blasInstance.transform, glm::value_ptr(transform), sizeof(float) * 12);
 
       blasInstances.push_back(blasInstance);
       blasPayloads.push_back(data->payload);

diff --git a/src/hdGatling/mesh.cpp b/src/hdGatling/mesh.cpp
@@ -377,7 +377,6 @@ namespace
 
 HdGatlingMesh::HdGatlingMesh(const SdfPath& id)
   : HdMesh(id)
-  , _prototypeTransform(1.0)
   , _color(0.0, 0.0, 0.0)
   , _hasColor(false)
 {
@@ -408,7 +407,6 @@ void HdGatlingMesh::Sync(HdSceneDelegate* sceneDelegate,
   if ((*dirtyBits & HdChangeTracker::DirtyInstancer) |
       (*dirtyBits & HdChangeTracker::DirtyInstanceIndex))
   {
-
     _UpdateInstancer(sceneDelegate, &dirtyBitsCopy);
 
     const SdfPath& instancerId = GetInstancerId();
@@ -430,24 +428,30 @@ void HdGatlingMesh::Sync(HdSceneDelegate* sceneDelegate,
     _UpdateVisibility(sceneDelegate, &dirtyBitsCopy);
   }
 
-  if (*dirtyBits & HdChangeTracker::DirtyTransform)
-  {
-    _prototypeTransform = sceneDelegate->GetTransform(id);
-  }
-
   bool updateGeometry =
     (*dirtyBits & HdChangeTracker::DirtyPoints) |
     (*dirtyBits & HdChangeTracker::DirtyNormals) |
     (*dirtyBits & HdChangeTracker::DirtyTopology);
 
-  *dirtyBits = HdChangeTracker::Clean;
+  if (updateGeometry)
+  {
+    _CreateGiMesh(sceneDelegate);
+  }
 
-  if (!updateGeometry)
+  if (_giMesh && (*dirtyBits & HdChangeTracker::DirtyTransform))
   {
-    return;
+    GfMatrix4d t = sceneDelegate->GetTransform(id);
+
+    float transform[3][4] = {
+      { (float) t[0][0], (float) t[1][0], (float) t[2][0], (float) t[3][0] },
+      { (float) t[0][1], (float) t[1][1], (float) t[2][1], (float) t[3][1] },
+      { (float) t[0][2], (float) t[1][2], (float) t[2][2], (float) t[3][2] }
+    };
+
+    giSetMeshTransform(_giMesh, transform);
   }
 
-  _CreateGiMesh(sceneDelegate);
+  *dirtyBits = HdChangeTracker::Clean;
 }
 
 bool HdGatlingMesh::_FindPrimvarInterpolationByName(HdSceneDelegate* sceneDelegate,
@@ -800,11 +804,6 @@ GiMesh* HdGatlingMesh::GetGiMesh() const
   return _giMesh;
 }
 
-const GfMatrix4d& HdGatlingMesh::GetPrototypeTransform() const
-{
-  return _prototypeTransform;
-}
-
 const GfVec3f& HdGatlingMesh::GetColor() const
 {
   return _color;

diff --git a/src/hdGatling/mesh.h b/src/hdGatling/mesh.h
@@ -46,8 +46,6 @@ class HdGatlingMesh final : public HdMesh
 
   GiMesh* GetGiMesh() const;
 
-  const GfMatrix4d& GetPrototypeTransform() const;
-
   const GfVec3f& GetColor() const;
 
   bool HasColor() const;
@@ -77,7 +75,6 @@ class HdGatlingMesh final : public HdMesh
 
 private:
   GiMesh* _giMesh = nullptr;
-  GfMatrix4d _prototypeTransform;
   GfVec3f _color;
   bool _hasColor = false;
 };

diff --git a/src/hdGatling/renderPass.cpp b/src/hdGatling/renderPass.cpp
@@ -278,10 +278,9 @@ void HdGatlingRenderPass::_BakeMeshes(HdRenderIndex* renderIndex,
 
     meshes.push_back(giMesh);
 
-    const GfMatrix4d& prototypeTransform = mesh->GetPrototypeTransform();
     for (size_t i = 0; i < transforms.size(); i++)
     {
-      GfMatrix4d T = prototypeTransform * transforms[i];
+      GfMatrix4d T = transforms[i];
 
       float instanceTransform[3][4] = {
         { (float) T[0][0], (float) T[1][0], (float) T[2][0], (float) T[3][0] },