Changeset 716

Timestamp:

Dec 28, 2007, 11:53:59 PM (17 years ago)

Author:

rgrieder

Message:

• merged all Vector3, etc. (incl. ColourValue) to misc/Math.h

Location:

code/branches/FICN

Files:

• src/misc/ColourValue.h (modified) (2 diffs)
• src/misc/Math.h (modified) (2 diffs)
• src/misc/Matrix3.h (modified) (2 diffs)
• src/misc/Quaternion.h (modified) (2 diffs)
• src/misc/Vector2.h (modified) (2 diffs)
• src/misc/Vector3.h (modified) (2 diffs)
• src/misc/Vector4.h (modified) (2 diffs)
• src/orxonox/SpaceshipSteering.cc (modified) (1 diff)
• src/orxonox/core/ConfigValueContainer.h (modified) (1 diff)
• src/orxonox/objects/Ambient.cc (modified) (1 diff)
• src/orxonox/objects/BillboardSet.cc (modified) (1 diff)
• src/orxonox/objects/BillboardSet.h (modified) (1 diff)
• src/orxonox/objects/Camera.cc (modified) (1 diff)
• src/orxonox/objects/Explosion.cc (modified) (1 diff)
• src/orxonox/objects/Light.h (modified) (1 diff)
• src/orxonox/objects/WorldEntity.h (modified) (1 diff)
• src/orxonox/objects/weapon_system/BarrelGun.cc (modified) (1 diff)
• src/orxonox/objects/weapon_system/BaseWeapon.cc (modified) (1 diff)
• src/orxonox/particle/ParticleInterface.h (modified) (1 diff)
• visual_studio/benixonox.vcproj (modified) (1 diff)

code/branches/FICN/src/misc/ColourValue.h

@@ -1 @@
-#include <OgreColourValue.h>
 
 #include "Math.h"
@@ -5 +4 @@
 namespace orxonox
 {
-  typedef Ogre::ColourValue ColourValue;
 }

code/branches/FICN/src/misc/Math.h

@@ -1 +1 @@
 #include <OgreMath.h>
+#include <OgreVector2.h>
+#include <OgreVector3.h>
+#include <OgreVector4.h>
+#include <OgreMatrix3.h>
+#include <OgreQuaternion.h>
+#include <OgreColourValue.h>
 
 namespace orxonox
@@ -5 +11 @@
   typedef Ogre::Radian Radian;
   typedef Ogre::Degree Degree;
+  typedef Ogre::Vector2 Vector2;
+  typedef Ogre::Vector3 Vector3;
+  typedef Ogre::Vector4 Vector4;
+  typedef Ogre::Matrix3 Matrix3;
+  typedef Ogre::Quaternion Quaternion;
+  typedef Ogre::ColourValue ColourValue;
 }

code/branches/FICN/src/misc/Matrix3.h

@@ -1 @@
-#include <OgreMatrix3.h>
 
 #include "Math.h"
@@ -5 +4 @@
 namespace orxonox
 {
-  typedef Ogre::Matrix3 Matrix3;
 }

code/branches/FICN/src/misc/Quaternion.h

@@ -1 @@
-#include <OgreQuaternion.h>
 
 #include "Math.h"
@@ -5 +4 @@
 namespace orxonox
 {
-  typedef Ogre::Quaternion Quaternion;
 }

code/branches/FICN/src/misc/Vector2.h

@@ -1 @@
-#include <OgreVector2.h>
 
 #include "Math.h"
@@ -5 +4 @@
 namespace orxonox
 {
-  typedef Ogre::Vector2 Vector2;
 }

code/branches/FICN/src/misc/Vector3.h

@@ -1 @@
-#include <OgreVector3.h>
 
 #include "Math.h"
@@ -5 +4 @@
 namespace orxonox
 {
-  typedef Ogre::Vector3 Vector3;
 }

code/branches/FICN/src/misc/Vector4.h

@@ -1 @@
-#include <OgreVector4.h>
 
 #include "Math.h"
@@ -5 +4 @@
 namespace orxonox
 {
-  typedef Ogre::Vector4 Vector4;
 }

code/branches/FICN/src/orxonox/SpaceshipSteering.cc

@@ -30 +30 @@
 
 #include "core/Debug.h"
-#include "misc/Vector3.h"
+#include "misc/Math.h"
 #include "SpaceshipSteering.h"
 

code/branches/FICN/src/orxonox/core/ConfigValueContainer.h

@@ -48 +48 @@
 #include "CorePrereqs.h"
 
-#include "misc/Vector2.h"
-#include "misc/Vector3.h"
-#include "misc/Matrix3.h"
-#include "misc/Quaternion.h"
-#include "misc/ColourValue.h"
+#include "misc/Math.h"
 #include "Language.h"
 

code/branches/FICN/src/orxonox/objects/Ambient.cc

@@ -34 +34 @@
 #include "misc/Tokenizer.h"
 #include "misc/String2Number.h"
-#include "misc/ColourValue.h"
+#include "misc/Math.h"
 #include "../core/Debug.h"
 #include "../core/CoreIncludes.h"

code/branches/FICN/src/orxonox/objects/BillboardSet.cc

@@ -31 +31 @@
 
 #include "../Orxonox.h"
-#include "misc/Vector3.h"
-#include "misc/ColourValue.h"
+#include "misc/Math.h"
 
 #include "BillboardSet.h"

code/branches/FICN/src/orxonox/objects/BillboardSet.h

@@ -10 +10 @@
 #include "../core/CoreIncludes.h"
 #include "misc/ColourValue.h"
-#include "misc/Vector3.h"
+#include "misc/Math.h"
 
 namespace orxonox

code/branches/FICN/src/orxonox/objects/Camera.cc

@@ -10 +10 @@
 #include "misc/Tokenizer.h"
 #include "misc/String2Number.h"
-#include "misc/Vector3.h"
+#include "misc/Math.h"
 #include "../core/Debug.h"
 #include "../core/CoreIncludes.h"

code/branches/FICN/src/orxonox/objects/Explosion.cc

@@ -31 +31 @@
 
 #include "../core/CoreIncludes.h"
-#include "misc/ColourValue.h"
+#include "misc/Math.h"
 #include "../Orxonox.h"
 #include "../particle/ParticleInterface.h"

code/branches/FICN/src/orxonox/objects/Light.h

@@ -8 +8 @@
 #include "../OrxonoxPrereqs.h"
 
-#include "misc/ColourValue.h"
+#include "misc/Math.h"
 
 namespace orxonox

code/branches/FICN/src/orxonox/objects/WorldEntity.h

@@ -7 +7 @@
 #include "../OrxonoxPrereqs.h"
 
-#include "misc/Vector3.h"
-#include "misc/Matrix3.h"
-#include "misc/Quaternion.h"
+#include "misc/Math.h"
 #include "network/Synchronisable.h"
 #include "tinyxml/tinyxml.h"

code/branches/FICN/src/orxonox/objects/weapon_system/BarrelGun.cc

@@ -31 +31 @@
 #include <OgreSceneManager.h>
 
-#include "misc/Vector3.h"
+#include "misc/Math.h"
 #include "Bullet.h"
 #include "BulletManager.h"

code/branches/FICN/src/orxonox/objects/weapon_system/BaseWeapon.cc

@@ -31 +31 @@
 #include <OgreSceneManager.h>
 
-#include "misc/Vector3.h"
+#include "misc/Math.h"
 #include "../../Orxonox.h"
 #include "Bullet.h"

code/branches/FICN/src/orxonox/particle/ParticleInterface.h

@@ -15 +15 @@
 #include "../OrxonoxPrereqs.h"
 
-#include "misc/Vector3.h"
-#include "misc/ColourValue.h"
+#include "misc/Math.h"
 
 

code/branches/FICN/visual_studio/benixonox.vcproj

@@ -451 +451 @@
                                 </File>
                                 <File
-                                        RelativePath="..\src\misc\String.h"
-                                        >
-                                </File>
-                                <File
                                         RelativePath="..\src\misc\String2Number.h"
                                         >