From 2611941379de708a11120f376ef9177aeaf40900 Mon Sep 17 00:00:00 2001 From: phevosccp Date: Fri, 13 Nov 2026 14:30:44 +0000 Subject: [PATCH 1/5] Read audio occlusion geometry from CMF --- trinity/Resources/TriGeometryRes.cpp | 144 +++++++++++++-------------- trinity/Resources/TriGeometryRes.h | 12 +-- 2 files changed, 70 insertions(+), 86 deletions(-) diff --git a/trinity/Resources/TriGeometryRes.cpp b/trinity/Resources/TriGeometryRes.cpp index 9d177de82..1a7b37f0e 100644 --- a/trinity/Resources/TriGeometryRes.cpp +++ b/trinity/Resources/TriGeometryRes.cpp @@ -24,6 +24,10 @@ std::atomic AudioGeometryResData::s_nextId{ 1 }; bool g_eveIsAudioOcclusionGeometryEnabled = false; TRI_REGISTER_SETTING( "eveIsAudioOcclusionGeometryEnabled", g_eveIsAudioOcclusionGeometryEnabled ); +// Meshes without an authored audio occlusion mesh use their lowest LOD instead +bool g_eveAudioOcclusionLodFallback = true; +TRI_REGISTER_SETTING( "eveAudioOcclusionLodFallback", g_eveAudioOcclusionLodFallback ); + int g_grannyDeprecationLevel = (int)GrannyDeprecationLevel::LOG_ERROR_AND_ASSERT; TRI_REGISTER_SETTING( "grannyDeprecationLevel", g_grannyDeprecationLevel ); @@ -2308,6 +2312,68 @@ bool TriGeometryRes::CreateLodFromGrannyMesh( granny_mesh* grannyMesh, TriGeomet } #endif +// Returns the authored audio occlusion mesh, or the lowest loaded LOD when the file has none. +static std::unique_ptr ExtractAudioGeometry( Tr2CmfContents& cmfContents, const cmf::Mesh& cmfMesh, const TriGeometryResMeshData& mesh ) +{ + // Wwise indexes triangles with 16 bits + constexpr uint32_t maxTriangles = 0xFFFF; + + auto audioGeometry = std::make_unique(); + Tr2AudGeometryData& data = audioGeometry->m_data; + + const cmf::AudioOcclusionMesh& occlusionMesh = cmfMesh.audioOcclusionMesh; + if( !occlusionMesh.vertices.empty() && !occlusionMesh.indices.empty() ) + { + data.m_vertices.assign( occlusionMesh.vertices.begin(), occlusionMesh.vertices.end() ); + data.m_indices.assign( occlusionMesh.indices.begin(), occlusionMesh.indices.end() ); + data.m_minBounds = occlusionMesh.bounds.m_min; + data.m_maxBounds = occlusionMesh.bounds.m_max; + return audioGeometry; + } + + if( !g_eveAudioOcclusionLodFallback || cmfMesh.topology != cmf::MeshTopology::TriangleList || mesh.m_lods.empty() ) + { + return nullptr; + } + + const cmf::MeshLod& cmfLod = cmfMesh.lods[mesh.m_lods.back()->m_originalLodIndex]; + const cmf::VertexElement* positionElement = cmf::FindElement( cmfMesh.decl, cmf::Usage::Position ); + const uint32_t vertexCount = cmf::GetStreamElementCount( cmfLod.vb ); + const uint32_t indexCount = cmf::GetStreamElementCount( cmfLod.ib ); + if( !positionElement || vertexCount == 0 || indexCount < 3 || indexCount / 3 > maxTriangles ) + { + return nullptr; + } + + const void* vertexData = cmfContents.GetViewData( cmfLod.vb ); + const void* indexData = cmfContents.GetViewData( cmfLod.ib ); + if( !vertexData || !indexData ) + { + return nullptr; + } + + cmf::ConstBufferElementStream positions( *positionElement, vertexData, vertexCount, cmfLod.vb.stride ); + cmf::ConstIndexBufferStream indices( indexData, indexCount, cmfLod.ib.stride ); + if( !positions.exists() || !indices.exists() ) + { + return nullptr; + } + + data.m_vertices.reserve( vertexCount ); + for( const Vector3 position : positions ) + { + data.m_vertices.push_back( position ); + } + data.m_indices.reserve( indexCount ); + for( const uint32_t index : indices ) + { + data.m_indices.push_back( index ); + } + data.m_minBounds = mesh.m_minBounds; + data.m_maxBounds = mesh.m_maxBounds; + return audioGeometry; +} + bool TriGeometryRes::CreateMeshesFromCMFFile( Tr2CmfContents& cmfContents, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext& renderContext ) { TRINITY_STATS_ZONE( __FUNCTION__ ); @@ -2328,17 +2394,7 @@ bool TriGeometryRes::CreateMeshesFromCMFFile( Tr2CmfContents& cmfContents, Tr2Cp if( g_eveIsAudioOcclusionGeometryEnabled ) { - const auto& audioMesh = cmfContents.GetData()->meshes[i].audioOcclusionMesh; - if( !audioMesh.vertices.empty() && !audioMesh.indices.empty() ) - { - auto audioGeometry = std::make_unique(); - audioGeometry->m_indices.insert( audioGeometry->m_indices.end(), audioMesh.indices.begin(), audioMesh.indices.end() ); - audioGeometry->m_vertices.insert( audioGeometry->m_vertices.end(), audioMesh.vertices.begin(), audioMesh.vertices.end() ); - audioGeometry->m_minBounds = audioMesh.bounds.m_min; - audioGeometry->m_maxBounds = audioMesh.bounds.m_max; - - mesh->m_audioGeometry = std::move( audioGeometry ); - } + mesh->m_audioGeometry = ExtractAudioGeometry( cmfContents, cmfContents.GetData()->meshes[i], *mesh ); } } @@ -2348,19 +2404,6 @@ bool TriGeometryRes::CreateMeshesFromCMFFile( Tr2CmfContents& cmfContents, Tr2Cp } #if WITH_GRANNY -static granny_mesh* FindOcclusionMesh( granny_file_info* gi, const std::string& meshName ) -{ - std::string occlusionName = meshName + "_Occlusion"; - for( int i = 0; i < gi->MeshCount; ++i ) - { - std::string name; - CopyGrannyName( name, gi->Meshes[i]->Name ); - if( name == occlusionName ) - return gi->Meshes[i]; - } - return nullptr; -} - bool TriGeometryRes::CreateMeshesFromGrannyFile( granny_file_info* gi, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext& renderContext ) { TRINITY_STATS_ZONE( __FUNCTION__ ); @@ -2371,65 +2414,12 @@ bool TriGeometryRes::CreateMeshesFromGrannyFile( granny_file_info* gi, Tr2CpuUsa { CreateLodFromGrannyMesh( gi->Meshes[lod->m_grannyMeshIndex], lod.get(), cpuUsage, renderContext ); } - - if( g_eveIsAudioOcclusionGeometryEnabled ) - { - granny_mesh* audioMesh = FindOcclusionMesh( gi, mesh->m_name ); - if( !audioMesh && !mesh->m_lods.empty() ) - { - audioMesh = gi->Meshes[mesh->m_lods.back()->m_grannyMeshIndex]; - } - - if( audioMesh ) - { - ExtractAudioGeometry( mesh.get(), audioMesh ); - } - } } CCP_STATS_ADD( geometryResBytes, m_memoryUse ); return true; } -void TriGeometryRes::ExtractAudioGeometry( TriGeometryResMeshData* mesh, granny_mesh* grannyMesh ) -{ - auto audioGeometry = std::make_unique(); - - unsigned int positionOffset; - Tr2VertexDefinition::DataType positionType; - GetVertexPositionOffsetAndType( grannyMesh, positionOffset, positionType ); - - const int vertexCount = grannyMesh->PrimaryVertexData->VertexCount; - Tr2VertexDefinition audioVertexDef = BuildFromGrannyVertexDecl( grannyMesh->PrimaryVertexData->VertexType ); - const unsigned int bytesPerVertex = audioVertexDef.m_nextOffset[0]; - - // Read original indices from granny mesh - int indexCount = grannyMesh->PrimaryTopology->Index16Count; - if( indexCount == 0 ) - { - indexCount = grannyMesh->PrimaryTopology->IndexCount; - } - - if( indexCount == 0 || indexCount % 3 != 0 ) - { - return; - } - - - audioGeometry->m_vertices.resize( vertexCount ); - for( int v = 0; v < vertexCount; ++v ) - { - GetMeshVertexPosition( grannyMesh, static_cast( v ), audioGeometry->m_vertices[v], bytesPerVertex, positionOffset, positionType ); - } - - audioGeometry->m_indices.resize( indexCount ); - GrannyCopyMeshIndices( grannyMesh, sizeof( uint32_t ), audioGeometry->m_indices.data() ); - - audioGeometry->m_minBounds = mesh->m_minBounds; - audioGeometry->m_maxBounds = mesh->m_maxBounds; - - mesh->m_audioGeometry = std::move( audioGeometry ); -} #endif Be::Result TriGeometryRes::SaveMesh( const char* filename, uint32_t meshIndex ) const diff --git a/trinity/Resources/TriGeometryRes.h b/trinity/Resources/TriGeometryRes.h index 99a465cd9..60ff138fe 100644 --- a/trinity/Resources/TriGeometryRes.h +++ b/trinity/Resources/TriGeometryRes.h @@ -9,6 +9,7 @@ #include "include/ITr2GpuBuffer.h" #include "Tr2CmfContent.h" +#include #include "Tr2SuballocatedBuffer.h" #include "../Utilities/BVH.h" @@ -142,15 +143,11 @@ struct TriGeometryResMeshData; extern bool g_eveIsAudioOcclusionGeometryEnabled; +// Mesh sent to carbon-audio as Wwise geometry. Each load gets a new ID, so a reload registers again. struct AudioGeometryResData { uint64_t m_id; - - std::vector m_vertices; - std::vector m_indices; - - Vector3 m_minBounds; - Vector3 m_maxBounds; + Tr2AudGeometryData m_data; AudioGeometryResData() : m_id( s_nextId++ ) @@ -436,9 +433,6 @@ BLUE_CLASS( TriGeometryRes ) : // Create D3D mesh from data in m_pGrannyFile bool CreateMeshesFromGrannyFile( granny_file_info * gi, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext & renderContext ); bool CreateLodFromGrannyMesh( granny_mesh * myMesh, TriGeometryResLodData * pMesh, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext & renderContext, void* pVBOverride = NULL ); - - // Extract audio geometry from lowest LOD for Wwise spatial audio - void ExtractAudioGeometry( TriGeometryResMeshData * mesh, granny_mesh * grannyMesh ); #endif bool ReadCMFFile(); From bc1986bee2bdd7f4a56aebb2838e0a048bfa9601 Mon Sep 17 00:00:00 2001 From: phevosccp Date: Fri, 13 Nov 2026 14:30:45 +0000 Subject: [PATCH 2/5] Add EveAudioOccluder --- trinity/CMakeLists.txt | 2 + .../SpaceObject/Utils/EveAudioOccluder.cpp | 98 +++++++++++++++++++ .../Eve/SpaceObject/Utils/EveAudioOccluder.h | 39 ++++++++ 3 files changed, 139 insertions(+) create mode 100644 trinity/Eve/SpaceObject/Utils/EveAudioOccluder.cpp create mode 100644 trinity/Eve/SpaceObject/Utils/EveAudioOccluder.h diff --git a/trinity/CMakeLists.txt b/trinity/CMakeLists.txt index 48e193da5..19cad55cb 100644 --- a/trinity/CMakeLists.txt +++ b/trinity/CMakeLists.txt @@ -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 diff --git a/trinity/Eve/SpaceObject/Utils/EveAudioOccluder.cpp b/trinity/Eve/SpaceObject/Utils/EveAudioOccluder.cpp new file mode 100644 index 000000000..81be2a1e0 --- /dev/null +++ b/trinity/Eve/SpaceObject/Utils/EveAudioOccluder.cpp @@ -0,0 +1,98 @@ +// Copyright © 2026 CCP ehf. + +#include "StdAfx.h" +#include "EveAudioOccluder.h" +#include "Resources/TriGeometryRes.h" + +#include + +static std::atomic s_nextInstanceId{ 1 }; + +EveAudioOccluder::EveAudioOccluder() : + m_instanceId( s_nextInstanceId++ ) +{ +} + +EveAudioOccluder::~EveAudioOccluder() +{ + Release(); +} + +EveAudioOccluder::EveAudioOccluder( EveAudioOccluder&& other ) noexcept : + m_audio( other.m_audio ), + m_instanceId( other.m_instanceId ), + m_geometrySetId( other.m_geometrySetId ), + m_transform( other.m_transform ) +{ + // The registration moved with the instance ID, so the other one needs its own. + other.m_instanceId = s_nextInstanceId++; + other.m_geometrySetId = 0; +} + +EveAudioOccluder& EveAudioOccluder::operator=( EveAudioOccluder&& other ) noexcept +{ + if( this != &other ) + { + Release(); + // The registration belongs to the instance ID, so the IDs swap and both stay unique. + std::swap( m_instanceId, other.m_instanceId ); + m_audio = other.m_audio; + m_geometrySetId = other.m_geometrySetId; + m_transform = other.m_transform; + other.m_geometrySetId = 0; + } + return *this; +} + +ITr2AudGeometryPtr EveAudioOccluder::CreateAudioGeometry() +{ + ITr2AudGeometryPtr audio; + BeClasses->CreateInstanceFromName( "AudGeometry", BlueInterfaceIID(), reinterpret_cast( &audio.p ) ); + return audio; +} + +void EveAudioOccluder::Update( ITr2AudGeometry* audio, TriGeometryRes* geometry, unsigned int meshIndex, const Matrix& worldTransform ) +{ + const AudioGeometryResData* audioGeometry = nullptr; + if( audio && geometry && geometry->IsGood() ) + { + audioGeometry = geometry->GetAudioGeometry( meshIndex ); + } + + if( !audioGeometry ) + { + Release(); + return; + } + + if( m_geometrySetId == audioGeometry->m_id && m_audio.p == audio ) + { + SetTransform( worldTransform ); + return; + } + + Release(); + m_audio = audio; + m_geometrySetId = audioGeometry->m_id; + m_transform = worldTransform; + m_audio->SetGeometry( m_geometrySetId, m_instanceId, audioGeometry->m_data, worldTransform ); +} + +void EveAudioOccluder::SetTransform( const Matrix& worldTransform ) +{ + if( m_geometrySetId != 0 && m_transform != worldTransform ) + { + m_transform = worldTransform; + m_audio->SetGeometryTransform( m_geometrySetId, m_instanceId, worldTransform ); + } +} + +void EveAudioOccluder::Release() +{ + if( m_geometrySetId != 0 ) + { + m_audio->RemoveGeometry( m_geometrySetId, m_instanceId ); + m_geometrySetId = 0; + } + m_audio = nullptr; +} diff --git a/trinity/Eve/SpaceObject/Utils/EveAudioOccluder.h b/trinity/Eve/SpaceObject/Utils/EveAudioOccluder.h new file mode 100644 index 000000000..25bdfbec5 --- /dev/null +++ b/trinity/Eve/SpaceObject/Utils/EveAudioOccluder.h @@ -0,0 +1,39 @@ +// Copyright © 2026 CCP ehf. + +#pragma once + +#include + +BLUE_DECLARE( TriGeometryRes ); + +// Represents one instance of a mesh's audio geometry in carbon-audio and keeps its transform up to date. +class EveAudioOccluder +{ +public: + EveAudioOccluder(); + ~EveAudioOccluder(); + + EveAudioOccluder( EveAudioOccluder&& other ) noexcept; + EveAudioOccluder& operator=( EveAudioOccluder&& other ) noexcept; + EveAudioOccluder( const EveAudioOccluder& ) = delete; + EveAudioOccluder& operator=( const EveAudioOccluder& ) = delete; + + // Registers the mesh once its audio geometry is loaded and registers it again when the resource reloads. + // Releases when there is nothing to register. Reads the resource, so call it from the synchronous update. + void Update( ITr2AudGeometry* audio, TriGeometryRes* geometry, unsigned int meshIndex, const Matrix& worldTransform ); + + // Moves the registered instance. Does not touch the resource. + void SetTransform( const Matrix& worldTransform ); + + void Release(); + + // Returns carbon-audio's geometry object, or null when carbon-audio is not loaded. + static ITr2AudGeometryPtr CreateAudioGeometry(); + +private: + ITr2AudGeometryPtr m_audio; + uint64_t m_instanceId; + // 0 while not registered + uint64_t m_geometrySetId = 0; + Matrix m_transform = IdentityMatrix(); +}; From 79abcbdadb04d8c9e05bd7770b21255f439eb742 Mon Sep 17 00:00:00 2001 From: phevosccp Date: Fri, 13 Nov 2026 14:30:45 +0000 Subject: [PATCH 3/5] Use EveAudioOccluder in EveSpaceObject2 and EveChildMesh --- .../Eve/SpaceObject/Children/EveChildMesh.cpp | 86 ++----------------- .../Eve/SpaceObject/Children/EveChildMesh.h | 7 +- trinity/Eve/SpaceObject/EveSpaceObject2.cpp | 64 +++----------- trinity/Eve/SpaceObject/EveSpaceObject2.h | 14 +-- 4 files changed, 24 insertions(+), 147 deletions(-) diff --git a/trinity/Eve/SpaceObject/Children/EveChildMesh.cpp b/trinity/Eve/SpaceObject/Children/EveChildMesh.cpp index 2085ad14a..91f6e489f 100644 --- a/trinity/Eve/SpaceObject/Children/EveChildMesh.cpp +++ b/trinity/Eve/SpaceObject/Children/EveChildMesh.cpp @@ -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 ) { @@ -88,11 +84,6 @@ bool EveChildMesh::Initialize() InitializeAnimation(); - if( g_eveIsAudioOcclusionGeometryEnabled && !m_audioGeometry ) - { - BeClasses->CreateInstanceFromName( "AudGeometry", BlueInterfaceIID(), reinterpret_cast( &m_audioGeometry.p ) ); - } - for( uint32_t i = 0; i < m_decals.size(); i++ ) { m_decals[i]->SetPriority( i ); @@ -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; @@ -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() ) @@ -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 @@ -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(), reinterpret_cast( &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 ) diff --git a/trinity/Eve/SpaceObject/Children/EveChildMesh.h b/trinity/Eve/SpaceObject/Children/EveChildMesh.h index c7ab67c09..b6acc3487 100644 --- a/trinity/Eve/SpaceObject/Children/EveChildMesh.h +++ b/trinity/Eve/SpaceObject/Children/EveChildMesh.h @@ -297,13 +297,10 @@ BLUE_CLASS( EveChildMesh ) : PIEveSpaceObjectAttachmentVector m_attachments; PTr2LightVector m_lights; - bool m_allowAudioGeometry; - bool m_audioGeometryRegistered; - uint64_t m_audioGeometrySetId; - uint64_t m_audioInstanceId; ITr2AudGeometryPtr m_audioGeometry; + EveAudioOccluder m_audioOccluder; - void RegisterAudioGeometry(); + void UpdateAudioGeometry( bool allowAudioGeometry ); void UnregisterAudioGeometry(); void UpdateRtMesh(); diff --git a/trinity/Eve/SpaceObject/EveSpaceObject2.cpp b/trinity/Eve/SpaceObject/EveSpaceObject2.cpp index f046b8701..3395d7bc5 100644 --- a/trinity/Eve/SpaceObject/EveSpaceObject2.cpp +++ b/trinity/Eve/SpaceObject/EveSpaceObject2.cpp @@ -43,8 +43,6 @@ #include -std::atomic EveSpaceObject2::s_nextAudioInstanceId{ 1 }; - static const int MAX_JOINT_COUNT = 58; static const double UNINITIALIZED_POSITION = std::numeric_limits::infinity(); @@ -204,7 +202,6 @@ EveSpaceObject2::EveSpaceObject2( IRoot* lockobj ) : m_worldTransform( XMMatrixIdentity() ), m_invWorldTransform( XMMatrixIdentity() ), m_reflectionMode( EntityComponents::REFLECT_NEVER ), - m_audioInstanceId( NextAudioInstanceId() ), m_mergedLocatorSetsDirty( true ), m_damageLocatorAutoFilterEnabled( false ), m_damageLocatorFilterRequested( false ), @@ -283,11 +280,6 @@ bool EveSpaceObject2::Initialize() m_decals[i]->SetPriority( i ); } - if( !m_audioGeometry ) - { - BeClasses->CreateInstanceFromName( "AudGeometry", BlueInterfaceIID(), reinterpret_cast( &m_audioGeometry.p ) ); - } - return true; } @@ -529,6 +521,7 @@ void EveSpaceObject2::UpdateSyncronous( const EveUpdateContext& updateContext ) Be::Time time = updateContext.GetTime(); UpdateWorldTransform( time ); + UpdateAudioGeometry(); if( !m_update ) { @@ -627,8 +620,6 @@ void EveSpaceObject2::UpdateSyncronous( const EveUpdateContext& updateContext ) m_secondaryLightingSphereRadius = pow( boxVolume / 4.f * 3.f / TRI_PI, 1.0f / 3.0f ); } } - - RegisterAudioGeometry(); } void EveSpaceObject2::UpdateAsyncronous( const EveUpdateContext& updateContext ) @@ -2427,9 +2418,6 @@ void EveSpaceObject2::RebuildCachedData( BlueAsyncRes* p ) } } - // Try to register audio geometry now that the geometry resource is loaded - RegisterAudioGeometry(); - // If we already have a model we don't want to go through here // as it would nuke all current animations. if( !m_animationUpdater || m_animationUpdater->IsInitialized() ) @@ -3127,11 +3115,6 @@ void EveSpaceObject2::UpdateWorldTransform( Be::Time time ) } //is this done in a parent class/subclass anywhere else? m_invWorldTransform = Inverse( m_worldTransform ); - - if( m_audioGeometryRegistered && m_audioGeometry ) - { - m_audioGeometry->SetGeometryTransform( m_audioGeometrySetId, m_audioInstanceId, m_worldTransform ); - } } void EveSpaceObject2::GetModelCenterWorldPosition( Vector3& position ) const @@ -4100,10 +4083,6 @@ bool EveSpaceObject2::IsPickable() const void EveSpaceObject2::RegisterComponents() { auto registry = this->GetComponentRegistry(); - if( registry ) - { - RegisterAudioGeometry(); - } if( registry && m_display ) { @@ -4577,48 +4556,25 @@ ITr2AudGeometryPtr EveSpaceObject2::GetAudioGeometry() const void EveSpaceObject2::SetAudioGeometry( ITr2AudGeometry* audioGeometry ) { UnregisterAudioGeometry(); - m_audioGeometry = audioGeometry; - if( m_audioGeometry ) - { - RegisterAudioGeometry(); - } } void EveSpaceObject2::UnregisterAudioGeometry() { - if( m_audioGeometryRegistered && m_audioGeometry ) - { - m_audioGeometry->RemoveGeometry( m_audioGeometrySetId, m_audioInstanceId ); - } - - m_audioGeometryRegistered = false; - m_audioGeometrySetId = 0; + m_audioOccluder.Release(); } -void EveSpaceObject2::RegisterAudioGeometry() +void EveSpaceObject2::UpdateAudioGeometry() { - if( !m_isAudioOccluder ) + if( !m_isAudioOccluder || !g_eveIsAudioOcclusionGeometryEnabled || !m_mesh ) { + m_audioOccluder.Release(); return; } - if( !m_audioGeometryRegistered && m_audioGeometry && m_mesh && m_geometryResFromMesh && m_geometryResFromMesh->IsGood() ) - { - int meshIx = m_mesh->GetMeshIndex(); - const AudioGeometryResData* audioGeo = m_geometryResFromMesh->GetAudioGeometry( meshIx ); - if( audioGeo && !audioGeo->m_vertices.empty() ) - { - 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; - } + if( !m_audioGeometry ) + { + m_audioGeometry = EveAudioOccluder::CreateAudioGeometry(); } -} \ No newline at end of file + m_audioOccluder.Update( m_audioGeometry, m_geometryResFromMesh, m_mesh->GetMeshIndex(), m_worldTransform ); +} diff --git a/trinity/Eve/SpaceObject/EveSpaceObject2.h b/trinity/Eve/SpaceObject/EveSpaceObject2.h index b603c40fc..a19dd6a56 100644 --- a/trinity/Eve/SpaceObject/EveSpaceObject2.h +++ b/trinity/Eve/SpaceObject/EveSpaceObject2.h @@ -39,6 +39,7 @@ #include "Raytracing/Tr2RaytracingManager.h" #include "Tr2RingBuffer.h" #include +#include "Eve/SpaceObject/Utils/EveAudioOccluder.h" #include #include @@ -248,11 +249,6 @@ BLUE_CLASS( EveSpaceObject2 ) : public: EXPOSE_TO_BLUE(); - static uint64_t NextAudioInstanceId() - { - return s_nextAudioInstanceId++; - } - using IInitialize::Lock; using IInitialize::Unlock; @@ -779,10 +775,8 @@ BLUE_CLASS( EveSpaceObject2 ) : virtual Matrix GetObserverTransform(); ITr2AudGeometryPtr m_audioGeometry; - bool m_audioGeometryRegistered = false; + EveAudioOccluder m_audioOccluder; bool m_isAudioOccluder = true; - uint64_t m_audioGeometrySetId = 0; - uint64_t m_audioInstanceId; ITr2AudGeometryPtr GetAudioGeometry() const; @@ -795,9 +789,7 @@ BLUE_CLASS( EveSpaceObject2 ) : protected: void SetAudioGeometry( ITr2AudGeometry * audioGeometry ); void UnregisterAudioGeometry(); - void RegisterAudioGeometry(); - - static std::atomic s_nextAudioInstanceId; + void UpdateAudioGeometry(); private: #if BLUE_WITH_PYTHON From 9d93c6ea924d434de6eedbbb3311abd7f0cc2079 Mon Sep 17 00:00:00 2001 From: phevosccp Date: Fri, 13 Nov 2026 14:30:45 +0000 Subject: [PATCH 4/5] Register audio geometry for instanced meshes --- .../Children/EveChildInstancedMeshes.cpp | 66 +++++++++++++++++++ .../Children/EveChildInstancedMeshes.h | 18 +++++ 2 files changed, 84 insertions(+) diff --git a/trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.cpp b/trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.cpp index 3f3c9d643..a6e592782 100644 --- a/trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.cpp +++ b/trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.cpp @@ -29,6 +29,7 @@ EveChildInstancedMeshes::EveChildInstancedMeshes( IRoot* lockobj ) EveChildInstancedMeshes::~EveChildInstancedMeshes() { + UnregisterAudioGeometry(); UnregisterFromMeshManager(); for( Mesh& mesh : m_meshes ) { @@ -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 ) @@ -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 ) @@ -535,6 +596,7 @@ void EveChildInstancedMeshes::AddMesh( GetOwner()->InvalidateMergedLocators( LocatorInvalidationReason::StructureChanged ); } m_allRegistered = false; + m_audioGeometryDirty = true; return; } @@ -598,6 +660,7 @@ void EveChildInstancedMeshes::AddMesh( GetOwner()->InvalidateMergedLocators( LocatorInvalidationReason::StructureChanged ); } m_allRegistered = false; + m_audioGeometryDirty = true; } void EveChildInstancedMeshes::RemoveInstancesByPartTag( EveSpaceObjectChild::PartTag partTag ) @@ -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 ) @@ -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; } } } @@ -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 ) ) diff --git a/trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.h b/trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.h index 490a9d6af..5c911bc4c 100644 --- a/trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.h +++ b/trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.h @@ -7,6 +7,7 @@ #include "ITr2Renderable.h" #include "Tr2PersistentPerObjectData.h" #include "../Attachments/EveMeshOverlayEffect.h" +#include "../Utils/EveAudioOccluder.h" BLUE_DECLARE( TriGeometryRes ); BLUE_DECLARE( Tr2Effect ); @@ -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 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 From 9568dd538b81436c09f9bdb7e3f7fffee9b27ce5 Mon Sep 17 00:00:00 2001 From: phevosccp Date: Wed, 18 Nov 2026 10:44:12 +0000 Subject: [PATCH 5/5] Apply clang-format to headers changed in this PR --- .../Children/EveChildInstancedMeshes.h | 26 ++--- .../Eve/SpaceObject/Children/EveChildMesh.h | 48 ++++----- trinity/Eve/SpaceObject/EveSpaceObject2.h | 102 +++++++++--------- trinity/Resources/TriGeometryRes.h | 28 ++--- 4 files changed, 102 insertions(+), 102 deletions(-) diff --git a/trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.h b/trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.h index 5c911bc4c..ddaedf21f 100644 --- a/trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.h +++ b/trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.h @@ -33,11 +33,11 @@ BLUE_CLASS( EveChildInstancedMeshes ) : ///////////////////////////////////////////////////////////////////////////////////// // EveSpaceObjectChild void UpdateVisibility( const EveUpdateContext& updateContext, const Matrix& parentTransform, Tr2Lod parentLod ) override; - void GetRenderables( std::vector & renderables ) override; - bool GetBoundingSphere( Vector4 & sphere, BoundingSphereQuery query = EVE_BOUNDS_NORMAL ) const override; + void GetRenderables( std::vector& 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; @@ -50,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 { @@ -188,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; diff --git a/trinity/Eve/SpaceObject/Children/EveChildMesh.h b/trinity/Eve/SpaceObject/Children/EveChildMesh.h index b6acc3487..e51babae5 100644 --- a/trinity/Eve/SpaceObject/Children/EveChildMesh.h +++ b/trinity/Eve/SpaceObject/Children/EveChildMesh.h @@ -82,20 +82,20 @@ BLUE_CLASS( EveChildMesh ) : ///////////////////////////////////////////////////////////////////////////////////// // EveSpaceObjectChild void UpdateVisibility( const EveUpdateContext& updateContext, const Matrix& parentTransform, Tr2Lod parentLod ); - void GetRenderables( std::vector & renderables ); - bool GetBoundingSphere( Vector4 & sphere, BoundingSphereQuery query = EVE_BOUNDS_NORMAL ) const; + void GetRenderables( std::vector& renderables ); + bool GetBoundingSphere( Vector4& sphere, BoundingSphereQuery query = EVE_BOUNDS_NORMAL ) const; void UpdateSyncronous( const EveUpdateContext& updateContext, const EveChildUpdateParams& params ) override; void UpdateAsyncronous( const EveUpdateContext& updateContext, const EveChildUpdateParams& params ) override; - void GetLocalToWorldTransform( Matrix & transform ) const; + void GetLocalToWorldTransform( Matrix& transform ) const; void ChangeLOD( Tr2Lod lod ) override; virtual void Setup( const Vector3* scale, const Quaternion* rotation, const Vector3* translation, Tr2Lod lowestLodVisible ); bool IsAlwaysOn() const; void SetShaderOption( const BlueSharedString& name, const BlueSharedString& value ) override; void SetScale( const Vector3& scale ); - void AddTransformModifier( IEveChildTransformModifier * modifier ) override; - void RegisterWithQuadRenderer( Tr2QuadRenderer & quadRenderer ) override; + void AddTransformModifier( IEveChildTransformModifier* modifier ) override; + void RegisterWithQuadRenderer( Tr2QuadRenderer& quadRenderer ) override; void AddQuadsToQuadRenderer( const TriFrustum& frustum, Tr2QuadRenderer& quadRenderer ) const override; - void SetOwner( IEveSpaceObject2 * owner ) override; + void SetOwner( IEveSpaceObject2* owner ) override; ////////////////////////////////////////////////////////////////////////////////////// // EveEntity @@ -109,10 +109,10 @@ BLUE_CLASS( EveChildMesh ) : ///////////////////////////////////////////////////////////////////////////////////// // ITr2Renderable virtual bool HasTransparentBatches(); - virtual void GetBatches( ITriRenderBatchAccumulator * batches, TriBatchType batchType, const Tr2PerObjectData* perObjectData, Tr2RenderReason reason = TR2RENDERREASON_NORMAL ); - void GetBatchesFromOverlayVector( ITriRenderBatchAccumulator * batches, const Tr2PerObjectData* perObjectData, TriBatchType batchType ); + virtual void GetBatches( ITriRenderBatchAccumulator* batches, TriBatchType batchType, const Tr2PerObjectData* perObjectData, Tr2RenderReason reason = TR2RENDERREASON_NORMAL ); + void GetBatchesFromOverlayVector( ITriRenderBatchAccumulator* batches, const Tr2PerObjectData* perObjectData, TriBatchType batchType ); virtual float GetSortValue(); - virtual Tr2PerObjectData* GetPerObjectData( ITriRenderBatchAccumulator * accumulator ); + virtual Tr2PerObjectData* GetPerObjectData( ITriRenderBatchAccumulator* accumulator ); bool SupportsParallelPerObjectData() const override { return true; @@ -129,31 +129,31 @@ BLUE_CLASS( EveChildMesh ) : ///////////////////////////////////////////////////////////////////////////////////// // INotify - bool OnModified( Be::Var * value ); + bool OnModified( Be::Var* value ); ///////////////////////////////////////////////////////////////////////////////////// // IEveSpaceObjectAttachmentOwner - void AddAttachment( IEveSpaceObjectAttachment * attachment ); + void AddAttachment( IEveSpaceObjectAttachment* attachment ); void ClearAttachments(); ///////////////////////////////////////////////////////////////////////////////////// // IEveLightOwner - virtual void GetLights( Tr2LightManager & lightManager ) const override; - virtual void AddLight( Tr2Light * newLight ) override; + virtual void GetLights( Tr2LightManager& lightManager ) const override; + virtual void AddLight( Tr2Light* newLight ) override; virtual void ClearLights() override; ///////////////////////////////////////////////////////////////////////////////////// // IEveShadowCaster bool IsCastingShadow( const TriFrustum& cameraFrustum, const IEveShadowFrustum& shadowFrustum, Tr2RenderReason renderReason, float& sizeInShadow ) const override; bool IsCastingShadow( const TriFrustum& cameraFrustum, Vector3 position, float radius, Tr2RenderReason renderReason ) const override; - void GetShadowBatches( ITriRenderBatchAccumulator * batches, const Tr2PerObjectData* perObjectData, float shadowPixelSize ) override; - Tr2PerObjectData* GetShadowPerObjectData( ITriRenderBatchAccumulator * accumulator ) override; - void PushRtGeometry( Tr2RaytracingManager & rtManager ) const override; + void GetShadowBatches( ITriRenderBatchAccumulator* batches, const Tr2PerObjectData* perObjectData, float shadowPixelSize ) override; + Tr2PerObjectData* GetShadowPerObjectData( ITriRenderBatchAccumulator* accumulator ) override; + void PushRtGeometry( Tr2RaytracingManager& rtManager ) const override; void MarkRtDirty() override; bool IsShadowCastingDirty() const override; - void GetDebugOptions( Tr2DebugRendererOptions & options ) override; - void RenderDebugInfo( ITr2DebugRenderer2 & renderer ) override; + void GetDebugOptions( Tr2DebugRendererOptions& options ) override; + void RenderDebugInfo( ITr2DebugRenderer2& renderer ) override; ///////////////////////////////////////////////////////////////////////////////////// // PerObjectData @@ -163,11 +163,11 @@ BLUE_CLASS( EveChildMesh ) : ////////////////////////////////////////////////////////////////////////// // ITr2Pickable IRoot* GetID( uint16_t ) override; - void GetPickingBatches( ITriRenderBatchAccumulator * batches, Tr2PickTypes pickTypes, const Tr2PerObjectData* perObjectData ) override; + void GetPickingBatches( ITriRenderBatchAccumulator* batches, Tr2PickTypes pickTypes, const Tr2PerObjectData* perObjectData ) override; // access Tr2MeshBase* GetMesh() const; - void SetMesh( Tr2MeshBase * mesh ); + void SetMesh( Tr2MeshBase* mesh ); void SetOrigin( Origin origin ); void SetReflectionMode( EntityComponents::ReflectionMode reflectionMode ); void SetCastShadow( bool castShadow ); @@ -182,7 +182,7 @@ BLUE_CLASS( EveChildMesh ) : } Tr2GrannyAnimation* GetAnimationController() const override; - void SetAnimationController( Tr2GrannyAnimation * animation ); + void SetAnimationController( Tr2GrannyAnimation* animation ); void SetInstanceTransforms( std::vector instances ); @@ -198,7 +198,7 @@ BLUE_CLASS( EveChildMesh ) : void UnbakeMorphs(); bool IsMeshBaked(); - bool UpdateMeshMorphs( Tr2RenderContext & renderContext ) override; + bool UpdateMeshMorphs( Tr2RenderContext& renderContext ) override; bool IsMorphsBaked() const; BluePy GetSofSourceLocator( uint32_t areaId ) const; @@ -213,7 +213,7 @@ BLUE_CLASS( EveChildMesh ) : Tr2Effect* GetPartArmorDamageShaderEffect( PartTag partTag ) const override; bool GetPartDamageLocatorAnimatedLocal( PartTag partTag, int index, Vector3& position, Vector3& direction ) const override; - void SetArmorDamageShaderEffect( Tr2Effect * effect ); + void SetArmorDamageShaderEffect( Tr2Effect* effect ); bool GetDamageLocatorBindPositionLocal( int index, Vector3& out ) const; protected: @@ -227,7 +227,7 @@ BLUE_CLASS( EveChildMesh ) : bool DisplayDecals() const; - bool PrepareMorphBuffers( Tr2RenderContext & renderContext ); + bool PrepareMorphBuffers( Tr2RenderContext& renderContext ); std::pair GetBoneTransforms() const; std::pair GetRestPoseBoneTransforms() const; diff --git a/trinity/Eve/SpaceObject/EveSpaceObject2.h b/trinity/Eve/SpaceObject/EveSpaceObject2.h index a19dd6a56..707f58a8d 100644 --- a/trinity/Eve/SpaceObject/EveSpaceObject2.h +++ b/trinity/Eve/SpaceObject/EveSpaceObject2.h @@ -269,7 +269,7 @@ BLUE_CLASS( EveSpaceObject2 ) : { return m_mesh; } - void SetMesh( Tr2MeshBase * mesh ); + void SetMesh( Tr2MeshBase* mesh ); void PlayAnimation( const char* animName, bool replace, int loopCount, float start, float speed, Be::OptionalWithDefaultValue clearWhenDone ); void PlayAnimationOnce( const char* animName ); @@ -283,7 +283,7 @@ BLUE_CLASS( EveSpaceObject2 ) : int GetBoneCount() const; // Actually submit renderables to the list, called from GetRenderables - virtual void PushRenderables( std::vector & renderables ); + virtual void PushRenderables( std::vector& renderables ); ////////////////////////////////////////////////////////////////////////////////////// // IEveSpaceObject2 @@ -291,30 +291,30 @@ BLUE_CLASS( EveSpaceObject2 ) : virtual void UpdateAsyncronous( const EveUpdateContext& updateContext ); virtual void UpdateVisibility( const EveUpdateContext& updateContext, const Matrix& parentTransform ); virtual void PrepareShaderData( const EveUpdateContext& updateContext ); - virtual void GetRenderables( std::vector & renderables, Tr2ImpostorManager * impostors ); - virtual bool GetBoundingSphere( Vector4 & sphere, BoundingSphereQuery query = EVE_BOUNDS_NORMAL ) const; - virtual void UpdateModelCenterWorldPosition( Vector3 & position, Be::Time t ); - virtual void GetModelCenterWorldPosition( Vector3 & position ) const; - virtual bool GetLocalBoundingBox( Vector3 & min, Vector3 & max ); - virtual void GetLocalToWorldTransform( Matrix & transform ) const; - virtual void RegisterWithQuadRenderer( Tr2QuadRenderer & quadRenderer ); + virtual void GetRenderables( std::vector& renderables, Tr2ImpostorManager* impostors ); + virtual bool GetBoundingSphere( Vector4& sphere, BoundingSphereQuery query = EVE_BOUNDS_NORMAL ) const; + virtual void UpdateModelCenterWorldPosition( Vector3& position, Be::Time t ); + virtual void GetModelCenterWorldPosition( Vector3& position ) const; + virtual bool GetLocalBoundingBox( Vector3& min, Vector3& max ); + virtual void GetLocalToWorldTransform( Matrix& transform ) const; + virtual void RegisterWithQuadRenderer( Tr2QuadRenderer& quadRenderer ); virtual void AddQuadsToQuadRenderer( const TriFrustum& frustum, Tr2QuadRenderer& quadRenderer ); virtual void SetProceduralContainerVariable( const char* name, float value ) override; virtual bool IsPickable() const; - virtual void GetParentData( IEveSpaceObject2::ParentData * pd ) const; + virtual void GetParentData( IEveSpaceObject2::ParentData* pd ) const; void InvalidateMergedLocators( LocatorInvalidationReason reason ) override; void EnsureChildLocatorMerged() const; void UpdateDamageLocatorFilter(); EveDamageOverlayPtr EnsureChildDamageOverlay( const LocatorSourceRange& range ); - void CollectPartDamageOverlays( std::vector> & out ); + void CollectPartDamageOverlays( std::vector>& out ); ////////////////////////////////////////////////////////////////////////////////////// // IEveShadowCaster virtual bool IsCastingShadow( const TriFrustum& cameraFrustum, const IEveShadowFrustum& shadowFrustum, Tr2RenderReason renderReason, float& sizeInShadow ) const override; - virtual void GetShadowBatches( ITriRenderBatchAccumulator * batches, const Tr2PerObjectData* perObjectData, float shadowPixelSize ) override; - virtual Tr2PerObjectData* GetShadowPerObjectData( ITriRenderBatchAccumulator * accumulator ) override; - void PushRtGeometry( Tr2RaytracingManager & rtManager ) const override; + virtual void GetShadowBatches( ITriRenderBatchAccumulator* batches, const Tr2PerObjectData* perObjectData, float shadowPixelSize ) override; + virtual Tr2PerObjectData* GetShadowPerObjectData( ITriRenderBatchAccumulator* accumulator ) override; + void PushRtGeometry( Tr2RaytracingManager& rtManager ) const override; ////////////////////////////////////////////////////////////////////////////////////// // IInitialize @@ -327,9 +327,9 @@ BLUE_CLASS( EveSpaceObject2 ) : ///////////////////////////////////////////////////////////////////////////////////// // ITr2Renderable virtual bool HasTransparentBatches(); - virtual void GetBatches( ITriRenderBatchAccumulator * batches, TriBatchType batchType, const Tr2PerObjectData* perObjectData, Tr2RenderReason reason = TR2RENDERREASON_NORMAL ); + virtual void GetBatches( ITriRenderBatchAccumulator* batches, TriBatchType batchType, const Tr2PerObjectData* perObjectData, Tr2RenderReason reason = TR2RENDERREASON_NORMAL ); virtual float GetSortValue(); - virtual Tr2PerObjectData* GetPerObjectData( ITriRenderBatchAccumulator * accumulator ); + virtual Tr2PerObjectData* GetPerObjectData( ITriRenderBatchAccumulator* accumulator ); bool SupportsParallelPerObjectData() const override { return true; @@ -338,26 +338,26 @@ BLUE_CLASS( EveSpaceObject2 ) : ///////////////////////////////////////////////////////////////////////////////////// // IAsyncLoadedResNotifyTarget - virtual void ReleaseCachedData( BlueAsyncRes * p ); - virtual void RebuildCachedData( BlueAsyncRes * p ); + virtual void ReleaseCachedData( BlueAsyncRes* p ); + virtual void RebuildCachedData( BlueAsyncRes* p ); ///////////////////////////////////////////////////////////////////////////////////// // ITr2Pickable virtual IRoot* GetID( uint16_t ); - virtual void GetPickingBatches( ITriRenderBatchAccumulator * batches, Tr2PickTypes pickTypes, const Tr2PerObjectData* perObjectData ); + virtual void GetPickingBatches( ITriRenderBatchAccumulator* batches, Tr2PickTypes pickTypes, const Tr2PerObjectData* perObjectData ); ///////////////////////////////////////////////////////////////////////////////////// // ITr2BoundingBox - virtual bool GetOrientedBoundingBox( Vector3 & localMin, Vector3 & localMax, Matrix & localToWorld ) const; + virtual bool GetOrientedBoundingBox( Vector3& localMin, Vector3& localMax, Matrix& localToWorld ) const; virtual bool IsBoundingBoxReady() const; ///////////////////////////////////////////////////////////////////////////////////// // ITriTargetable unsigned int GetDamageLocatorCount() const; int GetClosestDamageLocatorIndex( const Vector3* position ); - virtual bool GetDamageLocatorPosition( Vector3 * out, int index, bool inWorldSpace ); + virtual bool GetDamageLocatorPosition( Vector3* out, int index, bool inWorldSpace ); bool GetDamageLocatorBindPosition( int index, Vector3& out ) const; - virtual bool GetDamageLocatorDirection( Vector3 * out, int index, bool inWorldSpace ); + virtual bool GetDamageLocatorDirection( Vector3* out, int index, bool inWorldSpace ); void GetMissPosition( const Vector3* hit, const Vector3* source, Vector3* out ); int GetGoodDamageLocatorIndex( const Vector3& position ); float GetRadius() const; @@ -365,9 +365,9 @@ BLUE_CLASS( EveSpaceObject2 ) : int CreateImpactFromPosition( const Vector3& position, const Vector3& direction, float lifeTime, float size ); void SetLastDamageLocatorHit( unsigned int locator ); - bool UpdateImpact( Vector3 & out, const Vector3& direction, int impactIndex ); + bool UpdateImpact( Vector3& out, const Vector3& direction, int impactIndex ); ImpactConfiguration GetImpactConfiguration() const override; - bool GetImpactPosition( Vector3 & out, int locator, const Vector3& posPrev, const Vector3& posNow, float epsilon ); + bool GetImpactPosition( Vector3& out, int locator, const Vector3& posPrev, const Vector3& posNow, float epsilon ); bool HasImpactConfigurationShield() const; ///////////////////////////////////////////////////////////////////////////////////// @@ -378,7 +378,7 @@ BLUE_CLASS( EveSpaceObject2 ) : ///////////////////////////////////////////////////////////////////////////////////// // INotify - bool OnModified( Be::Var * value ); + bool OnModified( Be::Var* value ); ////////////////////////////////////////////////////////////////////////////////////// // EveEntity @@ -392,27 +392,27 @@ BLUE_CLASS( EveSpaceObject2 ) : ///////////////////////////////////////////////////////////////////////////////////// // ITr2SecondaryLightSource - void RegisterSecondaryLightSource( Tr2ShLightingManager & manager ); - void UnregisterSecondaryLightSource( Tr2ShLightingManager & manager ); + void RegisterSecondaryLightSource( Tr2ShLightingManager& manager ); + void UnregisterSecondaryLightSource( Tr2ShLightingManager& manager ); ///////////////////////////////////////////////////////////////////////////////////// // ITr2ImpostorSource virtual void GetImpostorBatches( const TriFrustum& frustum, std::map& batches ); virtual float GetRenderPriority( const ImpostorHash& oldHash, const ImpostorHash& newHash ) const; - virtual bool GetImpostorBoundingSphere( Vector4 & sphere ) const; - virtual void GetLastImpostorBoundingSphere( Vector4 & sphere ) const; + virtual bool GetImpostorBoundingSphere( Vector4& sphere ) const; + virtual void GetLastImpostorBoundingSphere( Vector4& sphere ) const; ///////////////////////////////////////////////////////////////////////////////////// // ITr2DebugRenderable - virtual void GetDebugOptions( Tr2DebugRendererOptions & options ); - virtual void RenderDebugInfo( ITr2DebugRenderer2 & renderer ); + virtual void GetDebugOptions( Tr2DebugRendererOptions& options ); + virtual void RenderDebugInfo( ITr2DebugRenderer2& renderer ); ///////////////////////////////////////////////////////////////////////////////////// // IEveEffectChildrenOwner EveSpaceObjectChildPtr GetEffectChildByName( const char* name ) const; - void AddToEffectChildrenList( EveSpaceObjectChild * child ); - void RemoveFromEffectChildrenList( EveSpaceObjectChild * child ); + void AddToEffectChildrenList( EveSpaceObjectChild* child ); + void RemoveFromEffectChildrenList( EveSpaceObjectChild* child ); PEveSpaceObjectChildVector& GetEffectChildren() { return m_effectChildren; @@ -424,7 +424,7 @@ BLUE_CLASS( EveSpaceObject2 ) : void HandleControllerEvent( const char* name ) override; void StartControllers(); bool GetControllerValueByName( const char* name, float& out ); - virtual void AddController( ITr2Controller * controller ) override; + virtual void AddController( ITr2Controller* controller ) override; ///////////////////////////////////////////////////////////////////////////////////// // IEveSpaceObjectDecalOwner @@ -432,20 +432,20 @@ BLUE_CLASS( EveSpaceObject2 ) : ///////////////////////////////////////////////////////////////////////////////////// // IEveSpaceObjectAttachmentOwner - virtual void AddAttachment( IEveSpaceObjectAttachment * attachment ) override; + virtual void AddAttachment( IEveSpaceObjectAttachment* attachment ) override; virtual void ClearAttachments() override; ///////////////////////////////////////////////////////////////////////////////////// // ITr2LightOwner - virtual void GetLights( Tr2LightManager & lightManager ) const override; - virtual void AddLight( Tr2Light * newLight ); + virtual void GetLights( Tr2LightManager& lightManager ) const override; + virtual void AddLight( Tr2Light* newLight ); virtual void ClearLights(); // For stateful GPU particles ITriVectorFunctionPtr GetPositionFunction(); Vector3 GetModelWorldPosition() const; - void GetWorldVelocity( Vector3 & velocity ) const; + void GetWorldVelocity( Vector3& velocity ) const; Tr2GrannyAnimation* GetAnimationController() const override { @@ -455,8 +455,8 @@ BLUE_CLASS( EveSpaceObject2 ) : // bounding sphere void SetBoundingSphereInformation( const CcpMath::Sphere& boundingSphere ); - Be::Result GetLocalBoundingBoxFromScript( std::pair & result ); - void GetShapeEllipsoid( Vector3 & center, Vector3 & radius ); + Be::Result GetLocalBoundingBoxFromScript( std::pair& result ); + void GetShapeEllipsoid( Vector3& center, Vector3& radius ); void SetShapeEllipsoid( const CcpMath::AxisAlignedEllipsoid& ellipsoid ); // access to visiblity @@ -473,7 +473,7 @@ BLUE_CLASS( EveSpaceObject2 ) : // access stuff void AddCurveSet( TriCurveSetPtr newCurveSet ); - void AddLocator( EveLocator2 * newLocator ); + void AddLocator( EveLocator2* newLocator ); void AddOverlayEffect( EveMeshOverlayEffectPtr newOverlayEffect ); void RemoveOverlayEffect( EveMeshOverlayEffectPtr newOverlayEffect ); EveMeshOverlayEffectPtr GetOverlayEffectByName( const char* name ) const; @@ -508,8 +508,8 @@ BLUE_CLASS( EveSpaceObject2 ) : unsigned int GetLocatorCount( BlueSharedString locatorSetName ) const; Vector3 GetLocatorPositionFromSet( int index, bool inWorldSpace, BlueSharedString locatorSetName ); Vector3 GetLocatorRotationFromSet( int index, bool inWorldSpace, BlueSharedString locatorSetName ); - bool GetLocatorPosition( Vector3 * out, int index, bool inWorldSpace, BlueSharedString locatorSetName ); - bool GetLocatorDirection( Vector3 * out, int index, bool inWorldSpace, BlueSharedString locatorSetName ); + bool GetLocatorPosition( Vector3* out, int index, bool inWorldSpace, BlueSharedString locatorSetName ); + bool GetLocatorDirection( Vector3* out, int index, bool inWorldSpace, BlueSharedString locatorSetName ); int GetGoodLocatorIndex( const Vector3& position, BlueSharedString locatorSetName ); // Function to find closest locator without worrying about direction of locator int GetCloseLocatorIndex( const Vector3& position, BlueSharedString locatorSetName ); @@ -544,10 +544,10 @@ BLUE_CLASS( EveSpaceObject2 ) : uint32_t GetPerObjectDataSize( Tr2RenderContextEnum::ShaderType shaderType ) const; void UpdatePerObjectBuffer( Tr2RenderContextEnum::ShaderType shaderType, uint32_t size, void* ); - void GetPerObjectStructs( EveSpaceObjectVSData & vsData, EveSpaceObjectPSData & psData ) const; + void GetPerObjectStructs( EveSpaceObjectVSData& vsData, EveSpaceObjectPSData& psData ) const; // external parameters - void AddExternalParameter( Tr2ExternalParameter * externalParameter ); + void AddExternalParameter( Tr2ExternalParameter* externalParameter ); std::map GetControllerVariables() const; @@ -590,10 +590,10 @@ BLUE_CLASS( EveSpaceObject2 ) : Vector3 GetTransformedDamageLocator( uint32_t index ); void PrepareForAnimation(); - void GetBatchesFromOverlayVector( ITriRenderBatchAccumulator * batches, const Tr2PerObjectData* perObjectData, TriBatchType batchType, Tr2MeshBase* mesh ); + void GetBatchesFromOverlayVector( ITriRenderBatchAccumulator* batches, const Tr2PerObjectData* perObjectData, TriBatchType batchType, Tr2MeshBase* mesh ); // Consideration for child classes - void PushChildrenAndDecalRenderables( std::vector & renderables ); + void PushChildrenAndDecalRenderables( std::vector& renderables ); virtual void UpdateWorldTransform( Be::Time time ); @@ -767,7 +767,7 @@ BLUE_CLASS( EveSpaceObject2 ) : // Object space damage locator information // Pass the locator's index in the merged damage locator set as mergedDamageIndex so that // locators owned by a child part get the child's bone pose applied; -1 for other sets. - virtual void GetLocatorInObjectSpace( Vector3 & position, Vector3 & direction, const Locator& locator, int mergedDamageIndex = -1 ) const; + virtual void GetLocatorInObjectSpace( Vector3& position, Vector3& direction, const Locator& locator, int mergedDamageIndex = -1 ) const; ///////////////////////////////////////////////////////////////////////////////////// @@ -787,14 +787,14 @@ BLUE_CLASS( EveSpaceObject2 ) : } protected: - void SetAudioGeometry( ITr2AudGeometry * audioGeometry ); + void SetAudioGeometry( ITr2AudGeometry* audioGeometry ); void UnregisterAudioGeometry(); void UpdateAudioGeometry(); private: #if BLUE_WITH_PYTHON - static PyObject* PyTransformLocators( PyObject * self, PyObject * args ); - static PyObject* PyGetTransformedLocatorsFromSet( PyObject * self, PyObject * args ); + static PyObject* PyTransformLocators( PyObject* self, PyObject* args ); + static PyObject* PyGetTransformedLocatorsFromSet( PyObject* self, PyObject* args ); #endif void ReleaseDamageFilterSessions(); diff --git a/trinity/Resources/TriGeometryRes.h b/trinity/Resources/TriGeometryRes.h index 60ff138fe..52ac47daf 100644 --- a/trinity/Resources/TriGeometryRes.h +++ b/trinity/Resources/TriGeometryRes.h @@ -29,7 +29,7 @@ BLUE_CLASS( Tr2RaycastGeometryRes ) : public: EXPOSE_TO_BLUE(); - void SetLodIndices( std::vector && lodIndices ); + void SetLodIndices( std::vector&& lodIndices ); BVH::BoundingVolumeHierarchy& GetBVH(); protected: @@ -325,7 +325,7 @@ BLUE_CLASS( TriGeometryRes ) : bool GetBoundingSphere( unsigned int meshIx, Vector4& sphere ) const; Be::Result GetBoundingSphereFromScript( unsigned int meshIx, std::pair& bounds ) const; - void PrepareFromGrannyRes( TriGrannyRes * g ); + void PrepareFromGrannyRes( TriGrannyRes* g ); BlueStdResult GetMeshVertexElements( size_t meshIndex, std::vector>& elements ) const; @@ -362,7 +362,7 @@ BLUE_CLASS( TriGeometryRes ) : void ReleaseResourcesHelper(); #if TRINITYDEV - virtual void GetDescription( std::string & desc ); + virtual void GetDescription( std::string& desc ); #endif #if WITH_GRANNY @@ -370,9 +370,9 @@ BLUE_CLASS( TriGeometryRes ) : #endif #if WITH_GRANNY - static bool SaveMeshToGrannyFile( TriGeometryResMeshData & mesh, const char* filename ); + static bool SaveMeshToGrannyFile( TriGeometryResMeshData& mesh, const char* filename ); #endif - static bool SaveMeshToCMFFile( TriGeometryResMeshData & mesh, const char* filename ); + static bool SaveMeshToCMFFile( TriGeometryResMeshData& mesh, const char* filename ); // Iterator functions for processing mesh data typedef void ( *PerTriangleCallback )( void* context, const Vector3& p1, const Vector3& p2, const Vector3& p3 ); @@ -424,15 +424,15 @@ BLUE_CLASS( TriGeometryRes ) : bool ReadGrannyFile(); void ClearGrannyData(); - bool SetupMeshes( granny_file_info * gi ); - void SetupSkeletons( granny_file_info * gi ); - void DetermineAreaBoundsAndVertCount( TriGeometryResAreaData & area, granny_mesh * grannyMesh, int bytesPerVertex ); - bool IsAreaSkinned( TriGeometryResAreaData & area, granny_mesh * grannyMesh, granny_file_info * gi, int bytesPerVertex ); - bool IsAreaMorphed( TriGeometryResAreaData & area, granny_mesh * myMesh, granny_file_info * gi ); + bool SetupMeshes( granny_file_info* gi ); + void SetupSkeletons( granny_file_info* gi ); + void DetermineAreaBoundsAndVertCount( TriGeometryResAreaData& area, granny_mesh* grannyMesh, int bytesPerVertex ); + bool IsAreaSkinned( TriGeometryResAreaData& area, granny_mesh* grannyMesh, granny_file_info* gi, int bytesPerVertex ); + bool IsAreaMorphed( TriGeometryResAreaData& area, granny_mesh* myMesh, granny_file_info* gi ); // Create D3D mesh from data in m_pGrannyFile - bool CreateMeshesFromGrannyFile( granny_file_info * gi, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext & renderContext ); - bool CreateLodFromGrannyMesh( granny_mesh * myMesh, TriGeometryResLodData * pMesh, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext & renderContext, void* pVBOverride = NULL ); + bool CreateMeshesFromGrannyFile( granny_file_info* gi, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext& renderContext ); + bool CreateLodFromGrannyMesh( granny_mesh* myMesh, TriGeometryResLodData* pMesh, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext& renderContext, void* pVBOverride = NULL ); #endif bool ReadCMFFile(); @@ -440,8 +440,8 @@ BLUE_CLASS( TriGeometryRes ) : bool SetupMeshes( const cmf::Data& cmfData ); void SetupSkeletons( const cmf::Data& cmfData ); - bool CreateMeshesFromCMFFile( Tr2CmfContents & cmfContents, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext & renderContext ); - bool CreateLodFromCMFMesh( Tr2CmfContents & cmfContents, const cmf::Mesh& cmfMesh, const cmf::MeshLod& cmfMeshLod, TriGeometryResLodData* pMesh, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext& renderContext ); + bool CreateMeshesFromCMFFile( Tr2CmfContents& cmfContents, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext& renderContext ); + bool CreateLodFromCMFMesh( Tr2CmfContents& cmfContents, const cmf::Mesh& cmfMesh, const cmf::MeshLod& cmfMeshLod, TriGeometryResLodData* pMesh, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext& renderContext ); }; TYPEDEF_BLUECLASS_WR_SHUTDOWN( TriGeometryRes );