Changeset 1653 for code/branches/gui/src/orxonox/GraphicsEngine.h

Timestamp:

Aug 5, 2008, 9:50:26 PM (16 years ago)

Author:

rgrieder

Message:

• getInstance is probably more suitable than getSingleton (as x3n has already done so in most of his classes) I changed it in Orxonox and GraphicsEngine. Maybe more to come.
• Removed derivation from BaseObject in InputState (templates work well too, don't need a factory at all)

File:

• code/branches/gui/src/orxonox/GraphicsEngine.h (modified) (2 diffs)

code/branches/gui/src/orxonox/GraphicsEngine.h

@@ -62 +62 @@
         void declareRessourceLocations();
         void loadRenderer();
-        bool initialiseResources();
-        bool createNewScene();
+        void initialiseResources();
+        void createNewScene();
 
         void setLevelSceneManager(Ogre::SceneManager* sceneMgr) { this->levelSceneManager_ = sceneMgr; }
@@ -87 +87 @@
         { return this->detailLevelParticle_; }
 
-        static GraphicsEngine& getSingleton();
-        static GraphicsEngine* getSingletonPtr() { return singletonRef_s; }
+        // console commands
+        static void printScreen();
+
+        static GraphicsEngine& getInstance();
+        static GraphicsEngine* getInstancePtr() { return singletonRef_s; }
 
     private: