Changeset 4063 in orxonox.OLD for orxonox/branches/md2_loader/src/orxonox.cc

Timestamp:

May 5, 2005, 2:37:08 PM (19 years ago)

Author:

patrick

Message:

orxonox/branche/md2_loader: merged trunk into my branche

File:

• orxonox/branches/md2_loader/src/orxonox.cc (modified) (10 diffs)

orxonox/branches/md2_loader/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"
@@ -37 +39 @@
 
 #include <string.h>
+
 int verbose = 4;
 
@@ -46 +49 @@
 Orxonox::Orxonox ()
 {
-  pause = false;
+  this->pause = false;
+
+  this->world = NULL;
+  this->resources = NULL;
+  this->localinput = NULL;
 }
 
@@ -54 +61 @@
 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
@@ -168 +176 @@
   PRINT(3)("initializing ResourceManager\n");
   resourceManager = ResourceManager::getInstance();
-  !resourceManager->setDataDir("../data/");
+  if (!resourceManager->setDataDir("../data/"))
+    {
+      PRINTF(1)("Data Could not be located\n");
+      exit(-1);
+    }
 
   PRINT(3)("initializing TextEngine\n");
@@ -281 +293 @@
 
 
+bool showGui = false;
 
 /**
@@ -302 +315 @@
 
   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);
 }
@@ -316 +330 @@
 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");
 }
 
@@ -326 +341 @@
 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;
     }
@@ -338 +372 @@
   
   delete orx;
+  ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
   
 }