Changeset 945 for code/branches/input/src/orxonox

Timestamp:

Mar 27, 2008, 10:13:19 PM (16 years ago)

Author:

rgrieder

Message:

• moved ArgReader to util
• some Prereqs cleanup

Location:

code/branches/input/src/orxonox

Files:

• Orxonox.cc (modified) (3 diffs)
• OrxonoxPrereqs.h (modified) (3 diffs)
• core/ArgReader.cc (deleted)
• core/ArgReader.h (deleted)
• core/CMakeLists.txt (modified) (1 diff)
• core/CorePrereqs.h (modified) (3 diffs)

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

@@ -50 +50 @@
 //misc
 //#include "util/Sleep.h"
+#include "util/ArgReader.h"
 
 // audio
@@ -61 +62 @@
 
 // objects
-#include "core/ArgReader.h"
 #include "core/Debug.h"
 #include "core/Factory.h"
@@ -174 +174 @@
     std::string mode;
 
-    ArgReader ar = ArgReader(argc, argv);
+    ArgReader ar(argc, argv);
     ar.checkArgument("mode", mode, false);
     ar.checkArgument("data", this->dataPath_, false);

code/branches/input/src/orxonox/OrxonoxPrereqs.h

@@ -27 +27 @@
 
 /**
- @file  OrxonoxPrereqs.h
- @brief Contains all the necessary forward declarations for all classes and structs.
- */
+  @file
+  @brief Contains all the necessary forward declarations for all classes and structs.
+*/
 
 #ifndef _OrxonoxPrereqs_H__
@@ -59 +59 @@
 //-----------------------------------------------------------------------
 
-// classes that have not yet been put into a namespace
-class InputManager;
-class SpaceShipSteering;
-
 namespace orxonox {
-  class Ambient;
-  class BaseObject;
-  class Camera;
   class GraphicsEngine;
   struct InputEvent;
   class InputEventListener;
   class InputHandler;
-  class Mesh;
+  class Orxonox;
+
+  // objects
+  class Ambient;
+  class Camera;
+  class Explosion;
+  class Fighter;
   class Model;
   class NPC;
-  class OrxListener;
-  class Orxonox;
+  class Projectile;
   class Skybox;
   class SpaceShip;
-  class Tickable;
-  class TickFrameListener;
-  template <class T>
-  class Timer;
-  class TimerBase;
-  class TimerFrameListener;
   class WorldEntity;
 
@@ -93 +85 @@
   class WeaponStation;
 
+  // tools
+  class BillboardSet;
+  class Light;
+  class Mesh;
+  template <class T>
+  class Timer;
+  class TimerBase;
+
+  // particle
   class ParticleInterface;
+
+  // hud
   class HUD;
 }

code/branches/input/src/orxonox/core/CMakeLists.txt

@@ -9 +9 @@
   Error.cc
   SignalHandler.cc
-  ArgReader.cc
   DebugLevel.cc
   OutputHandler.cc

code/branches/input/src/orxonox/core/CorePrereqs.h

@@ -27 +27 @@
 
 /**
-    @file  CorePrereq.h
-    @brief Contains all the necessary forward declarations for all classes, structs and enums.
+  @file
+  @brief Contains all the necessary forward declarations for all classes and structs.
 */
 
@@ -67 +67 @@
   typedef std::string LanguageEntryLabel;
 
-  class ArgReader;
   class BaseFactory;
   class BaseMetaObjectListElement;
+  class BaseObject;
   template <class T>
   class ClassFactory;
@@ -103 +103 @@
   template <class T>
   class SubclassIdentifier;
+  class Tickable;
   template <class T, class O>
   class XMLPortClassObjectContainer;