Changeset 534

Timestamp:

Dec 15, 2007, 10:48:50 PM (17 years ago)

Author:

bknecht

Message:

some updates

Location:

code/branches/FICN/src/orxonox

Files:

• main.cc (modified) (1 diff)
• orxonox.cc (modified) (5 diffs)

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

@@ -75 +75 @@
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
     orx->init(argc, argv, macBundlePath());
-    //orx->start();
+    orx->start();
 #else
     orx->init(argc, argv, "");
-    //orx->start();
+    orx->start();
 #endif
 

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

@@ -217 +217 @@
     //TODO: read config file
     //TODO: give config file to Ogre
-    
+
     if(argc >=2 && strcmp(argv[1], "server")==0)
     {
@@ -225 +225 @@
     {
       clientInit(path);
-    } else if(argc >=2 && strcmp(argv[1], "presentation")==0)
+    }
+    else if(argc >=2 && strcmp(argv[1], "presentation")==0)
     {
       playableServer(path);
-    } else
+    }
+    else
       standalone(path);
   }
@@ -238 +240 @@
   {
     //TODO: start modules
-
+    ogre_->startRender();
     //TODO: run engine
-  }
-
-  /**
-   * @return singleton object
-   */
-  Orxonox* Orxonox::getSingleton()
-  {
-    if (!singletonRef_)
-      singletonRef_ = new Orxonox();
-    return singletonRef_;
-  }
-
-  /**
-   * error kills orxonox
-   */
-  void Orxonox::die(/* some error code */)
-  {
-    //TODO: destroy and destruct everything and print nice error msg
-  }
-
-  void Orxonox::standalone(std::string path)
-  {
-    ogre_->setConfigPath(path);
-    ogre_->setup();
-    root_ = ogre_->getRoot();
-    //if(!ogre_->load()) die(/* unable to load */);
-
-    defineResources();
-    setupRenderSystem();
-    createRenderWindow();
-    initializeResourceGroups();
     createScene();
     setupScene();
@@ -278 +249 @@
     startRenderLoop();
   }
-  
+
+  /**
+   * @return singleton object
+   */
+  Orxonox* Orxonox::getSingleton()
+  {
+    if (!singletonRef_)
+      singletonRef_ = new Orxonox();
+    return singletonRef_;
+  }
+
+  /**
+   * error kills orxonox
+   */
+  void Orxonox::die(/* some error code */)
+  {
+    //TODO: destroy and destruct everything and print nice error msg
+  }
+
+  void Orxonox::standalone(std::string path)
+  {
+    ogre_->setConfigPath(path);
+    ogre_->setup();
+    root_ = ogre_->getRoot();
+    if(!ogre_->load()) die(/* unable to load */);
+
+    //defineResources();
+    //setupRenderSystem();
+    //createRenderWindow();
+    //initializeResourceGroups();
+    /*createScene();
+    setupScene();
+    setupInputSystem();
+    createFrameListener();
+    Factory::createClassHierarchy();
+    startRenderLoop();*/
+  }
+
   void Orxonox::playableServer(std::string path)
   {
@@ -294 +302 @@
     createFrameListener();
     try{
-    server_g = new network::Server(); // add port and bindadress
-    server_g->open(); // open server and create listener thread
-    if(ogre_ && ogre_->getRoot())
-      ogre_->getRoot()->addFrameListener(new network::ServerFrameListener()); // adds a framelistener for the server
-    std::cout << "network framelistener added" << std::endl;
-    } 
+      server_g = new network::Server(); // add port and bindadress
+      server_g->open(); // open server and create listener thread
+      if(ogre_ && ogre_->getRoot())
+        ogre_->getRoot()->addFrameListener(new network::ServerFrameListener()); // adds a framelistener for the server
+      std::cout << "network framelistener added" << std::endl;
+    }
     catch(exception &e)
     {