Changeset 4122 in orxonox.OLD for orxonox/branches/heightMap/src/orxonox.cc

Timestamp:

May 9, 2005, 11:29:19 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/heightMap: merged the Trunk back into branches/heightMap:
merged with Command
svn merge -r 3918:HEAD trunk branches/heightMap
conflicts resolved in favor of the Trunk

Location:

orxonox/branches/heightMap

Files:

• . (modified) (1 prop)
• src/orxonox.cc (modified) (15 diffs)

orxonox/branches/heightMap

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

orxonox/branches/heightMap/src/orxonox.cc

@@ -22 +22 @@
    main-programmer: Patrick Boenzli
    co-programmer: Christian Meyer
-   co-programmer: Benjamin Grauer: injected ResourceManager/GraphicsEngine
+   co-programmer: Benjamin Grauer: injected ResourceManager/GraphicsEngine/GUI
 */
 
 #include "orxonox.h"
+
+#include "gui.h"
 
 #include "world.h"
 #include "data_tank.h"
 #include "command_node.h"
+#include "ini_parser.h"
 #include "game_loader.h"
 #include "graphics_engine.h"
 #include "resource_manager.h"
 #include "text_engine.h"
+#include "factory.h"
 
 #include <string.h>
-int verbose = 3;
+
+int verbose = 4;
 
 using namespace std;
@@ -45 +50 @@
 Orxonox::Orxonox ()
 {
-  pause = false;
+  this->pause = false;
+
+  this->world = NULL;
+  this->resources = NULL;
+  this->localinput = NULL;
 }
 
@@ -53 +62 @@
 Orxonox::~Orxonox () 
 {
+  int i =0;
   Orxonox::singletonRef = NULL;
   if( world != NULL) delete world;
-  if( localinput != NULL) delete world;
+  if( localinput != NULL) delete localinput;
   if( resources != NULL) delete resources;
   delete GraphicsEngine::getInstance(); // deleting the Graphics
@@ -84 +94 @@
 void Orxonox::getConfigFile (int argc, char** argv)
 {
-  strcpy (configfilename, "orxonox.conf");
+  strcpy (configfilename, "~/.orxonox/orxonox.conf");
 }
 
@@ -98 +108 @@
   SDL_Init (SDL_INIT_TIMER);
   // initialize everything
+  printf("> Initializing resources\n");
+  if( initResources () == -1) return -1;
+
   if( initVideo() == -1) return -1;
   if( initSound() == -1) return -1;
@@ -104 +117 @@
   printf("> Initializing networking\n");
   if( initNetworking () == -1) return -1;
-  printf("> Initializing resources\n");
-  if( initResources () == -1) return -1;
   //printf("> Initializing world\n");
   //if( init_world () == -1) return -1; PB: world will be initialized when started
@@ -143 +154 @@
 {
   // create localinput
-  localinput = new CommandNode( configfilename);
+  localinput = new CommandNode(configfilename);
   
   return 0;
@@ -164 +175 @@
 int Orxonox::initResources() 
 {
-  //  printf("Not yet implemented\n");
   PRINT(3)("initializing ResourceManager\n");
   resourceManager = ResourceManager::getInstance();
-  resourceManager->setDataDir("../data/");
-  return 0;
+
+  // create parser
+  IniParser parser (DEFAULT_CONFIG_FILE);
+  if( parser.getSection (CONFIG_SECTION_DATA) == -1)
+    {
+      PRINTF(1)("Could not find Section %s in %s\n", CONFIG_SECTION_DATA, DEFAULT_CONFIG_FILE);
+      return -1;
+    }
+  char namebuf[256];
+  char valuebuf[256];
+  memset (namebuf, 0, 256);
+  memset (valuebuf, 0, 256);
+  
+  while( parser.nextVar (namebuf, valuebuf) != -1)
+    {
+      if (!strcmp(namebuf, CONFIG_NAME_DATADIR))
+        {
+          //  printf("Not yet implemented\n");
+          if (!resourceManager->setDataDir(valuebuf))
+            {
+              PRINTF(1)("Data Could not be located\n");
+              exit(-1);
+            }
+        }
+      
+      memset (namebuf, 0, 256);
+      memset (valuebuf, 0, 256);
+    }
+  
+  if (!resourceManager->checkDataDir(DEFAULT_DATA_DIR_CHECKFILE))
+    {
+      PRINTF(1)("The DataDirectory %s could not be verified\nPlease Change in File %s Section %s Entry %s to a suitable value\n",
+                resourceManager->getDataDir(),
+                DEFAULT_CONFIG_FILE,
+                CONFIG_SECTION_DATA,
+                CONFIG_NAME_DATADIR);
+      exit(-1);
+    }
+
+
   PRINT(3)("initializing TextEngine\n");
   TextEngine::getInstance();
@@ -200 +248 @@
   
   this->gameLoader = GameLoader::getInstance();
-  this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);
+  this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc");
+  //  this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);
   this->gameLoader->init();
   this->gameLoader->start();
@@ -279 +328 @@
 
 
+bool showGui = false;
 
 /**
@@ -300 +350 @@
 
   int i;
-  for(i = 0; i < argc; ++i)
+  for(i = 1; i < argc; ++i)
     {
       if(! strcmp( "--help", argv[i])) return startHelp();
       else if(! strcmp( "--benchmark", argv[i])) return startBenchmarks();
-    }
-
-  PRINTF(2)("Orxonox does not understand the arguments");
+      else if(! strcmp( "--gui", argv[i]) || !strcmp("-g", argv[i])) showGui = true;
+      else PRINTF(2)("Orxonox does not understand the arguments %s\n", argv[i]);
+    }
+
   return startOrxonox(argc, argv);
 }
@@ -314 +365 @@
 int startHelp()
 {
-  printf("orxonox: starts the orxonox game - rules\n");
-  printf("usage: orxonox [arg]\n\n");
-  printf("valid options:\n");
-  printf(" --benchmark\tstarts the orxonox benchmark\n");
-  printf(" --help \tshows this menu\n");
+  PRINT(0)("orxonox: starts the orxonox game - rules\n");
+  PRINT(0)("usage: orxonox [arg]\n\n");
+  PRINT(0)("valid options:\n");
+  PRINT(0)(" --benchmark\tstarts the orxonox benchmark\n");
+  PRINT(0)(" --help \tshows this menu\n");
+  PRINT(0)(" --gui/-g \tDisplays the Gui on startup\n");
 }
 
@@ -324 +376 @@
 int startOrxonox(int argc, char** argv)
 {
-  printf(">>> Starting Orxonox <<<\n");
+  // checking for existence of the configuration-files
+  if (showGui ||
+      !ResourceManager::isFile("~/.orxonox/orxonox.conf") ||
+      ResourceManager::isFile("~/.orxonox/orxonox.lock"))
+    {
+      if (ResourceManager::isFile("~/.orxonox/orxonox.lock"))
+        ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
+      //      char* guiExec = new char[strlen(argv[0])+20];
+      //      sprintf(guiExec,"%sGui --gui", argv[0]);
+      Gui* gui = new Gui(argc, argv);
+      if (! gui->startOrxonox)
+        return 0;
+      
+      delete gui;
+    }
+  
+  PRINT(0)(">>> Starting Orxonox <<<\n");
+
+  ResourceManager::touchFile("~/.orxonox/orxonox.lock");
+
   Orxonox *orx = Orxonox::getInstance();
   
   if((*orx).init(argc, argv) == -1)
     {
-      printf("! Orxonox initialization failed\n");
+      PRINTF(1)("! Orxonox initialization failed\n");
       return -1;
     }
@@ -336 +407 @@
   
   delete orx;
+  ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
   
 }
@@ -346 +418 @@
 #include "player.h"
 #include "base_object.h"
+
 #include <asm/msr.h>
 #include <linux/timex.h>

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+