Changeset 5918 for code/branches/core5

Timestamp:

Oct 9, 2009, 4:54:31 PM (15 years ago)

Author:

scheusso

Message:

2 new console commands (startIOConsole, printObjects)

Location:

code/branches/core5/src/orxonox/gamestates

Files:

• GSMainMenu.cc (modified) (3 diffs)
• GSMainMenu.h (modified) (1 diff)
• GSRoot.cc (modified) (2 diffs)
• GSRoot.h (modified) (1 diff)

code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc

@@ -57 +57 @@
         // create an empty Scene
         this->scene_ = new Scene(NULL);
+        this->scene_->setSyncMode( 0x0 );
         // and a Camera
         this->camera_ = this->scene_->getSceneManager()->createCamera("mainMenu/Camera");
@@ -90 +91 @@
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startDedicated, this), "startDedicated"));
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startMainMenu, this), "startMainMenu"));
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startIOConsole, this), "startIOConsole"));
 
         KeyBinderManager::getInstance().setToDefault();
@@ -153 +155 @@
         Game::getInstance().requestStates("mainmenu");
     }
+    void GSMainMenu::startIOConsole()
+    {
+        // HACK - HACK
+        Game::getInstance().popState();
+        Game::getInstance().popState();
+        Game::getInstance().requestStates("ioConsole");
+    }
 }

code/branches/core5/src/orxonox/gamestates/GSMainMenu.h

@@ -47 +47 @@
         void update(const Clock& time);
 
-        void startStandalone();
-        void startServer();
-        void startClient();
-        void startDedicated();
-        void startMainMenu();
+        static void startStandalone();
+        static void startServer();
+        static void startClient();
+        static void startDedicated();
+        static void startMainMenu();
+        static void startIOConsole();
 
     private:

code/branches/core5/src/orxonox/gamestates/GSRoot.cc

@@ -41 +41 @@
 {
     DeclareGameState(GSRoot, "root", false, false);
+    SetConsoleCommandShortcut(GSRoot, printObjects);
 
     GSRoot::GSRoot(const GameStateInfo& info)
@@ -53 +54 @@
     {
         NetworkFunctionBase::destroyAllNetworkFunctions();
+    }
+    
+    void GSRoot::printObjects()
+    {
+        unsigned int nr=0;
+        for(ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it; ++it){
+            if( dynamic_cast<Synchronisable*>(*it) )
+                COUT(0) << "object: " << it->getIdentifier()->getName() << " id: " << dynamic_cast<Synchronisable*>(*it)->getObjectID() << std::endl;
+            else
+                COUT(0) << "object: " << it->getIdentifier()->getName() << std::endl;
+            nr++;
+        }
+        COUT(0) << "currently got " << nr << " objects" << std::endl;
+    
     }
 

code/branches/core5/src/orxonox/gamestates/GSRoot.h

@@ -41 +41 @@
         ~GSRoot();
 
+        static void printObjects();
+
         void activate();
         void deactivate();