Changeset 568

Timestamp:

Dec 17, 2007, 12:09:13 PM (16 years ago)

Author:

scheusso

Message:

added capability for presentation mode

Location:

code/branches/FICN/src

Files:

• network/GameStateManager.cc (modified) (2 diffs)
• orxonox/objects/BaseEntity.h (modified) (1 diff)
• orxonox/orxonox.cc (modified) (7 diffs)
• orxonox/orxonox.h (modified) (3 diffs)

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

@@ -90 +90 @@
 
   GameState *retval=new GameState; //return value
-  retval->id=id;
+  retval->id=id++;
   // reserve a little memory and increase it later on
   retval->data = (unsigned char*)malloc(1);
@@ -100 +100 @@
     //get size of the synchronisable
     tempsize=it->getSize();
+    COUT(2) << "size of synchronisable: " << tempsize << std::endl;
     // add place for data and 3 ints (length,classid,objectid)
     totalsize+=tempsize+3*sizeof(int);

code/branches/FICN/src/orxonox/objects/BaseEntity.h

@@ -16 +16 @@
       void loadParams(TiXmlElement* xmlElem);
       bool create();
+    protected:
+      void registerAllVariables();
     private:
-      void registerAllVariables();
-      
     // membervariables to be synchronised
       std::string name_;

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

@@ -217 +217 @@
     //TODO: read config file
     //TODO: give config file to Ogre
-    std::string mode = "";
+    std::string mode;
+    if(argc>=2)
+      mode = std::string(argv[1]);
+    else
+      mode = "";
     ArgReader ar = ArgReader(argc, argv);
     ar.checkArgument("mode", mode, false);
@@ -226 +230 @@
     {
       serverInit(path);
+      mode = SERVER;
     }
     else if(mode == std::string("client"))
     {
       clientInit(path);
+      mode = CLIENT;
     }
     else if(mode == std::string("presentation"))
     {
-      playableServer(path);
-    }
-    else
-      standalone(path);
+      serverInit(path);
+      mode = PRESENTATION;
+    }
+    else{
+      standaloneInit(path);
+      mode = STANDALONE;
+    }
   }
 
@@ -252 +261 @@
     createFrameListener();
     Factory::createClassHierarchy();
+    switch(mode_){
+    case PRESENTATION:
+      server_g->open();
+      break;
+    case SERVER:
+    case CLIENT:
+    case STANDALONE:
+    default:
+      break;
+    }
     startRenderLoop();
   }
@@ -274 +293 @@
   }
 
-  void Orxonox::standalone(std::string path)
+  void Orxonox::standaloneInit(std::string path)
   {
     ogre_->setConfigPath(path);
@@ -320 +339 @@
     startRenderLoop();
   }
+  
+  void Orxonox::standalone(){
+    
+    
+    
+  }
 
   void Orxonox::serverInit(std::string path)
@@ -327 +352 @@
     server_g = new network::Server(); // add some settings if wanted
     if(!ogre_->load()) die(/* unable to load */);
+    // add network framelistener
     ogre_->getRoot()->addFrameListener(new network::ServerFrameListener());
-    ogre_->startRender();
-
-    createScene();
-    setupScene();
   }
 
@@ -341 +363 @@
     if(!ogre_->load()) die(/* unable to load */);
     ogre_->getRoot()->addFrameListener(new network::ClientFrameListener());
-    ogre_->startRender();
-
-    createScene();
-    setupScene();
-    setupInputSystem();
-    createFrameListener();
-    startRenderLoop();
   }
 

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

@@ -23 +23 @@
 namespace orxonox {
 
+  enum gameMode{
+    STANDALONE,
+    SERVER,
+    CLIENT,
+    PRESENTATION
+  };
+  
   class OrxListener;
 
@@ -39 +46 @@
       Orxonox();
       virtual ~Orxonox();
+      // init functions
       void serverInit(std::string path);
       void clientInit(std::string path);
-      void standalone(std::string path);
+      void standaloneInit(std::string path);
+      // run functions
       void playableServer(std::string path);
+      void standalone();
       void defineResources();
       void setupRenderSystem();
@@ -65 +75 @@
       OrxListener*          frameListener_;
       Ogre::Root*           root_;
+      
+      // this is used to identify the mode (server/client/...) we're in
+      gameMode              mode_;
   };
 }