Changeset 716 for code/branches/FICN/src/orxonox/objects

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/src/orxonox/objects

Files:

• Ambient.cc (modified) (1 diff)
• BillboardSet.cc (modified) (1 diff)
• BillboardSet.h (modified) (1 diff)
• Camera.cc (modified) (1 diff)
• Explosion.cc (modified) (1 diff)
• Light.h (modified) (1 diff)
• WorldEntity.h (modified) (1 diff)
• weapon_system/BarrelGun.cc (modified) (1 diff)
• weapon_system/BaseWeapon.cc (modified) (1 diff)

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"