Changeset 742

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

Files:

• CMakeLists.txt (modified) (1 diff)
• loader/LevelLoader.h (modified) (1 diff)
• network/ClientConnection.cc (modified) (1 diff)
• orxonox/AIClass.h (modified) (1 diff)
• orxonox/Arrival.h (modified) (1 diff)
• orxonox/Flocking.h (modified) (1 diff)
• orxonox/Orxonox.cc (modified) (1 diff)
• orxonox/SpaceshipSteering.cc (modified) (1 diff)
• orxonox/core/BaseObject.cc (modified) (1 diff)
• orxonox/core/BaseObject.h (modified) (1 diff)
• orxonox/core/ConfigValueContainer.cc (modified) (1 diff)
• orxonox/core/ConfigValueContainer.h (modified) (1 diff)
• orxonox/objects/Ambient.cc (modified) (1 diff)
• orxonox/objects/BillboardSet.cc (modified) (1 diff)
• orxonox/objects/BillboardSet.h (modified) (1 diff)
• orxonox/objects/Camera.cc (modified) (1 diff)
• orxonox/objects/Explosion.cc (modified) (1 diff)
• orxonox/objects/Fighter.cc (modified) (1 diff)
• orxonox/objects/Light.h (modified) (1 diff)
• orxonox/objects/Model.cc (modified) (1 diff)
• orxonox/objects/Skybox.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (1 diff)
• orxonox/objects/SpaceshipSteeringObject.cc (modified) (1 diff)
• orxonox/objects/SpaceshipSteeringObject.h (modified) (2 diffs)
• orxonox/objects/WorldEntity.cc (modified) (1 diff)
• orxonox/objects/WorldEntity.h (modified) (1 diff)
• orxonox/objects/test1.cc (modified) (1 diff)
• orxonox/objects/test1.h (modified) (2 diffs)
• orxonox/objects/weapon_system/AmmunitionDump.cc (modified) (1 diff)
• orxonox/objects/weapon_system/BarrelGun.cc (modified) (1 diff)
• orxonox/objects/weapon_system/BaseWeapon.cc (modified) (1 diff)
• orxonox/objects/weapon_system/BulletManager.h (modified) (1 diff)
• orxonox/particle/ParticleInterface.h (modified) (1 diff)
• util/CMakeLists.txt (moved) (moved from code/branches/FICN/src/misc/CMakeLists.txt) (1 diff)
• util/Convert.h (moved) (moved from code/branches/FICN/src/misc/Convert.h)
• util/Math.h (moved) (moved from code/branches/FICN/src/misc/Math.h)
• util/Sleep.h (moved) (moved from code/branches/FICN/src/misc/Sleep.h)
• util/String2Number.h (moved) (moved from code/branches/FICN/src/misc/String2Number.h)
• util/Tokenizer.h (moved) (moved from code/branches/FICN/src/misc/Tokenizer.h)
• util/testing (moved) (moved from code/branches/FICN/src/misc/testing)
• util/testing/CMakeLists.txt (copied) (copied from code/branches/FICN/src/misc/testing/CMakeLists.txt)
• util/testing/TestConverter.cpp (copied) (copied from code/branches/FICN/src/misc/testing/TestConverter.cpp)
• util/tinyxml (moved) (moved from code/branches/FICN/src/tinyxml)
• util/tinyxml/CMakeLists.txt (copied) (copied from code/branches/FICN/src/tinyxml/CMakeLists.txt)
• util/tinyxml/TinyXMLPrereqs.h (copied) (copied from code/branches/FICN/src/tinyxml/TinyXMLPrereqs.h)
• util/tinyxml/ticpp.cc (copied) (copied from code/branches/FICN/src/tinyxml/ticpp.cc)
• util/tinyxml/ticpp.h (copied) (copied from code/branches/FICN/src/tinyxml/ticpp.h)
• util/tinyxml/ticpprc.h (copied) (copied from code/branches/FICN/src/tinyxml/ticpprc.h)
• util/tinyxml/tinystr.cc (copied) (copied from code/branches/FICN/src/tinyxml/tinystr.cc)
• util/tinyxml/tinystr.h (copied) (copied from code/branches/FICN/src/tinyxml/tinystr.h)
• util/tinyxml/tinyxml.cc (copied) (copied from code/branches/FICN/src/tinyxml/tinyxml.cc)
• util/tinyxml/tinyxml.h (copied) (copied from code/branches/FICN/src/tinyxml/tinyxml.h)
• util/tinyxml/tinyxmlerror.cc (copied) (copied from code/branches/FICN/src/tinyxml/tinyxmlerror.cc)
• util/tinyxml/tinyxmlparser.cc (copied) (copied from code/branches/FICN/src/tinyxml/tinyxmlparser.cc)

code/branches/FICN/src/CMakeLists.txt

@@ -7 +7 @@
 ADD_SUBDIRECTORY(orxonox)
 ADD_SUBDIRECTORY(audio)
-ADD_SUBDIRECTORY(tinyxml)
-ADD_SUBDIRECTORY(misc)
+ADD_SUBDIRECTORY(util)

code/branches/FICN/src/loader/LevelLoader.h

@@ -12 +12 @@
 
 #include "LoaderPrereqs.h"
-#include "tinyxml/tinyxml.h"
+#include "util/tinyxml/tinyxml.h"
 
 class TiXmlDocument;   // Forward declaration

code/branches/FICN/src/network/ClientConnection.cc

@@ -39 +39 @@
 #include "ClientConnection.h"
 
-#include "misc/Sleep.h"
+#include "util/Sleep.h"
 
 namespace network{

code/branches/FICN/src/orxonox/AIClass.h

@@ -2 +2 @@
 #define _AIClass_H__
 
-#include "misc/Vector3.h"
+#include "util/Vector3.h"
 
 namespace orxonox

code/branches/FICN/src/orxonox/Arrival.h

@@ -6 +6 @@
 #define _Arrival_H__
 
-#include "misc/Vector3.h"
-#include "misc/Quaternion.h"
+#include "util/Math.h"
 
 namespace orxonox

code/branches/FICN/src/orxonox/Flocking.h

@@ -5 +5 @@
 #define _Flocking_H__
 
-#include "misc/Vector3.h"
+#include "util/Math.h"
 
 namespace orxonox

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

@@ -51 +51 @@
 //***** ORXONOX ****
 //misc
-#include "misc/Sleep.h"
+#include "util/Sleep.h"
 
 // loader and audio

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

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

code/branches/FICN/src/orxonox/core/BaseObject.cc

@@ -31 +31 @@
 */
 
-#include "tinyxml/tinyxml.h"
+#include "util/tinyxml/tinyxml.h"
 
 #include "BaseObject.h"

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

@@ -10 +10 @@
 
 #include "CorePrereqs.h"
-#include "tinyxml/TinyXMLPrereqs.h"
+#include "util/tinyxml/TinyXMLPrereqs.h"
 
 #include "CoreIncludes.h"

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

@@ -28 +28 @@
 #include <fstream>
 
-#include "misc/Tokenizer.h"
-#include "misc/Convert.h"
+#include "util/Tokenizer.h"
+#include "util/Convert.h"
 #include "ConfigValueContainer.h"
 

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

@@ -48 +48 @@
 #include "CorePrereqs.h"
 
-#include "misc/Math.h"
+#include "util/Math.h"
 #include "Language.h"
 

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"

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

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

code/branches/FICN/src/util/CMakeLists.txt

@@ +1 @@
+PROJECT(Orxonox)
 
+ADD_SUBDIRECTORY(tinyxml)
 
 IF(TESTING_ENABLED)