Changeset 3380 in orxonox.OLD

Timestamp:

Jan 25, 2005, 10:18:56 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: added property that merges the Data-Repository into the Trunk

Location:

orxonox/trunk

Files:

• . (modified) (1 prop)
• src/environment.cc (modified) (1 diff)
• src/glmenu_imagescreen.cc (modified) (1 diff)
• src/player.cc (modified) (1 diff)

orxonox/trunk/src/environment.cc

@@ -29 +29 @@
 Environment::Environment () : WorldEntity()
 {
-  this->model = new Model("reaplow.obj");
+  this->model = new Model("../data/models/fighter.obj");
 }
 

orxonox/trunk/src/glmenu_imagescreen.cc

@@ -80 +80 @@
   // Select Our VU Meter Background Texture
   this->backTex = new Texture();
-  this->backTex->loadImage("load_screen.jpg");
+  this->backTex->loadImage("../data/pictures/load_screen.jpg");
 
   this->maxValue = 10;

orxonox/trunk/src/player.cc

@@ -27 +27 @@
 {
 
-  this->model = new Model("reaplow.obj");
+  this->model = new Model("../data/models/reaplow.obj");
   /*
   objectList = glGenLists(1);