Improving style and some minor definitions fixes, re-adding comp access for VAVec3.

parent ded12185
Copyright 2015-2016 Institute of Technical Acoustics, RWTH Aachen University Copyright 2015-2016 Institute of Technical Acoustics, RWTH Aachen University. Any usage and distribution is prohibited, unless explicitly granted by the authors.
\ No newline at end of file
Any usage and distribution is prohibited, unless explicitly granted by the authors.
\ No newline at end of file
...@@ -79,9 +79,14 @@ typedef unsigned __int64 uint64_t; ...@@ -79,9 +79,14 @@ typedef unsigned __int64 uint64_t;
class VABASE_API VAVec3 class VABASE_API VAVec3
{ {
public: public:
double x; union
double y; {
double z; double comp[ 3 ];
struct
{
double x, y, z;
};
};
VAVec3() : x(0), y(0), z(0) {}; VAVec3() : x(0), y(0), z(0) {};
VAVec3( const VAVec3& v ) : x( v.x ), y( v.y ), z( v.z ) {}; VAVec3( const VAVec3& v ) : x( v.x ), y( v.y ), z( v.z ) {};
......
/* /*
* --------------------------------------------------------------------------------- * --------------------------------------------------------------------------------------------
* *
* VVV VVV A * VVV VVV A
* VVV VVV AAA Virtual Acoustics * VVV VVV AAA Virtual Acoustics (VA)
* VVV VVV AAA Real-time auralisation for virtual reality * VVV VVV AAA Real-time auralisation for virtual reality
* VVV VVV AAA * VVV VVV AAA
* VVVVVV AAA (c) Copyright Institut fr Technische Akustik (ITA) * VVVVVV AAA (c) Copyright Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen (http://www.akustik.rwth-aachen.de) * VVVV AAA RWTH Aachen University (http://www.akustik.rwth-aachen.de)
* *
* --------------------------------------------------------------------------------- * --------------------------------------------------------------------------------------------
*/ */
// $Id: VASamples.h 2199 2011-11-23 21:30:53Z stienen $ // $Id: VASamples.h 2199 2011-11-23 21:30:53Z stienen $
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
// $Id: VAException.h 1790 2011-04-12 20:08:07Z fwefers $ // $Id: VAException.h 1790 2011-04-12 20:08:07Z fwefers $
#ifndef __VABASE_STRUCT_H__ #ifndef IW_VABASE_STRUCT
#define __VABASE_STRUCT_H__ #define IW_VABASE_STRUCT
// VA includes // VA includes
#include <VABaseDefinitions.h> #include <VABaseDefinitions.h>
...@@ -289,4 +289,4 @@ VABASE_API std::ostream& operator<<(std::ostream& os, const CVAStruct& s); ...@@ -289,4 +289,4 @@ VABASE_API std::ostream& operator<<(std::ostream& os, const CVAStruct& s);
//! STL stream output operator //! STL stream output operator
VABASE_API std::ostream& operator<<(std::ostream& os, const CVAStructValue& key); VABASE_API std::ostream& operator<<(std::ostream& os, const CVAStructValue& key);
#endif // __VABASE_STRUCT_H__ #endif // IW_VABASE_STRUCT
...@@ -64,7 +64,8 @@ int CVAObjectRegistry::RegisterObject(CVAObject* pObject) { ...@@ -64,7 +64,8 @@ int CVAObjectRegistry::RegisterObject(CVAObject* pObject) {
std::transform( sName.begin(), sName.end(), sName.begin(), toupper); std::transform( sName.begin(), sName.end(), sName.begin(), toupper);
// Ensure that the object has a unique name // Ensure that the object has a unique name
if (m_mpObjects.find(sName) != m_mpObjects.end()) VA_EXCEPT2(INVALID_PARAMETER, "Object with this name already contained"); if( m_mpObjects.find( sName ) != m_mpObjects.end() )
VA_EXCEPT2( INVALID_PARAMETER, "Object with name '" + sName + "' already registered as a VA object" );
// Grow the internal lookup table if there is no free space left // Grow the internal lookup table if there is no free space left
if (m_nObjects == m_vpObjects.size()) { if (m_nObjects == m_vpObjects.size()) {
......
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