Changeset 4152 in orxonox.OLD for orxonox/branches/md2_loader/src/story_entities

Timestamp:

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

Author:

patrick

Message:

orxonox/branches/md2_loader: removed the md2 loader stuff from the world and implemented it in the testentity class, where its more local and makes more sense

Location:

orxonox/branches/md2_loader/src/story_entities

Files:

• world.cc (modified) (2 diffs)
• world.h (modified) (2 diffs)

orxonox/branches/md2_loader/src/story_entities/world.cc

@@ -484 +484 @@
   terrain->setRelCoor(Vector(0,-10,0));
   this->spawn(terrain);
-  
-  
-
-  //This is for md2 test purposes only! if this is seen in the trunk: hit me :)
-  MD2Loader* md2loader = new MD2Loader();
-  this->model = new t3DModel;
-  this->md2Model = new MD2Model();
-
-  md2loader->importMD2(model, "../data/models/jack/tris.md2", "test.bmp");
-
-}
+}
+
 
 void World::loadDebugWorld(int worldID)
@@ -951 +942 @@
     }
   delete iterator;
-
-  /* TESTGING TESTING TESTING */
-  this->md2Model->draw(this->model);
   
   glCallList (objectList);

orxonox/branches/md2_loader/src/story_entities/world.h

@@ -24 +24 @@
 class Text;
 
-/* TESTING TESTING TESTING */
-struct t3DModel;
-class MD2Model;
 
 //! The game world Interface
@@ -122 +119 @@
   GarbageCollector* garbageCollector; //!< reference to the garbage  collector
 
-  /* TESTING TESTING TESTING */
-  t3DModel* model;
-  MD2Model* md2Model;
-
-
   /* function for main-loop */
   void mainLoop ();