Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions trinity/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,8 @@ set(_SOURCES
Eve/SpaceObject/Utils/fxAttributes/EveSpaceObjectFxAttributes.h
Eve/SpaceObject/Utils/fxAttributes/EveSpaceObjectFxAttributes_Blue.cpp
Eve/SpaceObject/Utils/fxAttributes/IEveFxAttribute.h
Eve/SpaceObject/Utils/EveAudioOccluder.cpp
Eve/SpaceObject/Utils/EveAudioOccluder.h
Eve/SpaceObject/Utils/EveBoosterUtilities.cpp
Eve/SpaceObject/Utils/EveBoosterUtilities.h
Eve/SpaceObject/Utils/EveCustomMask.cpp
Expand Down
66 changes: 66 additions & 0 deletions trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ EveChildInstancedMeshes::EveChildInstancedMeshes( IRoot* lockobj )

EveChildInstancedMeshes::~EveChildInstancedMeshes()
{
UnregisterAudioGeometry();
UnregisterFromMeshManager();
for( Mesh& mesh : m_meshes )
{
Expand Down Expand Up @@ -63,9 +64,67 @@ void EveChildInstancedMeshes::RegisterComponents()

void EveChildInstancedMeshes::UnRegisterComponents()
{
UnregisterAudioGeometry();
UnregisterFromMeshManager();
}

void EveChildInstancedMeshes::UpdateAudioGeometry( bool allowAudioGeometry )
{
if( !allowAudioGeometry || !g_eveIsAudioOcclusionGeometryEnabled )
{
UnregisterAudioGeometry();
return;
}

const bool moved = m_audioWorldTransform != m_worldTransform;
if( !m_audioGeometryDirty && !m_audioGeometryPending && !moved )
{
return;
}

if( m_audioGeometryDirty )
{
size_t count = 0;
for( const Mesh& mesh : m_meshes )
{
count += mesh.instances.size();
}
m_audioInstances.resize( count );

size_t slot = 0;
for( uint32_t meshIndex = 0; meshIndex < m_meshes.size(); ++meshIndex )
{
for( const auto& instance : m_meshes[meshIndex].instances )
{
AudioInstance& audioInstance = m_audioInstances[slot++];
audioInstance.mesh = meshIndex;
audioInstance.localTransform = Matrix( instance.worldTransform );
}
}
m_audioGeometryDirty = false;
}

if( !m_audioGeometry )
{
m_audioGeometry = EveAudioOccluder::CreateAudioGeometry();
}

m_audioWorldTransform = m_worldTransform;
m_audioGeometryPending = false;
for( AudioInstance& audioInstance : m_audioInstances )
{
const Mesh& mesh = m_meshes[audioInstance.mesh];
m_audioGeometryPending |= mesh.geometry && mesh.geometry->IsLoading();
audioInstance.occluder.Update( m_audioGeometry, mesh.geometry, mesh.meshIndex, audioInstance.localTransform * m_worldTransform );
}
}

void EveChildInstancedMeshes::UnregisterAudioGeometry()
{
m_audioInstances.clear();
m_audioGeometryDirty = true;
}

void EveChildInstancedMeshes::UnregisterFromMeshManager()
{
for( Mesh& mesh : m_meshes )
Expand Down Expand Up @@ -216,6 +275,8 @@ void EveChildInstancedMeshes::UpdateSyncronous( const EveUpdateContext& updateCo
{
m_worldTransform = params.localToWorldTransform;

UpdateAudioGeometry( !params.spaceObjectParent || params.spaceObjectParent->IsAudioOccluder() );

// overlay effect curves must update on the game thread; they may reference attributes that are not thread safe
Be::Time time = updateContext.GetTime();
for( Mesh& mesh : m_meshes )
Expand Down Expand Up @@ -535,6 +596,7 @@ void EveChildInstancedMeshes::AddMesh(
GetOwner()->InvalidateMergedLocators( LocatorInvalidationReason::StructureChanged );
}
m_allRegistered = false;
m_audioGeometryDirty = true;
return;
}

Expand Down Expand Up @@ -598,6 +660,7 @@ void EveChildInstancedMeshes::AddMesh(
GetOwner()->InvalidateMergedLocators( LocatorInvalidationReason::StructureChanged );
}
m_allRegistered = false;
m_audioGeometryDirty = true;
}

void EveChildInstancedMeshes::RemoveInstancesByPartTag( EveSpaceObjectChild::PartTag partTag )
Expand All @@ -616,6 +679,7 @@ void EveChildInstancedMeshes::RemoveInstancesByPartTag( EveSpaceObjectChild::Par
continue;
}
removedOwnedLocators |= !mesh.ownedLocatorSets.empty();
m_audioGeometryDirty = true;
if( newEnd == begin( mesh.instances ) )
{
if( mesh.sphereHandle )
Expand Down Expand Up @@ -687,6 +751,7 @@ void EveChildInstancedMeshes::SetInstanceTransformByPartTag( PartTag partTag, co
mesh.instances[i].worldTransform = packedTransform;
mesh.instances[i].mirrored = mirrored;
movedOwnedLocators |= !mesh.ownedLocatorSets.empty();
m_audioGeometryDirty = true;
}
}
}
Expand All @@ -706,6 +771,7 @@ void EveChildInstancedMeshes::RebuildCachedData( BlueAsyncRes* p )
{
if( mesh.geometry == p )
{
m_audioGeometryDirty = true;
mesh.combinedVertexDeclaration = Tr2EffectStateManager::UNINITIALIZED_DECLARATION;

if( auto data = mesh.geometry->GetMeshData( mesh.meshIndex ) )
Expand Down
44 changes: 31 additions & 13 deletions trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "ITr2Renderable.h"
#include "Tr2PersistentPerObjectData.h"
#include "../Attachments/EveMeshOverlayEffect.h"
#include "../Utils/EveAudioOccluder.h"

BLUE_DECLARE( TriGeometryRes );
BLUE_DECLARE( Tr2Effect );
Expand All @@ -32,11 +33,11 @@ BLUE_CLASS( EveChildInstancedMeshes ) :
/////////////////////////////////////////////////////////////////////////////////////
// EveSpaceObjectChild
void UpdateVisibility( const EveUpdateContext& updateContext, const Matrix& parentTransform, Tr2Lod parentLod ) override;
void GetRenderables( std::vector<ITr2Renderable*> & renderables ) override;
bool GetBoundingSphere( Vector4 & sphere, BoundingSphereQuery query = EVE_BOUNDS_NORMAL ) const override;
void GetRenderables( std::vector<ITr2Renderable*>& renderables ) override;
bool GetBoundingSphere( Vector4& sphere, BoundingSphereQuery query = EVE_BOUNDS_NORMAL ) const override;
void UpdateSyncronous( const EveUpdateContext& updateContext, const EveChildUpdateParams& params ) override;
void UpdateAsyncronous( const EveUpdateContext& updateContext, const EveChildUpdateParams& params ) override;
void GetLocalToWorldTransform( Matrix & transform ) const override;
void GetLocalToWorldTransform( Matrix& transform ) const override;
void Setup( const Vector3* scale, const Quaternion* rotation, const Vector3* translation, Tr2Lod lowestLodVisible ) override;
void SetShaderOption( const BlueSharedString& name, const BlueSharedString& value ) override;

Expand All @@ -49,27 +50,27 @@ BLUE_CLASS( EveChildInstancedMeshes ) :
//////////////////////////////////////////////////////////////////////////////////////
// IEveShadowCaster
bool IsCastingShadow( const TriFrustum& cameraFrustum, const IEveShadowFrustum& shadowFrustum, Tr2RenderReason renderReason, float& sizeInShadow ) const override;
void GetShadowBatches( ITriRenderBatchAccumulator * batches, const Tr2PerObjectData* perObjectData, float shadowPixelSize ) override;
Tr2PerObjectData* GetShadowPerObjectData( ITriRenderBatchAccumulator * accumulator ) override;
void GetShadowBatches( ITriRenderBatchAccumulator* batches, const Tr2PerObjectData* perObjectData, float shadowPixelSize ) override;
Tr2PerObjectData* GetShadowPerObjectData( ITriRenderBatchAccumulator* accumulator ) override;
void PushRtGeometry( Tr2RaytracingManager& ) const override;


//////////////////////////////////////////////////////////////////////////////////////
// IEveInstanceMeshProvider
void AddMeshesToManager( EveInstancedMeshManager & manager ) override;
void AddMeshesToManager( EveInstancedMeshManager& manager ) override;


//////////////////////////////////////////////////////////////////////////////////////
// IEveInstanceMeshProvider
void GetDebugOptions( Tr2DebugRendererOptions & options ) override;
void RenderDebugInfo( ITr2DebugRenderer2 & renderer ) override;
void GetDebugOptions( Tr2DebugRendererOptions& options ) override;
void RenderDebugInfo( ITr2DebugRenderer2& renderer ) override;

//////////////////////////////////////////////////////////////////////////////////////
// ITr2Renderable
void GetBatches( ITriRenderBatchAccumulator * batches, TriBatchType batchType, const Tr2PerObjectData* perObjectData, Tr2RenderReason reason = TR2RENDERREASON_NORMAL ) override;
void GetBatches( ITriRenderBatchAccumulator* batches, TriBatchType batchType, const Tr2PerObjectData* perObjectData, Tr2RenderReason reason = TR2RENDERREASON_NORMAL ) override;
bool HasTransparentBatches() override;
float GetSortValue() override;
Tr2PerObjectData* GetPerObjectData( ITriRenderBatchAccumulator * accumulator ) override;
Tr2PerObjectData* GetPerObjectData( ITriRenderBatchAccumulator* accumulator ) override;

struct MeshArea
{
Expand Down Expand Up @@ -187,12 +188,12 @@ BLUE_CLASS( EveChildInstancedMeshes ) :
bool inheritOverlayEffects = true;
};

void ReleaseCachedData( BlueAsyncRes * p ) override;
void RebuildCachedData( BlueAsyncRes * p ) override;
void ReleaseCachedData( BlueAsyncRes* p ) override;
void RebuildCachedData( BlueAsyncRes* p ) override;
void UnregisterFromMeshManager();

void UpdateOverlayInstanceData( const EveUpdateContext& updateContext, const EveSpaceObjectVSData& parentVsData, const EveSpaceObjectPSData& parentPsData );
static void RebuildOverlayAreaBlocks( Mesh & mesh );
static void RebuildOverlayAreaBlocks( Mesh& mesh );
bool HasAnyOwnOverlayEffects() const;
bool AnyMeshInheritsOverlayEffects() const;
bool MeshHasActiveOverlayEffects( const Mesh& mesh ) const;
Expand All @@ -204,6 +205,23 @@ BLUE_CLASS( EveChildInstancedMeshes ) :
void ReleaseResources( TriStorage s ) override;
bool OnPrepareResources() override;

struct AudioInstance
{
EveAudioOccluder occluder;
uint32_t mesh = 0;
Matrix localTransform = IdentityMatrix();
};

void UpdateAudioGeometry( bool allowAudioGeometry );
void UnregisterAudioGeometry();

ITr2AudGeometryPtr m_audioGeometry;
std::vector<AudioInstance> m_audioInstances;
Matrix m_audioWorldTransform = IdentityMatrix();
bool m_audioGeometryDirty = true;
// a geometry resource is still loading, so its instances are not registered yet
bool m_audioGeometryPending = false;

Matrix m_worldTransform = IdentityMatrix();
EveSpacePerObjectData m_perObjectData;
// m_perObjectData with the clip sphere neutralized, for meshes that opt out of the parent's overlays
Expand Down
86 changes: 9 additions & 77 deletions trinity/Eve/SpaceObject/Children/EveChildMesh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ EveChildMesh::EveChildMesh( IRoot* lockobj ) :
m_reflectionMode( EntityComponents::REFLECT_NEVER ),
m_instanceCount( 0 ),
m_morphAnimationOffsets( {} ),
m_audioInstanceId( EveSpaceObject2::NextAudioInstanceId() ),
m_audioGeometrySetId( 0 ),
m_audioGeometryRegistered( false ),
m_allowAudioGeometry( true ),
EveChildTransform(),
EveEntity( lockobj )
{
Expand Down Expand Up @@ -88,11 +84,6 @@ bool EveChildMesh::Initialize()

InitializeAnimation();

if( g_eveIsAudioOcclusionGeometryEnabled && !m_audioGeometry )
{
BeClasses->CreateInstanceFromName( "AudGeometry", BlueInterfaceIID<ITr2AudGeometry>(), reinterpret_cast<void**>( &m_audioGeometry.p ) );
}

for( uint32_t i = 0; i < m_decals.size(); i++ )
{
m_decals[i]->SetPriority( i );
Expand Down Expand Up @@ -998,17 +989,7 @@ void EveChildMesh::UpdateAsyncronous( const EveUpdateContext& updateContext, con
}
m_reverseWinding = IsMirrored( m_worldTransform );

bool allowAudioGeometry = !params.spaceObjectParent || params.spaceObjectParent->IsAudioOccluder();

if( !allowAudioGeometry && m_audioGeometryRegistered )
{
UnregisterAudioGeometry();
}
m_allowAudioGeometry = allowAudioGeometry;
if( m_audioGeometryRegistered && m_audioGeometry )
{
m_audioGeometry->SetGeometryTransform( m_audioGeometrySetId, m_audioInstanceId, m_worldTransform );
}
m_audioOccluder.SetTransform( m_worldTransform );

// need to update the data we get from the parent to be relevant to us!
m_parentOverlayEffects = nullptr;
Expand Down Expand Up @@ -1160,13 +1141,6 @@ void EveChildMesh::UpdateSyncronous( const EveUpdateContext& updateContext, cons
}
}

bool allowAudioGeometry = !params.spaceObjectParent || params.spaceObjectParent->IsAudioOccluder();

if( !allowAudioGeometry && m_audioGeometryRegistered )
{
UnregisterAudioGeometry();
}
m_allowAudioGeometry = allowAudioGeometry;
if( m_animationUpdater )
{
if( m_mesh && m_animationUpdater->GetResPath().empty() )
Expand Down Expand Up @@ -1200,7 +1174,7 @@ void EveChildMesh::UpdateSyncronous( const EveUpdateContext& updateContext, cons
m_meshBinding = {};
}

RegisterAudioGeometry();
UpdateAudioGeometry( !params.spaceObjectParent || params.spaceObjectParent->IsAudioOccluder() );
}

void EveChildMesh::GetLocalToWorldTransform( Matrix& transform ) const
Expand Down Expand Up @@ -1260,66 +1234,24 @@ EveMeshOverlayEffectPtr EveChildMesh::GetOverlayEffectByName( const char* name )
return nullptr;
}

void EveChildMesh::RegisterAudioGeometry()
void EveChildMesh::UpdateAudioGeometry( bool allowAudioGeometry )
{
if( !m_allowAudioGeometry )
{
return;
}
if( m_audioGeometryRegistered )
{
return;
}

if( g_eveIsAudioOcclusionGeometryEnabled && !m_audioGeometry && m_mesh )
{
BeClasses->CreateInstanceFromName( "AudGeometry", BlueInterfaceIID<ITr2AudGeometry>(), reinterpret_cast<void**>( &m_audioGeometry.p ) );
}

if( !m_audioGeometry || !m_mesh )
{
return;
}

auto geometryRes = m_mesh->GetGeometryResource();
if( !geometryRes )
if( !allowAudioGeometry || !g_eveIsAudioOcclusionGeometryEnabled || !m_mesh )
{
m_audioOccluder.Release();
return;
}

if( !geometryRes->IsGood() )
if( !m_audioGeometry )
{
return;
m_audioGeometry = EveAudioOccluder::CreateAudioGeometry();
}

int meshIx = m_mesh->GetMeshIndex();
const AudioGeometryResData* audioGeo = geometryRes->GetAudioGeometry( meshIx );

if( !audioGeo || audioGeo->m_vertices.empty() )
{
return;
}

Tr2AudGeometryData data;
data.m_vertices = audioGeo->m_vertices;
data.m_indices = audioGeo->m_indices;
data.m_maxBounds = audioGeo->m_maxBounds;
data.m_minBounds = audioGeo->m_minBounds;

m_audioGeometry->SetGeometry( audioGeo->m_id, m_audioInstanceId, data, m_worldTransform );
m_audioGeometrySetId = audioGeo->m_id;
m_audioGeometryRegistered = true;
m_audioOccluder.Update( m_audioGeometry, m_mesh->GetGeometryResource(), m_mesh->GetMeshIndex(), m_worldTransform );
}

void EveChildMesh::UnregisterAudioGeometry()
{
if( m_audioGeometryRegistered && m_audioGeometry )
{
m_audioGeometry->RemoveGeometry( m_audioGeometrySetId, m_audioInstanceId );
}

m_audioGeometryRegistered = false;
m_audioGeometrySetId = 0;
m_audioOccluder.Release();
}

void EveChildMesh::SetOrigin( Origin origin )
Expand Down
Loading
Loading