Changeset 3681 in orxonox.OLD for orxonox/branches/textEngine/src/orxonox.h

Timestamp:

Mar 30, 2005, 9:02:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: merged trunk here.
merged with command:
svn merge ../trunk textEngine -r 3467:HEAD
no conflicts

File:

• orxonox/branches/textEngine/src/orxonox.h (modified) (6 diffs)

orxonox/branches/textEngine/src/orxonox.h

@@ -7 +7 @@
 #define _ORXONOX_H
 
-#include "stdincl.h"
+#include "comincl.h"
+#include "glincl.h"
 
 class CommandNode;
@@ -15 +16 @@
 class Camera;
 class GameLoader;
+class ResourceManager;
 
 //! Orxonox core singleton class
@@ -24 +26 @@
   static Orxonox* singletonRef;
   Orxonox ();
-  ~Orxonox ();
-  
+
   char configfilename[256];   //!< Filename of the configuration-file.
   World* world;               //!< Reference to the current running world.
   DataTank* resources;        //!< DataContainer
   CommandNode* localinput;    //!< Command Handler
-  Camera* localcamera;        //!< The current Camera
   SDL_Surface* screen;        //!< The current Screen
   GameLoader* gameLoader;     //!< The gameLoader
+  ResourceManager* resourceManager; //!< The ResourceManager
   
   bool bQuitOrxonox;          //!< If Orxonox should Quit
@@ -57 +58 @@
  public:
   static Orxonox* getInstance ();
+  virtual ~Orxonox ();
+
   void start();
   void quitGame();
@@ -66 +69 @@
   
   CommandNode* getLocalInput();
-  Camera* getCamera();
   World* getWorld();
   SDL_Surface* getScreen ();
@@ -73 +75 @@
 };
 
+int startHelp(void);
+int startOrxonox(int argc, char** argv);
+int startBenchmarks(void);
+
 #endif /* _ORXONOX_H */