filipppavlov · Oct 8, 2026 · Aug 27, 2026 · Aug 28, 2026 · Aug 31, 2026 · Aug 31, 2026
diff --git a/trinity/Eve/EveEffectRoot2.cpp b/trinity/Eve/EveEffectRoot2.cpp
@@ -5,6 +5,7 @@
 
 #include "Utilities/BoundingSphere.h"
 #include "Utilities/BoundingBox.h"
+#include "Utilities/Obb.h"
 #include "TriFrustum.h"
 #include "Lights/Tr2PointLight.h"
 #include "Tr2LightManager.h"
@@ -431,15 +432,17 @@ void EveEffectRoot2::GetLocalToWorldTransform( Matrix& transform ) const
 	transform = m_lastUpdateMatrix;
 }
 
-bool EveEffectRoot2::GetWorldBoundingBox( Vector3& min, Vector3& max ) const
+bool EveEffectRoot2::GetOrientedBoundingBox( Vector3& localMin, Vector3& localMax, Matrix& localToWorld ) const
 {
 	if( m_boundingSphere.w <= 0.0f )
 	{
 		return false;
 	}
 
-	BoundingBoxInitialize( m_boundingSphere, min, max );
-	BoundingBoxTransform( min, max, m_lastUpdateMatrix );
+	CcpMath::Sphere worldSphere( m_boundingSphere );
+	worldSphere.Transform( m_lastUpdateMatrix );
+	BoundingBoxInitialize( Vector4( worldSphere.center, worldSphere.radius ), localMin, localMax );
+	localToWorld = IdentityMatrix();
 	return true;
 }
 

diff --git a/trinity/Eve/EveEffectRoot2.h b/trinity/Eve/EveEffectRoot2.h
@@ -92,7 +92,7 @@ BLUE_CLASS( EveEffectRoot2 ) :
 
 	/////////////////////////////////////////////////////////////////////////////////////
 	// ITr2BoundingBox
-	bool GetWorldBoundingBox( Vector3 & min, Vector3 & max ) const override;
+	bool GetOrientedBoundingBox( Vector3 & localMin, Vector3 & localMax, Matrix & localToWorld ) const override;
 	bool IsBoundingBoxReady() const override;
 
 	/////////////////////////////////////////////////////////////////////////////////////

diff --git a/trinity/Eve/EvePlanet.cpp b/trinity/Eve/EvePlanet.cpp
@@ -8,6 +8,7 @@
 #include "EveUpdateContext.h"
 #include "Curves/TriCurveSet.h"
 #include "Utilities/BoundingBox.h"
+#include "Utilities/Obb.h"
 
 const float EvePlanet::SCALE = 1000000.0f;
 
@@ -150,19 +151,18 @@ Quaternion EvePlanet::GetWorldRotation()
 	return m_rotation;
 }
 
-bool EvePlanet::GetWorldBoundingBox( Vector3& min, Vector3& max ) const
+bool EvePlanet::GetOrientedBoundingBox( Vector3& localMin, Vector3& localMax, Matrix& localToWorld ) const
 {
-	Vector4 sphere;
 	if( m_radius <= 0.0f )
 	{
 		return false;
 	}
 
 	const float renderScale = m_renderScale > 0.0f ? m_renderScale : 1.0f;
 	const Matrix scaledTransform = CalculatePlanetScaleTransform( m_worldTransform, renderScale );
-	sphere = Vector4( scaledTransform.GetTranslation(), m_radius / renderScale );
-
-	BoundingBoxInitialize( sphere, min, max );
+	const float radius = m_radius / renderScale;
+	BoundingBoxInitialize( Vector4( scaledTransform.GetTranslation(), radius ), localMin, localMax );
+	localToWorld = IdentityMatrix();
 	return true;
 }
 

diff --git a/trinity/Eve/EvePlanet.h b/trinity/Eve/EvePlanet.h
@@ -60,7 +60,7 @@ BLUE_CLASS( EvePlanet ) :
 	virtual Quaternion GetWorldRotation();
 
 	// ITr2BoundingBox
-	bool GetWorldBoundingBox( Vector3 & min, Vector3 & max ) const override;
+	bool GetOrientedBoundingBox( Vector3 & localMin, Vector3 & localMax, Matrix & localToWorld ) const override;
 	bool IsBoundingBoxReady() const override;
 
 	// ITr2SecondaryLightSource

diff --git a/trinity/Eve/EveTransform.cpp b/trinity/Eve/EveTransform.cpp
@@ -6,6 +6,7 @@
 #include "Utilities/Vector3d.h"
 #include "Utilities/BoundingSphere.h"
 #include "Utilities/BoundingBox.h"
+#include "Utilities/Obb.h"
 #include "TriFrustum.h"
 #include "Particle/Tr2ParticleSystem.h"
 #include "Particle/ITr2GenericEmitter.h"
@@ -381,13 +382,13 @@ bool EveTransform::GetLocalBoundingBox( Vector3& min, Vector3& max )
 	return true;
 }
 
-bool EveTransform::GetWorldBoundingBox( Vector3& min, Vector3& max ) const
+bool EveTransform::GetOrientedBoundingBox( Vector3& localMin, Vector3& localMax, Matrix& localToWorld ) const
 {
-	if( !GetDirectLocalBounds( m_overrideBoundsMin, m_overrideBoundsMax, m_mesh, min, max ) )
+	if( !GetDirectLocalBounds( m_overrideBoundsMin, m_overrideBoundsMax, m_mesh, localMin, localMax ) )
 	{
 		return false;
 	}
-	BoundingBoxTransform( min, max, m_worldTransform );
+	localToWorld = m_worldTransform;
 	return true;
 }
 

diff --git a/trinity/Eve/EveTransform.h b/trinity/Eve/EveTransform.h
@@ -69,7 +69,7 @@ BLUE_CLASS( EveTransform ) :
 
 	/////////////////////////////////////////////////////////////////////////////////////
 	// ITr2BoundingBox
-	bool GetWorldBoundingBox( Vector3 & min, Vector3 & max ) const override;
+	bool GetOrientedBoundingBox( Vector3 & localMin, Vector3 & localMax, Matrix & localToWorld ) const override;
 	bool IsBoundingBoxReady() const override;
 
 	/////////////////////////////////////////////////////////////////////////////////////

diff --git a/trinity/Eve/SpaceObject/EveSpaceObject2.cpp b/trinity/Eve/SpaceObject/EveSpaceObject2.cpp
@@ -5,6 +5,7 @@
 #include "Utilities/BoundingBox.h"
 #include "Utilities/BoundingSphere.h"
 #include "Utilities/MatrixUtils.h"
+#include "Utilities/Obb.h"
 
 #include "include/ITr2DebugRenderer.h"
 #include "Include/TriMath.h"
@@ -4198,11 +4199,11 @@ void EveSpaceObject2::GetPickingBatches( ITriRenderBatchAccumulator* batches, Tr
 	}
 }
 
-bool EveSpaceObject2::GetWorldBoundingBox( Vector3& min, Vector3& max ) const
+bool EveSpaceObject2::GetOrientedBoundingBox( Vector3& localMin, Vector3& localMax, Matrix& localToWorld ) const
 {
-	min = m_localAabbMin;
-	max = m_localAabbMax;
-	BoundingBoxTransform( min, max, m_worldTransform );
+	localMin = m_localAabbMin;
+	localMax = m_localAabbMax;
+	localToWorld = m_worldTransform;
 	return true;
 }
 

diff --git a/trinity/Eve/SpaceObject/EveSpaceObject2.h b/trinity/Eve/SpaceObject/EveSpaceObject2.h
@@ -348,7 +348,7 @@ BLUE_CLASS( EveSpaceObject2 ) :
 
 	/////////////////////////////////////////////////////////////////////////////////////
 	// ITr2BoundingBox
-	virtual bool GetWorldBoundingBox( Vector3 & min, Vector3 & max ) const;
+	virtual bool GetOrientedBoundingBox( Vector3 & localMin, Vector3 & localMax, Matrix & localToWorld ) const;
 	virtual bool IsBoundingBoxReady() const;
 
 	/////////////////////////////////////////////////////////////////////////////////////

diff --git a/trinity/Include/ITr2BoundingBox.h b/trinity/Include/ITr2BoundingBox.h
@@ -6,11 +6,12 @@
 #define ITr2BoundingBox_h
 
 struct Vector3;
+struct Matrix;
 
 BLUE_INTERFACE( ITr2BoundingBox ) :
 	IRoot
 {
-	virtual bool GetWorldBoundingBox( Vector3 & min, Vector3 & max ) const = 0;
+	virtual bool GetOrientedBoundingBox( Vector3 & localMin, Vector3 & localMax, Matrix & localToWorld ) const = 0;
 	virtual bool IsBoundingBoxReady( void ) const = 0;
 };
 

diff --git a/trinity/Interior/Tr2IntSkinnedObject.cpp b/trinity/Interior/Tr2IntSkinnedObject.cpp
@@ -5,6 +5,7 @@
 #include "Tr2IntSkinnedObject.h"
 
 #include "Utilities/BoundingSphere.h"
+#include "Utilities/Obb.h"
 #include "TriSettingsRegistrar.h"
 #include "Tr2PerObjectData.h"
 #include "Resources/TriGeometryRes.h"
@@ -147,10 +148,20 @@ bool Tr2IntSkinnedObject::GetWorldBoundingBox( Vector3& min, Vector3& max ) cons
 	return true;
 }
 
+bool Tr2IntSkinnedObject::GetOrientedBoundingBox( Vector3& localMin, Vector3& localMax, Matrix& localToWorld ) const
+{
+	if( !GetLocalBoundingBox( localMin, localMax ) )
+	{
+		return false;
+	}
+	localToWorld = GetSkinningTransform();
+	return true;
+}
+
 bool Tr2IntSkinnedObject::IsBoundingBoxReady( void ) const
 {
 	Vector3 min, max;
-	return GetWorldBoundingBox( min, max );
+	return GetLocalBoundingBox( min, max );
 }
 
 void Tr2IntSkinnedObject::AddToApexScene( Tr2ApexScene* apexScene )

diff --git a/trinity/Interior/Tr2IntSkinnedObject.h b/trinity/Interior/Tr2IntSkinnedObject.h
@@ -92,6 +92,9 @@ class Tr2IntSkinnedObject : public ITr2InteriorDynamic,
 	virtual bool GetWorldBoundingBox( Vector3& min, Vector3& max ) const;
 	virtual bool IsBoundingBoxReady( void ) const;
 
+	// ITr2BoundingBox
+	virtual bool GetOrientedBoundingBox( Vector3& localMin, Vector3& localMax, Matrix& localToWorld ) const;
+
 	// Apex
 	void AddToApexScene( Tr2ApexScene* apexScene );
 	void RemoveFromApexScene( void );

diff --git a/trinity/Interior/Tr2InteriorPlaceable.cpp b/trinity/Interior/Tr2InteriorPlaceable.cpp
@@ -8,6 +8,7 @@
 
 // Trinity headers
 #include "Utilities/BoundingSphere.h"
+#include "Utilities/Obb.h"
 #include "Tr2PerObjectData.h"
 #include "Wod/WodPlaceableRes.h"
 #include "Tr2Mesh.h"
@@ -135,6 +136,16 @@ bool Tr2InteriorPlaceable::GetWorldBoundingBox( Vector3& min, Vector3& max ) con
 	return true;
 }
 
+bool Tr2InteriorPlaceable::GetOrientedBoundingBox( Vector3& localMin, Vector3& localMax, Matrix& localToWorld ) const
+{
+	if( !GetLocalBoundingBox( localMin, localMax ) )
+	{
+		return false;
+	}
+	localToWorld = m_transform;
+	return true;
+}
+
 bool Tr2InteriorPlaceable::IsBoundingBoxReady( void ) const
 {
 	return m_isBoundingBoxModified || ( m_placeableRes && m_placeableRes->IsReady() );

diff --git a/trinity/Interior/Tr2InteriorPlaceable.h b/trinity/Interior/Tr2InteriorPlaceable.h
@@ -74,6 +74,10 @@ class Tr2InteriorPlaceable : public INotify,
 	virtual bool GetLocalBoundingBox( Vector3& min, Vector3& max ) const;
 	virtual bool GetWorldBoundingBox( Vector3& min, Vector3& max ) const;
 	virtual bool IsBoundingBoxReady( void ) const;
+
+	/////////////////////////////////////////////////////////////////////////////////////
+	// ITr2BoundingBox
+	virtual bool GetOrientedBoundingBox( Vector3& localMin, Vector3& localMax, Matrix& localToWorld ) const;
 	virtual void PrePhysicsUpdate( Be::Time time );
 	virtual void PostPhysicsUpdate( Be::Time time, Tr2ApexScene* apexScene );