Fixed Camera Collision on Polysoup

MBU-Team · Mar 5, 2024 · aceb999 · aceb999
1 parent e94b5fd
commit aceb999
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/engine/source/game/marble/marblecamera.cpp b/engine/source/game/marble/marblecamera.cpp
@@ -8,7 +8,7 @@
 
 //----------------------------------------------------------------------------
 
-static U32 sCameraCollisionMask = InteriorObjectType | StaticShapeObjectType;
+static U32 sCameraCollisionMask = InteriorObjectType | StaticShapeObjectType | StaticTSObjectType;
 
 #ifdef MB_GOLD
 #define RADIUS_FOR_CAMERA 0.09f

diff --git a/engine/source/ts/tsCollision.cpp b/engine/source/ts/tsCollision.cpp
@@ -535,6 +535,9 @@ bool TSShapeInstance::castRayOpcode(S32 dl, const Point3F& startPos, const Point
     S32 ss = detail->subShapeNum;
     S32 od = detail->objectDetailNum;
 
+    // set up static data
+    setStatics(dl);
+
     // nothing emitted yet...
     bool emitted = false;
 
@@ -554,7 +557,7 @@ bool TSShapeInstance::castRayOpcode(S32 dl, const Point3F& startPos, const Point
         // run through objects and collide
         for (S32 i = start; i < end; i++)
         {
-            MeshObjectInstance* mesh = &mMeshObjects[i];
+            MeshObjectInstance *mesh = &mMeshObjects[i];
 
             if (od >= mesh->object->numMeshes)
                 continue;