Changeset 4152 in orxonox.OLD

Timestamp:

May 10, 2005, 6:29:20 PM (19 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

Files:

• story_entities/world.cc (modified) (2 diffs)
• story_entities/world.h (modified) (2 diffs)
• world_entities/test_entity.cc (modified) (3 diffs)
• world_entities/test_entity.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 ();

orxonox/branches/md2_loader/src/world_entities/test_entity.cc

@@ -20 +20 @@
 #include "stdincl.h"
 #include "model.h"
+#include "md2Model.h"
 
 using namespace std;
@@ -27 +28 @@
 TestEntity::TestEntity () : WorldEntity()
 {
-  this->model = (Model*) ResourceManager::getInstance()->load("cube", RP_LEVEL);
+ //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");
+
+  //this->model = (Model*) ResourceManager::getInstance()->load("cube", RP_LEVEL);
 }
 
@@ -55 +63 @@
   glMultMatrixf((float*)matrix);
   
-  this->model->draw();
+  //this->model->draw();
+  /* TESTGING TESTING TESTING */
+  this->md2Model->draw(this->model);
 
   glPopMatrix();

orxonox/branches/md2_loader/src/world_entities/test_entity.h

@@ -4 +4 @@
 #include "world_entity.h"
 
+class MD2Loader;
+class MD2Model;
+struct t3DModel;
 
 class TestEntity : public WorldEntity 
@@ -20 +23 @@
   virtual void draw ();
 
+ private:
+  /* TESTING TESTING TESTING */
+  t3DModel* model;
+  MD2Model* md2Model;
 };