Finalizing renaming of old binaural real-time renderer, now called binaural clustering renderer

parent 5c97c08a
......@@ -157,8 +157,8 @@ endif( )
if( NOT DEFINED ITA_VACORE_WITH_RENDERER_BINAURAL_OUTDOOR_NOISE )
set( ITA_VACORE_WITH_RENDERER_BINAURAL_OUTDOOR_NOISE OFF CACHE BOOL "Build VACore with rendering module: outdoor noise" )
endif( )
if( NOT DEFINED ITA_VACORE_WITH_RENDERER_BINAURAL_REAL_TIME )
set( ITA_VACORE_WITH_RENDERER_BINAURAL_REAL_TIME OFF CACHE BOOL "Build VACore with rendering module: real time renderer" )
if( NOT DEFINED ITA_VACORE_WITH_RENDERER_BINAURAL_CLUSTERING )
set( ITA_VACORE_WITH_RENDERER_BINAURAL_CLUSTERING ON CACHE BOOL "Build VACore with rendering module: clustering renderer" )
endif( )
......@@ -314,8 +314,8 @@ endif( )
if( ITA_VACORE_WITH_RENDERER_VBAP_FREE_FIELD )
add_definitions( "-DVACORE_WITH_RENDERER_VBAP_FREE_FIELD" )
endif( )
if( ITA_VACORE_WITH_RENDERER_BINAURAL_REAL_TIME )
add_definitions( "-DVACORE_WITH_RENDERER_BINAURAL_REAL_TIME" )
if( ITA_VACORE_WITH_RENDERER_BINAURAL_CLUSTERING )
add_definitions( "-DVACORE_WITH_RENDERER_BINAURAL_CLUSTERING" )
endif( )
# Reproduction definitions
......
# $Id:$
set( RelativeDir "src/Rendering/Binaural/RealTime/Utils/BinauralClusterEngine" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\Realtime\\Utils\\BinauralClusterEngine" )
set( RelativeDir "src/Rendering/Binaural/Clustering/Utils/BinauralClusterEngine" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\Clustering\\Utils\\BinauralClusterEngine" )
set( DirFiles
VABinauralClusterEngine.cpp
......
# $Id:$
set( RelativeDir "src/Rendering/Binaural/RealTime/Utils/BinauralListener" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\Realtime\\Utils\\BinauralListener" )
set( RelativeDir "src/Rendering/Binaural/Clustering/Utils/BinauralListener" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\Clustering\\Utils\\BinauralListener" )
set( DirFiles
VABinauralListener.cpp
......
# $Id:$
# $Id:$
set( RelativeDir "src/Rendering/Binaural/RealTime/Utils/BinauralSoundSource" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\Realtime\\Utils\\BinauralSoundSource" )
set( RelativeDir "src/Rendering/Binaural/Clustering/Utils/BinauralSoundSource" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\Clustering\\Utils\\BinauralSoundSource" )
set( DirFiles
VABinauralSoundSource.cpp
......
# $Id:$
set( RelativeDir "src/Rendering/Binaural/RealTime/Utils/BinauralTimeOfArrivalEstimator" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\Realtime\\Utils\\BinauralTimeOfArrivalEstimator" )
set( RelativeDir "src/Rendering/Binaural/Clustering/Utils/BinauralTimeOfArrivalEstimator" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\Clustering\\Utils\\BinauralTimeOfArrivalEstimator" )
set( DirFiles
VABinauralTOAEstimator.cpp
......
# $Id:$
set( RelativeDir "src/Rendering/Binaural/RealTime/Utils/Config" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\Realtime\\Utils\\Config" )
set( RelativeDir "src/Rendering/Binaural/Clustering/Utils/Config" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\Clustering\\Utils\\Config" )
set( DirFiles
VAConfig.cpp
......
# $Id:$
set( RelativeDir "src/Rendering/Binaural/RealTime/Utils/RelationMetrics" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\Realtime\\Utils\\RelationMetrics" )
set( RelativeDir "src/Rendering/Binaural/Clustering/Utils/RelationMetrics" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\Clustering\\Utils\\RelationMetrics" )
set( DirFiles
VARelationMetrics.cpp
......
# $Id:$
set( RelativeDir "src/Rendering/Binaural/Realtime/Utils" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\Realtime\\Utils" )
set( RelativeDir "src/Rendering/Binaural/Clustering/Utils" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\Clustering\\Utils" )
set( SubDirs BinauralListener BinauralClusterEngine BinauralSoundSource BinauralTimeOfArrivalEstimator RelationMetrics Config)
set( DirFiles
......
#ifndef IW_VACORE_BINAURALREALTIMERENDERER
#define IW_VACORE_BINAURALREALTIMERENDERER
#ifndef IW_VACORE_BINAURAL_CLUSTERING_RENDERER
#define IW_VACORE_BINAURAL_CLUSTERING_RENDERER
// VA Includes
#include <VA.h>
......@@ -13,11 +13,11 @@
#include "./Utils/BinauralSoundSource/VABinauralSoundSource.h"
#include "./Utils/BinauralListener/VABinauralListener.h"
class VABinauralRealTimeRenderer : public IVAAudioRenderer, public ITADatasourceRealization
class VABinauralClusteringRenderer : public IVAAudioRenderer, public ITADatasourceRealization
{
public:
VABinauralRealTimeRenderer( const CVAAudioRendererInitParams& );
~VABinauralRealTimeRenderer();
VABinauralClusteringRenderer( const CVAAudioRendererInitParams& );
~VABinauralClusteringRenderer();
inline void LoadScene( const std::string& ) {};
......@@ -76,4 +76,4 @@ private:
void updateTrajectories( double time );
};
#endif // IW_VACORE_BINAURALREALTIMERENDERER
#endif // IW_VACORE_BINAURAL_CLUSTERING_RENDERER
......@@ -2,7 +2,7 @@
set( RelativeDir "src/Rendering/Binaural" )
set( RelativeSourceGroup "src\\Rendering\\Binaural" )
set( SubDirs AirTrafficNoise ArtificialReverb FreeField OutdoorNoise RealTime RoomAcoustics )
set( SubDirs AirTrafficNoise ArtificialReverb FreeField OutdoorNoise Clustering RoomAcoustics )
set( DirFiles
_SourceFiles.cmake
......
......@@ -110,9 +110,9 @@ void CVAAudioRendererRegistry::RegisterInternalCoreFactoryMethods()
#endif // VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS
#ifdef VACORE_WITH_RENDERER_BINAURAL_REAL_TIME
RegisterRendererDefaultFactory< VABinauralClusteringRenderer>("BinauralClustering");
#endif // VACORE_WITH_RENDERER_BINAURAL_REAL_TIME
#ifdef VACORE_WITH_RENDERER_BINAURAL_CLUSTERING
RegisterRendererDefaultFactory< VABinauralClusteringRenderer >("BinauralClustering");
#endif // VACORE_WITH_RENDERER_BINAURAL_CLUSTERING
// Prototyping
......
......@@ -84,11 +84,11 @@ vista_create_default_info_file( HATORenderingTest )
set_property( TARGET HATORenderingTest PROPERTY FOLDER "VA/Tests/VACore" )
add_executable( BinauralRealTimeRendererTest VABinauralRealTimeRendererTest.cpp )
target_link_libraries( BinauralRealTimeRendererTest ${VISTA_USE_PACKAGE_LIBRARIES} ${VISTAINTERPROCCOMM_ADDITIONAL_DEPENDENCIES} )
add_executable( BinauralClusteringRendererTest BinauralClusteringRendererTest.cpp )
target_link_libraries( BinauralClusteringRendererTest ${VISTA_USE_PACKAGE_LIBRARIES} ${VISTAINTERPROCCOMM_ADDITIONAL_DEPENDENCIES} )
vista_configure_app( BinauralRealTimeRendererTest )
vista_install( BinauralRealTimeRendererTest )
vista_create_default_info_file( BinauralRealTimeRendererTest )
vista_configure_app( BinauralClusteringRendererTest )
vista_install( BinauralClusteringRendererTest )
vista_create_default_info_file( BinauralClusteringRendererTest )
set_property( TARGET BinauralRealTimeRendererTest PROPERTY FOLDER "VA/Tests/VACore" )
set_property( TARGET BinauralClusteringRendererTest PROPERTY FOLDER "VA/Tests/VACore" )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment