Fixed broken intersector logic when tracing instances

Author: gboisse

RadeonRays/src/accelerator/bvh2.h

@@ -27,6 +27,7 @@ THE SOFTWARE.
 #include <vector>
 
 #include "../primitive/mesh.h"
+#include "../primitive/instance.h"
 
 namespace RadeonRays
 {
@@ -57,7 +58,7 @@ namespace RadeonRays
 
     protected:
         using RefArray = std::vector<std::uint32_t>;
-        using MetaDataArray = std::vector<std::pair<const Mesh *, std::size_t> >;
+        using MetaDataArray = std::vector<std::pair<const Shape *, std::size_t> >;
 
         // Constant values
         enum Constants
@@ -147,7 +148,7 @@ namespace RadeonRays
         static inline void SetPrimitive(
             Node &node,
             std::uint32_t index,
-            std::pair<const Mesh *, std::size_t> ref);
+            std::pair<const Shape *, std::size_t> ref);
 
         static inline bool IsInternal(const Node &node);
         static inline std::uint32_t GetChildIndex(const Node &node, std::uint8_t idx);
@@ -273,7 +274,7 @@ namespace RadeonRays
                 _mm_store_ps(&aabb_max[current_face].x, pmax);
                 _mm_store_ps(&aabb_centroid[current_face].x, centroid);
 
-                metadata[current_face] = std::make_pair(mesh, face_index);
+                metadata[current_face] = std::make_pair(shape, face_index);
             }
         }
 
@@ -329,10 +330,11 @@ namespace RadeonRays
     void Bvh2::SetPrimitive(
         Node &node,
         std::uint32_t index,
-        std::pair<const Mesh *, std::size_t> ref)
+        std::pair<const Shape *, std::size_t> ref)
     {
-        auto mesh = ref.first;
+        auto shape = ref.first;
         matrix worldmat, worldmatinv;
+        auto mesh = static_cast<const Mesh *>(static_cast<const ShapeImpl *>(shape)->is_instance() ? static_cast<const Instance *>(shape)->GetBaseShape() : shape);
         mesh->GetTransform(worldmat, worldmatinv);
         auto face = mesh->GetFaceData()[ref.second];
         auto v0 = transform_point(mesh->GetVertexData()[face.idx[0]], worldmat);
@@ -347,7 +349,7 @@ namespace RadeonRays
         node.aabb_right_min_or_v2[0] = v2.x;
         node.aabb_right_min_or_v2[1] = v2.y;
         node.aabb_right_min_or_v2[2] = v2.z;
-        node.mesh_id = mesh->GetId();
+        node.mesh_id = shape->GetId();
         node.prim_id = static_cast<std::uint32_t>(ref.second);
     }
 

RadeonRays/src/device/calc_intersection_device.cpp

@@ -126,7 +126,7 @@ namespace RadeonRays
                         m_intersector_string = "fatbvh";
 #else
                         m_intersector.reset(new IntersectorLDS(m_device.get()));
-                        m_intersector_string = "bvh2";
+                        m_intersector_string = "fatbvh";
 #endif
                     }
                 }