Acoustic Geometry - Diffraction and Transmission

.gitignore

@@ -12,6 +12,7 @@ build/
 # Wwise
 .backup*
 .cache*
+build*
 *.akd
 *.prof
 *.validationcache

CMakeLists.txt

@@ -41,6 +41,9 @@ ccp_add_library(CarbonAudio SHARED
 	src/AudEventKey.cpp
 	src/AudEventKey_Blue.cpp
 	src/AudGameObjResource.cpp
+	src/AudGeometry.cpp
+	src/AudGeometry_Blue.cpp
+	src/SpatialAudioSettings.cpp
 	src/audio2.cpp
 	src/AudGameObjResource_Blue.cpp
 	src/stdafx.cpp
@@ -79,6 +82,8 @@ target_sources(CarbonAudio PRIVATE
 	src/AudStaticDataRepository.h
 	src/AudUIPlayer.h
 	src/AudMusicPlayer.h
+	src/AudGeometry.h
+	src/SpatialAudioSettings.h
 	src/autoversion.h
 	src/DebugUtilities.h
 	src/LogBridge.h

src/AudGeometry.cpp

@@ -0,0 +1,178 @@
+#include "stdafx.h"
+#include "AudGeometry.h"
+#include "Utilities.h"
+#include "Vector3.h"
+#include "AudManager.h"
+
+static CcpLogChannel_t s_ch = CCP_LOG_DEFINE_CHANNEL( "AudGeometry" );
+
+namespace
+{
+	std::vector<AkVertex> ConvertVertices( const std::vector<Vector3>& vertices )
+	{
+		std::vector<AkVertex> akVertices( vertices.size() );
+		for( size_t i = 0; i < vertices.size(); ++i )
+		{
+			const Vector3& v = vertices[i];
+			akVertices[i] = AkVertex( static_cast<float>( v.x ), static_cast<float>( v.y ), static_cast<float>( -v.z ) );
+		}
+		return akVertices;
+	}
+
+	std::vector<AkTriangle> ConvertTriangles( const std::vector<uint32_t>& indices )
+	{
+		size_t numTriangles = indices.size() / 3;
+		std::vector<AkTriangle> akTriangles( numTriangles );
+		for( size_t i = 0; i < numTriangles; ++i )
+		{
+			akTriangles[i] = AkTriangle(
+				static_cast<AkVertIdx>( indices[i * 3 + 0] ),
+				static_cast<AkVertIdx>( indices[i * 3 + 1] ),
+				static_cast<AkVertIdx>( indices[i * 3 + 2] ),
+				0
+			);
+		}
+		return akTriangles;
+	}
+
+}
+
+AudGeometry::AudGeometry( IRoot* lockobj )
+{}
+
+AudGeometry::~AudGeometry()
+{}
+
+void AudGeometry::ClearAllGeometry()
+{
+	if( s_geometrySetRefCounts.empty() )
+	{
+		return;
+	}
+
+	if( AK::SoundEngine::IsInitialized() )
+	{
+		for( const auto& geometrySetEntry : s_geometrySetRefCounts )
+		{
+			AK::SpatialAudio::RemoveGeometry( geometrySetEntry.first );
+		}
+	}
+
+	s_geometrySetRefCounts.clear();
+}
+
+AkGeometryInstanceParams AudGeometry::MakeInstanceParams(
+	uint64_t geometrySetId, const Matrix& worldTransform )
+{
+	AkGeometryInstanceParams params;
+	params.GeometrySetID = geometrySetId;
+	AkTransform transform;
+	RH2LH::convertTransform( worldTransform, transform );
+	params.PositionAndOrientation = transform;
+	params.Scale = RH2LH::extractScale( worldTransform );
+	return params;
+}
+
+void AudGeometry::SetGeometry(
+	uint64_t geometrySetId,
+	uint64_t instanceId,
+	const Tr2AudGeometryData& geometryData,
+	const Matrix& worldTransform )
+{
+	if( geometryData.m_vertices.empty() || geometryData.m_indices.empty() )
+	{
+		return;
+	}
+
+	if( !g_audioManager || !g_audioManager->GetSpatialAudioGeometryEnabled() )
+	{
+		return;
+	}
+
+	auto it = s_geometrySetRefCounts.find( geometrySetId );
+	if( it == s_geometrySetRefCounts.end() )
+	{
+		std::vector<AkVertex> akVertices = ConvertVertices( geometryData.m_vertices );
+		std::vector<AkTriangle> akTriangles = ConvertTriangles( geometryData.m_indices );
+
+		AkAcousticSurface surface;
+		surface.strName = "default";
+		surface.textureID = AK_INVALID_UNIQUE_ID;
+		surface.transmissionLoss = g_audioManager->GetTransmissionLoss();
+
+		AkGeometryParams params;
+		params.Vertices = akVertices.data();
+		params.NumVertices = static_cast<AkVertIdx>( akVertices.size() );
+		params.Triangles = akTriangles.data();
+		params.NumTriangles = static_cast<AkTriIdx>( akTriangles.size() );
+		params.Surfaces = &surface;
+		params.NumSurfaces = 1;
+		params.EnableDiffraction = g_audioManager->GetEnableDiffraction();
+		params.EnableDiffractionOnBoundaryEdges = g_audioManager->GetEnableDiffractionOnBoundaryEdges();
+
+		AKRESULT result = AK::SpatialAudio::SetGeometry( geometrySetId, params );
+		if( result != AK_Success )
+		{
+			CCP_LOGERR_CH( s_ch, "Failed to set geometry for set %llu, AKRESULT: %d", geometrySetId, result );
+			return;
+		}
+
+		s_geometrySetRefCounts[geometrySetId] = 1;
+	}
+	else
+	{
+		it->second++;
+	}
+
+	AKRESULT result = AK::SpatialAudio::SetGeometryInstance(
+		instanceId, MakeInstanceParams( geometrySetId, worldTransform ) );
+	if( result != AK_Success )
+	{
+		CCP_LOGERR_CH( s_ch, "Failed to set geometry instance %llu (set %llu), AKRESULT: %d",
+			instanceId, geometrySetId, result );
+	}
+}
+
+void AudGeometry::SetGeometryTransform(
+	uint64_t geometrySetId,
+	uint64_t instanceId,
+	const Matrix& worldTransform )
+{
+	if( !g_audioManager || !g_audioManager->GetSpatialAudioGeometryEnabled() )
+	{
+		return;
+	}
+
+	if( s_geometrySetRefCounts.find( geometrySetId ) == s_geometrySetRefCounts.end() )
+	{
+		return;
+	}
+
+	AKRESULT result = AK::SpatialAudio::SetGeometryInstance(
+		instanceId, MakeInstanceParams( geometrySetId, worldTransform ) );
+	if( result != AK_Success )
+	{
+		CCP_LOGERR_CH( s_ch, "Failed to update geometry instance transform for instance %llu (set %llu), AKRESULT: %d",
+			instanceId, geometrySetId, result );
+	}
+}
+
+void AudGeometry::RemoveGeometry(
+	uint64_t geometrySetId,
+	uint64_t instanceId )
+{
+	auto it = s_geometrySetRefCounts.find( geometrySetId );
+	if( it == s_geometrySetRefCounts.end() )
+	{
+		return;
+	}
+
+	AK::SpatialAudio::RemoveGeometryInstance( instanceId );
+
+	it->second--;
+	if( it->second == 0 )
+	{
+		AK::SpatialAudio::RemoveGeometry( geometrySetId );
+		s_geometrySetRefCounts.erase( it );
+	}
+}

src/AudGeometry.h

@@ -0,0 +1,91 @@
+////////////////////////////////////////////////////////////
+//
+// Creator: Phevos Rinis
+// Creation Date: Jan 2026
+// Copyright (c) 2026 CCP Games
+//
+
+#pragma once
+
+
+#include <ITr2AudGeometry.h>
+#include <ITr2AudEmitter.h>
+
+#include <unordered_map>
+
+
+/**
+ * @brief Registers meshes from Trinity as Spatial Audio geometry sets and manages their lifecycle.
+ *
+ * Implements the ITr2AudGeometry interface to register meshes to
+ * AK::SpatialAudio as geeometry sets. A geometry set is a set of vertices, triangles,
+ * and acoustic surfaces (see AkGeometryParams). Each geometry instance represents a unique
+ * placement of a geometry set in the world with a transform — position,
+ * orientation, and scale.
+ */
+BLUE_CLASS(AudGeometry) :
+	public ITr2AudGeometry
+
+{
+public:
+	AudGeometry(IRoot* lockobj = NULL);
+	virtual ~AudGeometry();
+
+	EXPOSE_TO_BLUE();
+
+
+	// ITr2AudGeometry interface
+
+	/**
+	 * @brief Registers a geometry set instance and places it in the world.
+	 *
+	 * @param geometrySetId  Shared geometry set identifier.
+	 * @param instanceId     Unique geometry instance identifier.
+	 * @param geometryData   Triangle mesh data.
+	 * @param worldTransform World position, orientation and scale.
+	 *
+	 */
+	void SetGeometry(
+		uint64_t geometrySetId,
+		uint64_t instanceId,
+		const Tr2AudGeometryData& geometryData,
+		const Matrix& worldTransform) override;
+
+	/**
+	 * @brief Updates the world transform of an existing geometry instance
+	 *
+	 * @param geometrySetId  Geometry set the instance references.
+	 * @param instanceId     Geometry instance to update.
+	 * @param worldTransform New world-space position, orientation and scale.
+	 *
+	 */
+	void SetGeometryTransform(
+		uint64_t geometrySetId,
+		uint64_t instanceId,
+		const Matrix& worldTransform) override;
+
+	/**
+	 * @brief Removes a geometry instance and releases the geometry set when
+	 *        its reference count reaches zero.
+	 *
+	 * @param geometrySetId  Geometry set to dereference.
+	 * @param instanceId     Geometry instance to remove.
+	 *
+	 */
+	void RemoveGeometry(
+		uint64_t geometrySetId,
+		uint64_t instanceId) override;
+
+	/// Removes all registered geometry sets from the Wwise engine.
+	static void ClearAllGeometry();
+
+private:
+	/// Builds AkGeometryInstanceParams from a geometry set ID and world transform.
+	static AkGeometryInstanceParams MakeInstanceParams(
+		uint64_t geometrySetId, const Matrix& worldTransform );
+
+	/// Tracks how many active instances reference each geometry set.
+	inline static std::unordered_map<uint64_t, uint32_t> s_geometrySetRefCounts;
+};
+
+TYPEDEF_BLUECLASS( AudGeometry );

src/AudGeometry_Blue.cpp

@@ -0,0 +1,12 @@
+#include "stdafx.h"
+#include "AudGeometry.h"
+
+BLUE_DEFINE( AudGeometry );
+BLUE_DEFINE_INTERFACE( ITr2AudGeometry );
+
+const Be::ClassInfo* AudGeometry::ExposeToBlue()
+{
+	EXPOSURE_BEGIN( AudGeometry, "Audio geometry for Wwise Spatial Audio occlusion/diffraction" )
+		MAP_INTERFACE( ITr2AudGeometry )
+	EXPOSURE_END()
+}

src/AudListener.cpp

@@ -3,6 +3,7 @@
 #include "stdafx.h"
 #include "AudListener.h"
 
+#include "AudManager.h"
 #include "Vector3.h"
 #include "Utilities.h"
 
@@ -15,8 +16,12 @@ AudListener::AudListener( IRoot* lockobj ) : AudGameObjResource( LISTENER_GAME_O
 
 AudListener::~AudListener()
 {
-	AK::SoundEngine::RemoveDefaultListener(m_ID);
-	AK::SoundEngine::UnregisterGameObj(m_ID);
+	if( g_audioManager != nullptr && g_audioManager->GetSpatialAudioGeometryEnabled() )
+	{
+		AK::SpatialAudio::UnregisterListener( m_ID );
+	}
+	AK::SoundEngine::RemoveDefaultListener( m_ID );
+	AK::SoundEngine::UnregisterGameObj( m_ID );
 }
 
 void AudListener::RegisterWwiseObject()
@@ -27,6 +32,13 @@ void AudListener::RegisterWwiseObject()
 		{
 			AK::SoundEngine::RegisterGameObj(m_ID, m_name.c_str());
 			AK::SoundEngine::AddDefaultListener(m_ID);
+
+			// Register listener for occlusion/diffraction processing
+			if( g_audioManager != nullptr && g_audioManager->GetSpatialAudioGeometryEnabled() )
+			{
+				AK::SpatialAudio::RegisterListener( m_ID );
+			}
+
 			m_gameObjRegistered = true;
 		}
 	}
@@ -48,7 +60,7 @@ int AudListener::SetPositionHelper( const Vector3& front, const Vector3& top, co
 			Vector3 correctFront = Normalize( front );
 			Vector3 correctUp = Normalize( top );
 			correctUp = Normalize( Cross( Cross( correctFront, correctUp ), correctFront ) );
-			tmp.Set( MakeAkVector(position), MakeAkVector(correctFront), MakeAkVector(correctUp) );
+			tmp.Set( MakeAkVector( position ), MakeAkVector( correctFront ), MakeAkVector( correctUp ) );
 
 			// all vectors come in RH, but WWISE is LH, so convert
 			AkSoundPosition soundPosLH;
@@ -58,4 +70,4 @@ int AudListener::SetPositionHelper( const Vector3& front, const Vector3& top, co
 		}
 	}
 	return AK_Success;
-}
+}