Rework bounding box bracket projection and implement ITr2BoundingBox on more space objects

trinity/Eve/EveEffectRoot2.cpp

@@ -4,6 +4,7 @@
 #include "EveEffectRoot2.h"
 
 #include "Utilities/BoundingSphere.h"
+#include "Utilities/BoundingBox.h"
 #include "TriFrustum.h"
 #include "Lights/Tr2PointLight.h"
 #include "Tr2LightManager.h"
@@ -398,8 +399,13 @@ void EveEffectRoot2::GetModelCenterWorldPosition( Vector3& position ) const
 
 bool EveEffectRoot2::GetLocalBoundingBox( Vector3& min, Vector3& max )
 {
-	// If possible, return an AABB in local coordinates
-	return false;
+	if( m_boundingSphere.w <= 0.0f )
+	{
+		return false;
+	}
+
+	BoundingBoxInitialize( m_boundingSphere, min, max );
+	return true;
 }
 
 void EveEffectRoot2::GetLocalToWorldTransform( Matrix& transform ) const
@@ -408,6 +414,23 @@ void EveEffectRoot2::GetLocalToWorldTransform( Matrix& transform ) const
 	transform = m_lastUpdateMatrix;
 }
 
+bool EveEffectRoot2::GetWorldBoundingBox( Vector3& min, Vector3& max ) const
+{
+	if( m_boundingSphere.w <= 0.0f )
+	{
+		return false;
+	}
+
+	BoundingBoxInitialize( m_boundingSphere, min, max );
+	BoundingBoxTransform( min, max, m_lastUpdateMatrix );
+	return true;
+}
+
+bool EveEffectRoot2::IsBoundingBoxReady() const
+{
+	return m_boundingSphere.w > 0.0f;
+}
+
 void EveEffectRoot2::RegisterWithQuadRenderer( Tr2QuadRenderer& quadRenderer )
 {
 	for( auto it = m_effectChildren.begin(); it != m_effectChildren.end(); ++it )
@@ -995,4 +1018,4 @@ void EveEffectRoot2::SetProceduralContainerVariable( const char* name, float val
 		auto child = *it;
 		child->SetProceduralContainerVariable( name, value );
 	}
-}
+}

trinity/Eve/EveEffectRoot2.h

@@ -19,6 +19,7 @@
 #include "ITr2SoundEmitterOwner.h"
 #include "Controllers/ITr2ControllerOwner.h"
 #include "Lights/ITr2LightOwner.h"
+#include "ITr2BoundingBox.h"
 #include "EveEntity.h"
 
 #include <ITriFunction.h>
@@ -49,6 +50,7 @@ BLUE_CLASS( EveEffectRoot2 ) :
 	public ITr2SoundEmitterOwner,
 	public ITr2ControllerOwner,
 	public ITr2LightOwner,
+	public ITr2BoundingBox,
 	public EveEntity
 
 {
@@ -88,6 +90,11 @@ BLUE_CLASS( EveEffectRoot2 ) :
 	void AddQuadsToQuadRenderer( const TriFrustum& frustum, Tr2QuadRenderer& quadRenderer );
 	void SetProceduralContainerVariable( const char* name, float value ) override;
 
+	/////////////////////////////////////////////////////////////////////////////////////
+	// ITr2BoundingBox
+	bool GetWorldBoundingBox( Vector3 & min, Vector3 & max ) const override;
+	bool IsBoundingBoxReady() const override;
+
 	/////////////////////////////////////////////////////////////////////////////////////
 	// ITr2LightOwner
 	void GetLights( Tr2LightManager & lightManager ) const override;
@@ -229,4 +236,4 @@ BLUE_CLASS( EveEffectRoot2 ) :
 
 TYPEDEF_BLUECLASS( EveEffectRoot2 );
 
-#endif // EveEffectRoot2_h
+#endif // EveEffectRoot2_h

trinity/Eve/EveEffectRoot2_Blue.cpp

@@ -19,6 +19,7 @@ const Be::ClassInfo* EveEffectRoot2::ExposeToBlue()
 		MAP_INTERFACE( IShaderConfigurer )
 		MAP_INTERFACE( ITr2SoundEmitterOwner )
 		MAP_INTERFACE( ITr2LightOwner )
+		MAP_INTERFACE( ITr2BoundingBox )
 		MAP_INTERFACE( IWorldPosition )
 		MAP_INTERFACE( EveEntity )
 

trinity/Eve/EvePlanet.cpp

@@ -7,6 +7,7 @@
 #include "TriDevice.h"
 #include "EveUpdateContext.h"
 #include "Curves/TriCurveSet.h"
+#include "Utilities/BoundingBox.h"
 
 const float EvePlanet::SCALE = 1000000.0f;
 
@@ -149,6 +150,27 @@ Quaternion EvePlanet::GetWorldRotation()
 	return m_rotation;
 }
 
+bool EvePlanet::GetWorldBoundingBox( Vector3& min, Vector3& max ) 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 );
+	return true;
+}
+
+bool EvePlanet::IsBoundingBoxReady() const
+{
+	return m_radius > 0.0f;
+}
+
 // --------------------------------------------------------------------------------
 // Description:
 //   Calculate the pixeldiameter of this planet sphere at a given position. Is used
@@ -386,4 +408,4 @@ void EvePlanet::RenderDebugInfo( ITr2DebugRenderer2& renderer )
 			renderable->RenderDebugInfo( renderer );
 		}
 	}
-}
+}

trinity/Eve/EvePlanet.h

@@ -59,6 +59,10 @@ BLUE_CLASS( EvePlanet ) :
 	virtual Vector3 GetWorldPosition();
 	virtual Quaternion GetWorldRotation();
 
+	// ITr2BoundingBox
+	bool GetWorldBoundingBox( Vector3 & min, Vector3 & max ) const override;
+	bool IsBoundingBoxReady() const override;
+
 	// ITr2SecondaryLightSource
 	virtual void RegisterSecondaryLightSource( Tr2ShLightingManager& );
 	virtual void UnregisterSecondaryLightSource( Tr2ShLightingManager& );

trinity/Eve/EvePlanet_Blue.cpp

@@ -17,6 +17,7 @@ const Be::ClassInfo* EvePlanet::ExposeToBlue()
 		MAP_INTERFACE( IShaderConfigurer )
 		MAP_INTERFACE( ITr2SoundEmitterOwner )
 		MAP_INTERFACE( IWorldPosition )
+		MAP_INTERFACE( ITr2BoundingBox )
 		MAP_ATTRIBUTE(
 			"radius",
 			m_radius,

trinity/Eve/EveRootTransform_Blue.cpp

@@ -13,6 +13,7 @@ const Be::ClassInfo* EveRootTransform::ExposeToBlue()
 		MAP_INTERFACE( ITriTargetable )
 		MAP_INTERFACE( ITr2Pickable )
 		MAP_INTERFACE( IWorldPosition )
+		MAP_INTERFACE( ITr2BoundingBox )
 
 		MAP_ATTRIBUTE(
 			"translationCurve",

trinity/Eve/EveTransform.cpp

@@ -17,6 +17,26 @@
 
 extern float g_eveSpaceSceneLowUpdateRate;
 
+namespace
+{
+bool HasOverrideBounds( const Vector3& boundsMin, const Vector3& boundsMax )
+{
+	return boundsMax.x != boundsMin.x || boundsMax.y != boundsMin.y || boundsMax.z != boundsMin.z;
+}
+
+bool GetDirectLocalBounds( const Vector3& overrideBoundsMin, const Vector3& overrideBoundsMax, Tr2MeshBase* mesh, Vector3& min, Vector3& max )
+{
+	if( HasOverrideBounds( overrideBoundsMin, overrideBoundsMax ) )
+	{
+		min = overrideBoundsMin;
+		max = overrideBoundsMax;
+		return true;
+	}
+
+	return mesh && mesh->GetBoundingBox( min, max );
+}
+}
+
 EveTransform::EveTransform( IRoot* lockobj ) :
 	Tr2Transform( lockobj ),
 	PARENTLOCK( m_children ),
@@ -351,6 +371,33 @@ void EveTransform::GetRenderables( std::vector<ITr2Renderable*>& renderables )
 	GetRenderables( renderables, nullptr );
 }
 
+bool EveTransform::GetLocalBoundingBox( Vector3& min, Vector3& max )
+{
+	if( !GetDirectLocalBounds( m_overrideBoundsMin, m_overrideBoundsMax, m_mesh, min, max ) )
+	{
+		return false;
+	}
+
+	return true;
+}
+
+bool EveTransform::GetWorldBoundingBox( Vector3& min, Vector3& max ) const
+{
+	if( !GetDirectLocalBounds( m_overrideBoundsMin, m_overrideBoundsMax, m_mesh, min, max ) )
+	{
+		return false;
+	}
+	BoundingBoxTransform( min, max, m_worldTransform );
+	return true;
+}
+
+bool EveTransform::IsBoundingBoxReady() const
+{
+	Vector3 min;
+	Vector3 max;
+	return GetDirectLocalBounds( m_overrideBoundsMin, m_overrideBoundsMax, m_mesh, min, max );
+}
+
 bool EveTransform::GetBoundingSphere( Vector4& sphere, BoundingSphereQuery query ) const
 {
 	bool valid = false;
@@ -506,4 +553,4 @@ void EveTransform::GetPickingBatches( ITriRenderBatchAccumulator* batches, Tr2Pi
 		GetBatches( batches, TRIBATCHTYPE_TRANSPARENT, perObjectData );
 		GetBatches( batches, TRIBATCHTYPE_ADDITIVE, perObjectData );
 	}
-}
+}

trinity/Eve/EveTransform.h

@@ -16,6 +16,7 @@
 
 #include "IEveTransform.h"
 #include "IWorldPosition.h"
+#include "ITr2BoundingBox.h"
 
 BLUE_DECLARE( Tr2ParticleSystem );
 BLUE_DECLARE_VECTOR( Tr2ParticleSystem );
@@ -37,6 +38,7 @@ BLUE_CLASS( EveTransform ) :
 	public IWorldPosition,
 	public IInitialize,
 	public ITr2CurveSetOwner,
+	public ITr2BoundingBox,
 	public ITr2DebugRenderable
 {
 public:
@@ -59,15 +61,17 @@ BLUE_CLASS( EveTransform ) :
 	bool GetBoundingSphere( Vector4 & sphere, BoundingSphereQuery query = EVE_BOUNDS_NORMAL ) const override;
 	void UpdateModelCenterWorldPosition( Vector3 & position, Be::Time t ) override;
 	void GetModelCenterWorldPosition( Vector3 & position ) const override;
-	bool GetLocalBoundingBox( Vector3 & min, Vector3 & max ) override
-	{
-		return false;
-	}
+	bool GetLocalBoundingBox( Vector3 & min, Vector3 & max ) override;
 	void GetLocalToWorldTransform( Matrix & transform ) const override
 	{
-		transform = IdentityMatrix();
+		transform = m_worldTransform;
 	}
 
+	/////////////////////////////////////////////////////////////////////////////////////
+	// ITr2BoundingBox
+	bool GetWorldBoundingBox( Vector3 & min, Vector3 & max ) const override;
+	bool IsBoundingBoxReady() const override;
+
 	/////////////////////////////////////////////////////////////////////////////////////
 	// ITr2Renderable - mostly implemented by Tr2Transform except for these
 	virtual Tr2PerObjectData* GetPerObjectData( ITriRenderBatchAccumulator * accumulator );

trinity/Eve/EveTransform_Blue.cpp

@@ -16,6 +16,7 @@ const Be::ClassInfo* EveTransform::ExposeToBlue()
 		MAP_INTERFACE( ITr2Pickable )
 		MAP_INTERFACE( IWorldPosition )
 		MAP_INTERFACE( IInitialize )
+		MAP_INTERFACE( ITr2BoundingBox )
 
 		MAP_ATTRIBUTE(
 			"hideOnLowQuality",