Changeset 4982 in orxonox.OLD

Timestamp:

Aug 10, 2005, 6:14:20 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: movement stuff in the data-filestructure adapted

Location:

orxonox/trunk/src

Files:

• orxonox.cc (modified) (1 diff)
• world_entities/npc.cc (modified) (1 diff)
• world_entities/weapons/test_bullet.cc (modified) (1 diff)
• world_entities/weapons/test_gun.cc (modified) (1 diff)
• world_entities/weapons/turret.cc (modified) (1 diff)

orxonox/trunk/src/orxonox.cc

@@ -1 @@
-`/*
+/*
    orxonox - the future of 3D-vertical-scrollers
 

orxonox/trunk/src/world_entities/npc.cc

@@ -28 +28 @@
   this->setClassID(CL_NPC, "NPC");
 
-  this->loadModel("models/bolido.obj");
+  this->loadModel("models/ships/bolido.obj");
 }
 

orxonox/trunk/src/world_entities/weapons/test_bullet.cc

@@ -36 +36 @@
 
   float modelSize = .3;
-  this->model = (Model*)ResourceManager::getInstance()->load("models/orx-rocket.obj", OBJ, RP_LEVEL, (void*) &modelSize);
+  this->model = (Model*)ResourceManager::getInstance()->load("models/projectiles/orx-rocket.obj", OBJ, RP_LEVEL, (void*) &modelSize);
 
   this->energyMin = 1;

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -118 +118 @@
   this->setClassID(CL_TEST_GUN, "TestGun");
 
-  this->model = (Model*)ResourceManager::getInstance()->load("models/test_gun.obj", OBJ, RP_CAMPAIGN);
+  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
   this->setStateDuration(WS_SHOOTING, .4);

orxonox/trunk/src/world_entities/weapons/turret.cc

@@ -43 +43 @@
   this->init();
 
-  this->loadModel("models/turret1.obj");
+  this->loadModel("models/guns/turret1.obj");