Commit 985a3df2 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

More interface improving

parent 9c3fe4e8
...@@ -109,9 +109,9 @@ public: ...@@ -109,9 +109,9 @@ public:
static const int VA_AURAMODE_DIRECT_SOUND = ( 1 << 0 ); //!< Direct sound static const int VA_AURAMODE_DIRECT_SOUND = ( 1 << 0 ); //!< Direct sound
static const int VA_AURAMODE_EARLY_REFLECTIONS = ( 1 << 1 ); //!< Early reflections static const int VA_AURAMODE_EARLY_REFLECTIONS = ( 1 << 1 ); //!< Early reflections
static const int VA_AURAMODE_DIFFUSE_DECAY = ( 1 << 2 ); //!< Diffuse decay static const int VA_AURAMODE_DIFFUSE_DECAY = ( 1 << 2 ); //!< Diffuse decay
static const int VA_AURAMODE_DIRECTIVITY = ( 1 << 3 ); //!< Source directivity static const int VA_AURAMODE_SOURCE_DIRECTIVITY = ( 1 << 3 ); //!< Source directivity
static const int VA_AURAMODE_AIR_ABSORPTION = ( 1 << 4 ); //!< Absorption in air static const int VA_AURAMODE_MEDIUM_ABSORPTION = ( 1 << 4 ); //!< Absorption in air
static const int VA_AURAMODE_ATMOS_TEMP_VAR = ( 1 << 5 ); //!< Atmospheric temporal variations static const int VA_AURAMODE_TEMP_VAR = ( 1 << 5 ); //!< Atmospheric temporal variations
static const int VA_AURAMODE_SCATTERING = ( 1 << 6 ); //!< Scattering static const int VA_AURAMODE_SCATTERING = ( 1 << 6 ); //!< Scattering
static const int VA_AURAMODE_DIFFRACTION = ( 1 << 7 ); //!< Diffraction static const int VA_AURAMODE_DIFFRACTION = ( 1 << 7 ); //!< Diffraction
static const int VA_AURAMODE_NEARFIELD = ( 1 << 8 ); //!< Near-field effects static const int VA_AURAMODE_NEARFIELD = ( 1 << 8 ); //!< Near-field effects
...@@ -122,8 +122,8 @@ public: ...@@ -122,8 +122,8 @@ public:
//! Default auralization mode (alias) //! Default auralization mode (alias)
static const int VA_AURAMODE_DEFAULT = VA_AURAMODE_DIRECT_SOUND | static const int VA_AURAMODE_DEFAULT = VA_AURAMODE_DIRECT_SOUND |
VA_AURAMODE_DIRECTIVITY | VA_AURAMODE_SOURCE_DIRECTIVITY |
VA_AURAMODE_AIR_ABSORPTION | VA_AURAMODE_MEDIUM_ABSORPTION |
VA_AURAMODE_DOPPLER | VA_AURAMODE_DOPPLER |
VA_AURAMODE_SPREADING_LOSS | VA_AURAMODE_SPREADING_LOSS |
VA_AURAMODE_TRANSMISSION | VA_AURAMODE_TRANSMISSION |
...@@ -133,9 +133,9 @@ public: ...@@ -133,9 +133,9 @@ public:
static const int VA_AURAMODE_ALL = VA_AURAMODE_DIRECT_SOUND | static const int VA_AURAMODE_ALL = VA_AURAMODE_DIRECT_SOUND |
VA_AURAMODE_EARLY_REFLECTIONS | VA_AURAMODE_EARLY_REFLECTIONS |
VA_AURAMODE_DIFFUSE_DECAY | VA_AURAMODE_DIFFUSE_DECAY |
VA_AURAMODE_DIRECTIVITY | VA_AURAMODE_SOURCE_DIRECTIVITY |
VA_AURAMODE_AIR_ABSORPTION | VA_AURAMODE_MEDIUM_ABSORPTION |
VA_AURAMODE_ATMOS_TEMP_VAR | VA_AURAMODE_TEMP_VAR |
VA_AURAMODE_SCATTERING | VA_AURAMODE_SCATTERING |
VA_AURAMODE_DIFFRACTION | VA_AURAMODE_DIFFRACTION |
VA_AURAMODE_NEARFIELD | VA_AURAMODE_NEARFIELD |
......
...@@ -50,8 +50,8 @@ public: ...@@ -50,8 +50,8 @@ public:
VACORE_REGISTER_LITERAL( VA_AURAMODE_DIRECT_SOUND ); VACORE_REGISTER_LITERAL( VA_AURAMODE_DIRECT_SOUND );
VACORE_REGISTER_LITERAL( VA_AURAMODE_EARLY_REFLECTIONS ); VACORE_REGISTER_LITERAL( VA_AURAMODE_EARLY_REFLECTIONS );
VACORE_REGISTER_LITERAL( VA_AURAMODE_DIFFUSE_DECAY ); VACORE_REGISTER_LITERAL( VA_AURAMODE_DIFFUSE_DECAY );
VACORE_REGISTER_LITERAL( VA_AURAMODE_DIRECTIVITY ); VACORE_REGISTER_LITERAL( VA_AURAMODE_SOURCE_DIRECTIVITY );
VACORE_REGISTER_LITERAL( VA_AURAMODE_AIR_ABSORPTION ); VACORE_REGISTER_LITERAL( VA_AURAMODE_MEDIUM_ABSORPTION );
VACORE_REGISTER_LITERAL( VA_AURAMODE_SCATTERING ); VACORE_REGISTER_LITERAL( VA_AURAMODE_SCATTERING );
VACORE_REGISTER_LITERAL( VA_AURAMODE_DIFFRACTION ); VACORE_REGISTER_LITERAL( VA_AURAMODE_DIFFRACTION );
VACORE_REGISTER_LITERAL( VA_AURAMODE_NEARFIELD ); VACORE_REGISTER_LITERAL( VA_AURAMODE_NEARFIELD );
...@@ -120,11 +120,11 @@ int ParseAuralizationModeToken( const std::string& t ) ...@@ -120,11 +120,11 @@ int ParseAuralizationModeToken( const std::string& t )
if( t == "DS" ) return IVACore::VA_AURAMODE_DIRECT_SOUND; if( t == "DS" ) return IVACore::VA_AURAMODE_DIRECT_SOUND;
if( t == "ER" ) return IVACore::VA_AURAMODE_EARLY_REFLECTIONS; if( t == "ER" ) return IVACore::VA_AURAMODE_EARLY_REFLECTIONS;
if( t == "DD" ) return IVACore::VA_AURAMODE_DIFFUSE_DECAY; if( t == "DD" ) return IVACore::VA_AURAMODE_DIFFUSE_DECAY;
if( t == "DIR" ) return IVACore::VA_AURAMODE_DIRECTIVITY; if( t == "SD" ) return IVACore::VA_AURAMODE_SOURCE_DIRECTIVITY;
if( t == "AA" ) return IVACore::VA_AURAMODE_AIR_ABSORPTION; if( t == "MA" ) return IVACore::VA_AURAMODE_MEDIUM_ABSORPTION;
if( t == "TV" ) return IVACore::VA_AURAMODE_ATMOS_TEMP_VAR; if( t == "TV" ) return IVACore::VA_AURAMODE_TEMP_VAR;
if( t == "SC" ) return IVACore::VA_AURAMODE_SCATTERING; if( t == "SC" ) return IVACore::VA_AURAMODE_SCATTERING;
if( t == "DIF" ) return IVACore::VA_AURAMODE_DIFFRACTION; if( t == "DF" ) return IVACore::VA_AURAMODE_DIFFRACTION;
if( t == "NF" ) return IVACore::VA_AURAMODE_NEARFIELD; if( t == "NF" ) return IVACore::VA_AURAMODE_NEARFIELD;
if( t == "DP" ) return IVACore::VA_AURAMODE_DOPPLER; if( t == "DP" ) return IVACore::VA_AURAMODE_DOPPLER;
if( t == "SL" ) return IVACore::VA_AURAMODE_SPREADING_LOSS; if( t == "SL" ) return IVACore::VA_AURAMODE_SPREADING_LOSS;
...@@ -297,9 +297,9 @@ std::string IVACore::GetAuralizationModeStr( const int iAuralizationMode, const ...@@ -297,9 +297,9 @@ std::string IVACore::GetAuralizationModeStr( const int iAuralizationMode, const
if( iAuralizationMode & VA_AURAMODE_DIRECT_SOUND ) ss << "DS, "; if( iAuralizationMode & VA_AURAMODE_DIRECT_SOUND ) ss << "DS, ";
if( iAuralizationMode & VA_AURAMODE_EARLY_REFLECTIONS ) ss << "ER, "; if( iAuralizationMode & VA_AURAMODE_EARLY_REFLECTIONS ) ss << "ER, ";
if( iAuralizationMode & VA_AURAMODE_DIFFUSE_DECAY ) ss << "DD, "; if( iAuralizationMode & VA_AURAMODE_DIFFUSE_DECAY ) ss << "DD, ";
if( iAuralizationMode & VA_AURAMODE_DIRECTIVITY ) ss << "DIR, "; if( iAuralizationMode & VA_AURAMODE_SOURCE_DIRECTIVITY ) ss << "DIR, ";
if( iAuralizationMode & VA_AURAMODE_AIR_ABSORPTION ) ss << "AA, "; if( iAuralizationMode & VA_AURAMODE_MEDIUM_ABSORPTION ) ss << "AA, ";
if( iAuralizationMode & VA_AURAMODE_ATMOS_TEMP_VAR ) ss << "TV, "; if( iAuralizationMode & VA_AURAMODE_TEMP_VAR ) ss << "TV, ";
if( iAuralizationMode & VA_AURAMODE_SCATTERING ) ss << "SC, "; if( iAuralizationMode & VA_AURAMODE_SCATTERING ) ss << "SC, ";
if( iAuralizationMode & VA_AURAMODE_DIFFRACTION ) ss << "DIF, "; if( iAuralizationMode & VA_AURAMODE_DIFFRACTION ) ss << "DIF, ";
if( iAuralizationMode & VA_AURAMODE_NEARFIELD ) ss << "NF, "; if( iAuralizationMode & VA_AURAMODE_NEARFIELD ) ss << "NF, ";
...@@ -315,9 +315,9 @@ std::string IVACore::GetAuralizationModeStr( const int iAuralizationMode, const ...@@ -315,9 +315,9 @@ std::string IVACore::GetAuralizationModeStr( const int iAuralizationMode, const
if( iAuralizationMode & VA_AURAMODE_DIRECT_SOUND ) ss << "direct sound, "; if( iAuralizationMode & VA_AURAMODE_DIRECT_SOUND ) ss << "direct sound, ";
if( iAuralizationMode & VA_AURAMODE_EARLY_REFLECTIONS ) ss << "early reflections, "; if( iAuralizationMode & VA_AURAMODE_EARLY_REFLECTIONS ) ss << "early reflections, ";
if( iAuralizationMode & VA_AURAMODE_DIFFUSE_DECAY ) ss << "diffuse decay, "; if( iAuralizationMode & VA_AURAMODE_DIFFUSE_DECAY ) ss << "diffuse decay, ";
if( iAuralizationMode & VA_AURAMODE_DIRECTIVITY ) ss << "source directivity, "; if( iAuralizationMode & VA_AURAMODE_SOURCE_DIRECTIVITY ) ss << "source directivity, ";
if( iAuralizationMode & VA_AURAMODE_AIR_ABSORPTION ) ss << "air absorption, "; if( iAuralizationMode & VA_AURAMODE_MEDIUM_ABSORPTION ) ss << "air absorption, ";
if( iAuralizationMode & VA_AURAMODE_ATMOS_TEMP_VAR ) ss << "atmospheric temporal variations, "; if( iAuralizationMode & VA_AURAMODE_TEMP_VAR ) ss << "atmospheric temporal variations, ";
if( iAuralizationMode & VA_AURAMODE_SCATTERING ) ss << "scattering, "; if( iAuralizationMode & VA_AURAMODE_SCATTERING ) ss << "scattering, ";
if( iAuralizationMode & VA_AURAMODE_DIFFRACTION ) ss << "diffraction, "; if( iAuralizationMode & VA_AURAMODE_DIFFRACTION ) ss << "diffraction, ";
if( iAuralizationMode & VA_AURAMODE_NEARFIELD ) ss << "near-field effects, "; if( iAuralizationMode & VA_AURAMODE_NEARFIELD ) ss << "near-field effects, ";
......
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