Changeset 4276 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

May 24, 2005, 11:08:33 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: cleaned out the md2 model class, there is now only one model again

Location:

orxonox/trunk/src/world_entities

Files:

• test_entity.cc (modified) (3 diffs)
• test_entity.h (modified) (1 diff)

orxonox/trunk/src/world_entities/test_entity.cc

@@ -28 +28 @@
 TestEntity::TestEntity () : WorldEntity()
 {  
-  //this->md2Model = new MD2Model();
+  this->md2Model = new MD2Model();
+  this->md2Model->loadModel(ResourceManager::getFullName("models/tris.md2"));
+  //  this->md2Model->loadSkin(ResourceManager::getFullName("models/tris.pcx"));
+  this->md2Model->loadSkin("../data/models/tris.pcx");
 
-  this->md2Model2 = new MD2Model2();
-  this->md2Model2->loadModel(ResourceManager::getFullName("models/tris.md2"));
-  this->md2Model2->loadSkin(ResourceManager::getFullName("../data/models/tris.pcx"));
 
-  this->md2Model2->debug();
+  this->md2Model->debug();
 }
 
@@ -44 +44 @@
 void TestEntity::tick (float time) 
 {
-  this->md2Model2->tick(time);
+  this->md2Model->tick(time);
 }
 
@@ -67 +67 @@
   glMultMatrixf((float*)matrix);
   
-
-  /* TESTGING TESTING TESTING */
-  //this->material->select();
-  //this->md2Model->draw(this->model);
-  //this->md2Model->animate();
-
-  this->md2Model2->draw();
+  this->md2Model->draw();
   
 

orxonox/trunk/src/world_entities/test_entity.h

@@ -29 +29 @@
   t3DModel* model;
   MD2Model* md2Model;
-  MD2Model2* md2Model2;
   Material* material;