Inherit first-person /viewer flags from an instance

Source/ASManager.cpp

@@ -801,9 +801,10 @@ bool RTGL1::ASManager::AddMeshPrimitive( uint32_t frameIndex,
  // register the built instance as an instance in this frame
  curFrame_objects.push_back( Object{
  .builtInstance = builtInstance.get(),
+ .isStatic = isStatic,
  .uniqueID = uniqueID,
  .transform = mesh.transform,
- .isStatic = isStatic,
+ .instanceFlags = geomFlags,
  } );
 
  // make geom info
@@ -890,10 +891,11 @@ void RTGL1::ASManager::SubmitDynamicGeometry( DynamicGeometryToken& token,
  }
 }
 
-auto RTGL1::ASManager::MakeVkTLAS( const BuiltAS& builtAS,
- uint32_t rayCullMaskWorld,
- bool allowGeometryWithSkyFlag,
- const RgTransform& transform )
+auto RTGL1::ASManager::MakeVkTLAS( const BuiltAS& builtAS,
+ uint32_t rayCullMaskWorld,
+ bool allowGeometryWithSkyFlag,
+ const RgTransform& instanceTransform,
+ VertexCollectorFilterTypeFlags instanceFlags )
  -> std::optional< VkAccelerationStructureInstanceKHR >
 {
  using FT = VertexCollectorFilterTypeFlagBits;
@@ -915,15 +917,17 @@ auto RTGL1::ASManager::MakeVkTLAS( const BuiltAS& builtAS,
 
 
  auto instance = VkAccelerationStructureInstanceKHR{
- .transform = rgToVkTransform( transform ),
+ .transform = rgToVkTransform( instanceTransform ),
  .instanceCustomIndex = 0,
  .mask = 0,
  .instanceShaderBindingTableRecordOffset = 0,
  .flags = 0,
  .accelerationStructureReference = builtAS.blas.GetASAddress(),
  };
 
- const auto filter = builtAS.flags;
+ // inherit some bits from an instance
+ const auto filter =
+ builtAS.flags | ( instanceFlags & ( FT::PV_FIRST_PERSON | FT::PV_FIRST_PERSON_VIEWER ) );
 
 
  if( filter & FT::PV_FIRST_PERSON )
@@ -1056,7 +1060,8 @@ void RTGL1::ASManager::BuildTLAS( VkCommandBuffer cmd,
  auto vkTlas = MakeVkTLAS( *obj.builtInstance,
  uniformData_rayCullMaskWorld,
  allowGeometryWithSkyFlag,
- obj.transform );
+ obj.transform,
+ obj.instanceFlags );
 
  if( !vkTlas )
  {

Source/ASManager.h

@@ -110,10 +110,11 @@ class ASManager
  VertexCollector::UploadResult geometry;
  };
 
- static auto MakeVkTLAS( const BuiltAS& builtAS,
- uint32_t rayCullMaskWorld,
- bool allowGeometryWithSkyFlag,
- const RgTransform& transform )
+ static auto MakeVkTLAS( const BuiltAS& builtAS,
+ uint32_t rayCullMaskWorld,
+ bool allowGeometryWithSkyFlag,
+ const RgTransform& instanceTransform,
+ VertexCollectorFilterTypeFlags instanceFlags )
  -> std::optional< VkAccelerationStructureInstanceKHR >;
 
 private:
@@ -150,10 +151,12 @@ class ASManager
  struct Object
  {
  // should be weak_ptr
- BuiltAS* builtInstance;
- PrimitiveUniqueID uniqueID;
- RgTransform transform;
- bool isStatic;
+ BuiltAS* builtInstance;
+ bool isStatic;
+ // per instance params
+ PrimitiveUniqueID uniqueID;
+ RgTransform transform;
+ VertexCollectorFilterTypeFlags instanceFlags;
  };
  std::vector< Object > curFrame_objects;