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

Timestamp:

Dec 31, 2007, 4:23:39 AM (17 years ago)

Author:

landauf

Message:

moved all files from misc and the tinyxml folder into the new util folder

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)
• Fighter.cc (modified) (1 diff)
• Light.h (modified) (1 diff)
• Model.cc (modified) (1 diff)
• Skybox.cc (modified) (1 diff)
• SpaceShip.cc (modified) (1 diff)
• SpaceshipSteeringObject.cc (modified) (1 diff)
• SpaceshipSteeringObject.h (modified) (2 diffs)
• WorldEntity.cc (modified) (1 diff)
• WorldEntity.h (modified) (1 diff)
• test1.cc (modified) (1 diff)
• test1.h (modified) (2 diffs)
• weapon_system/AmmunitionDump.cc (modified) (1 diff)
• weapon_system/BarrelGun.cc (modified) (1 diff)
• weapon_system/BaseWeapon.cc (modified) (1 diff)
• weapon_system/BulletManager.h (modified) (1 diff)

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

@@ -31 +31 @@
 #include <OgreSceneManager.h>
 
-#include "tinyxml/tinyxml.h"
-#include "misc/Tokenizer.h"
-#include "misc/String2Number.h"
-#include "misc/Math.h"
+#include "util/tinyxml/tinyxml.h"
+#include "util/Tokenizer.h"
+#include "util/String2Number.h"
+#include "util/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/Math.h"
+#include "util/Math.h"
 
 #include "BillboardSet.h"

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

@@ -9 +9 @@
 
 #include "../core/CoreIncludes.h"
-#include "misc/Math.h"
+#include "util/Math.h"
 
 namespace orxonox

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

@@ -7 +7 @@
 #include <OgreViewport.h>
 
-#include "tinyxml/tinyxml.h"
-#include "misc/Tokenizer.h"
-#include "misc/String2Number.h"
-#include "misc/Math.h"
+#include "util/tinyxml/tinyxml.h"
+#include "util/Tokenizer.h"
+#include "util/String2Number.h"
+#include "util/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/Math.h"
+#include "util/Math.h"
 #include "../Orxonox.h"
 #include "../particle/ParticleInterface.h"

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

@@ -33 +33 @@
 #include <OgreSceneNode.h>
 
-#include "tinyxml/tinyxml.h"
-#include "misc/String2Number.h"
+#include "util/tinyxml/tinyxml.h"
+#include "util/String2Number.h"
 #include "../core/CoreIncludes.h"
 #include "../Orxonox.h"

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

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

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

@@ -26 +26 @@
  */
 
-#include "tinyxml/tinyxml.h"
-#include "misc/Tokenizer.h"
-#include "misc/String2Number.h"
+#include "util/tinyxml/tinyxml.h"
+#include "util/Tokenizer.h"
+#include "util/String2Number.h"
 #include "../core/CoreIncludes.h"
 #include "../Orxonox.h"

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

@@ -30 +30 @@
 #include <OgreSceneManager.h>
 
-#include "tinyxml/tinyxml.h"
-//#include "misc/Tokenizer.h"
-//#include "misc/String2Number.h"
+#include "util/tinyxml/tinyxml.h"
+//#include "util/Tokenizer.h"
+//#include "util/String2Number.h"
 #include "../Orxonox.h"
 #include "../core/CoreIncludes.h"

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

@@ -34 +34 @@
 #include <OgreSceneNode.h>
 
-#include "tinyxml/tinyxml.h"
-#include "misc/String2Number.h"
-#include "misc/Math.h"
+#include "util/tinyxml/tinyxml.h"
+#include "util/String2Number.h"
+#include "util/Math.h"
 #include "../core/CoreIncludes.h"
 #include "../core/Debug.h"

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

@@ -35 +35 @@
 #include "../Orxonox.h"
 #include "../GraphicsEngine.h"
-#include "../../tinyxml/tinyxml.h"
-#include "../../misc/Tokenizer.h"
-#include "../../misc/String2Number.h"
+#include "util/tinyxml/tinyxml.h"
+#include "util/Tokenizer.h"
+#include "util/String2Number.h"
 #include "../core/Debug.h"
 

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

@@ -3 +3 @@
 
 #include "BaseObject.h"
-#include "../../tinyxml/tinyxml.h"
+#include "util/tinyxml/tinyxml.h"
 
 namespace orxonox
@@ -13 +13 @@
             virtual ~SpaceshipSteeringObject();
 
-            
+
             void loadParams(TiXmlElement* xmlElem);
 
         private:
-            
+
 
     };

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

@@ -29 +29 @@
 #include <sstream>
 
-#include "tinyxml/tinyxml.h"
-#include "misc/Tokenizer.h"
-#include "misc/String2Number.h"
+#include "util/tinyxml/tinyxml.h"
+#include "util/Tokenizer.h"
+#include "util/String2Number.h"
 #include "../core/CoreIncludes.h"
 #include "../Orxonox.h"

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

@@ -7 +7 @@
 #include "../OrxonoxPrereqs.h"
 
-#include "misc/Math.h"
+#include "util/Math.h"
 #include "network/Synchronisable.h"
-#include "tinyxml/tinyxml.h"
+#include "util/tinyxml/tinyxml.h"
 #include "../core/CoreIncludes.h"
 #include "orxonox/core/BaseObject.h"

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

@@ -29 +29 @@
 #include "test2.h"
 #include "test3.h"
-#include "../../tinyxml/tinyxml.h"
+#include "util/tinyxml/tinyxml.h"
 #include "../Orxonox.h"
 #include <OgreSceneManager.h>

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

@@ -5 +5 @@
 #include "Tickable.h"
 #include "test3.h"
-#include "../../tinyxml/tinyxml.h"
+#include "util/tinyxml/tinyxml.h"
 
 namespace orxonox
@@ -23 +23 @@
             void setUsefullClass2(Identifier* identifier);
             void setUsefullClassOfTypeTest3(Identifier* identifier);
-            
+
             void loadParams(TiXmlElement* xmlElem);
 

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

@@ -28 +28 @@
 #include "orxonox/Orxonox.h"
 #include "BulletManager.h"
-#include "tinyxml/tinyxml.h"
+#include "util/tinyxml/tinyxml.h"
 
 #include "AmmunitionDump.h"

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

@@ -31 +31 @@
 #include <OgreSceneManager.h>
 
-#include "misc/Math.h"
+#include "util/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/Math.h"
+#include "util/Math.h"
 #include "../../Orxonox.h"
 #include "Bullet.h"

code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.h

@@ -37 +37 @@
 
 #include "network/Synchronisable.h"
-#include "tinyxml/tinyxml.h"
+#include "util/tinyxml/tinyxml.h"
 #include "../../core/CoreIncludes.h"
 #include "orxonox/core/BaseObject.h"