Changeset 4094 in orxonox.OLD for orxonox/trunk

Timestamp:

May 6, 2005, 8:49:29 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: orxonox now runs from anywhere of the LINUX environment

Location:

orxonox/trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• game_loader.cc (modified) (2 diffs)
• lib/graphics/graphics_engine.cc (modified) (2 diffs)
• orxonox.cc (modified) (1 diff)
• story_entities/world.cc (modified) (8 diffs)
• world_entities/environment.cc (modified) (1 diff)
• world_entities/skysphere.cc (modified) (1 diff)

orxonox/trunk/src/defs/debug.h

@@ -61 +61 @@
 #define DEBUG_MODULE_COMMAND_NODE       4
 #define DEBUG_MODULE_GRAPHICS           0
-#define DEBUG_MODULE_LOAD               0
+#define DEBUG_MODULE_LOAD               2
 
 #define DEBUG_MODULE_IMPORTER           3

orxonox/trunk/src/game_loader.cc

@@ -25 +25 @@
 #include "command_node.h"
 #include "vector.h"
+#include "resource_manager.h"
 #include "factory.h"
 
@@ -76 +77 @@
 {
   ErrorMessage errorCode;
-  
-  this->currentCampaign = this->fileToCampaign(name);
+  char* campaignName;
+  if (ResourceManager::isFile(name))
+    {
+      this->currentCampaign = this->fileToCampaign(name);
+    }
+  else
+    {
+      campaignName = new char[strlen(ResourceManager::getInstance()->getDataDir())+strlen(name)];
+      sprintf(campaignName, "%s%s", ResourceManager::getInstance()->getDataDir(), name);
+      this->currentCampaign = this->fileToCampaign(campaignName);
+      delete campaignName;
+    }
 }
 

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -17 +17 @@
 
 #include "graphics_engine.h"
+#include "resource_manager.h"
 
 #include "debug.h"
@@ -101 +102 @@
   
   // TO DO: Create a cool icon and use it here
-  SDL_WM_SetIcon(SDL_LoadBMP("../data/pictures/orxonox-icon32x32.bmp"), NULL);  
-
+  char* loadPic = new char[strlen(ResourceManager::getInstance()->getDataDir())+ 100];
+  sprintf(loadPic, "%s%s", ResourceManager::getInstance()->getDataDir(),  "pictures/orxonox-icon32x32.bmp");
+  SDL_WM_SetIcon(SDL_LoadBMP(loadPic), NULL);  
+  delete loadPic;
   // Enable default GL stuff
   glEnable(GL_DEPTH_TEST);

orxonox/trunk/src/orxonox.cc

@@ -247 +247 @@
   
   this->gameLoader = GameLoader::getInstance();
-  this->gameLoader->loadCampaign("../data/worlds/DefaultCampaign.oxc");
+  this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc");
   //  this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);
   this->gameLoader->init();

orxonox/trunk/src/story_entities/world.cc

@@ -121 +121 @@
 {
   this->constuctorInit("", -1);
-
+  this->path = NULL;
   const char *string;
   char *name;
@@ -169 +169 @@
 World::World (char* name)
 {
+  this->path = NULL;
   this->constuctorInit(name, -1);
   //NullParent* np = NullParent::getInstance();
@@ -179 +180 @@
 World::World (int worldID)
 {
+  this->path = NULL;
   this->constuctorInit(NULL, worldID);
 }
@@ -266 +268 @@
 ErrorMessage World::load()
 {       
-  PRINTF0("> Loading world: '%s'\n", getPath());
+  PRINTF(0)("> Loading world: '%s'\n", getPath());
   
   GameLoader* loader = GameLoader::getInstance();
@@ -467 +469 @@
   glEndList();
 
-  terrain = new Terrain("../data/worlds/newGround.obj");
+  terrain = new Terrain("worlds/newGround.obj");
   terrain->setRelCoor(Vector(0,-10,0));
   this->spawn(terrain);
@@ -590 +592 @@
 
         // Create SkySphere
-        sky = new Skysphere("../data/pictures/sky-replace.jpg");
+        sky = new Skysphere("pictures/sky-replace.jpg");
         this->localPlayer->addChild(this->sky);
         this->spawn(this->sky);
@@ -635 +637 @@
 
         // Create SkySphere
-        this->sky = new Skysphere("../data/pictures/sky-replace.jpg");
+        this->sky = new Skysphere("pictures/sky-replace.jpg");
         this->sky->setName("SkySphere");
         this->spawn(this->sky);
@@ -1231 +1233 @@
 void World::setPath( const char* name)
 {
-  this->path = new char[strlen(name)+1];
-  strcpy(this->path, name);
+  if (this->path)
+    delete this->path;
+  if (ResourceManager::isFile(name))
+  {
+    this->path = new char[strlen(name)+1];
+    strcpy(this->path, name);
+  }
+  else
+    {
+      this->path = new char[strlen(ResourceManager::getInstance()->getDataDir()) + strlen(name) +1];
+      sprintf(this->path, "%s%s", ResourceManager::getInstance()->getDataDir(), name);
+    }
 }
 

orxonox/trunk/src/world_entities/environment.cc

@@ -30 +30 @@
 {
   this->model = (Model*) ResourceManager::getInstance()->load("cube", RP_LEVEL);
-  //  this->model = new OBJModel("../data/models/fighter.obj");
 }
 

orxonox/trunk/src/world_entities/skysphere.cc

@@ -44 +44 @@
 {
   if (fileName == NULL)
-    this->initialize("../data/pictures/sky-replace.jpg");
+    this->initialize("pictures/sky-replace.jpg");
   else
     this->initialize(fileName);