Changeset 4717 in orxonox.OLD for orxonox

Timestamp:

Jun 27, 2005, 1:49:58 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: some other md2 files to load

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (3 diffs)
• lib/graphics/importer/md2Model.cc (modified) (1 diff)
• subprojects/collision_detection/collision_detection.cc (modified) (1 diff)
• world_entities/test_entity.cc (modified) (1 diff)

orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -91 +91 @@
 void OBBTreeNode::spawnBVTree(const int depth, sVec3D *verticesList, const int length)
 {
-  PRINT(0)("\n");
+  PRINT(3)("\n");
   this->treeIndex = this->obbTree->getID();
-  PRINTF(0)("OBB Depth: %i, tree index: %i, numVertices: %i\n", depth, treeIndex, length);
+  PRINTF(3)("OBB Depth: %i, tree index: %i, numVertices: %i\n", depth, treeIndex, length);
   this->depth = depth;
 
@@ -122 +122 @@
     else
     {
-      PRINTF(0)("Aboarding tree walk: less than 3 vertices left\n");
+      PRINTF(3)("Aboarding tree walk: less than 3 vertices left\n");
     }
 
@@ -133 +133 @@
     else
     {
-      PRINTF(0)("Abording tree walk: less than 3 vertices left\n");
+      PRINTF(3)("Abording tree walk: less than 3 vertices left\n");
     }
 

orxonox/trunk/src/lib/graphics/importer/md2Model.cc

@@ -203 +203 @@
         }
 
+
       for(; i > 0; i--, pCommands += 3) /* down counting for loop, next 3 gl commands */
         {
+          glTexCoord2f( ((float *)pCommands)[0], ((float *)pCommands)[1] );
           glNormal3fv(anorms[this->data->pLightNormals[pCommands[2]]]);
-          glTexCoord2f( ((float *)pCommands)[0], ((float *)pCommands)[1] );
           glVertex3fv(verticesList[pCommands[2]]);
         }
       glEnd();
+
     }
   glDisable(GL_CULL_FACE);

orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -79 +79 @@
   entityList = new tList<WorldEntity>();
 
-  //a = new TestEntity(); a->setName("Clown1");
+  a = new TestEntity(); a->setName("Clown1");
   b = new Environment(); b->setName("Jaeger");
   //c = new Terrain();
 
-  //b->setRelCoor(0.0, 0.0, -10.0);
+  b->setRelCoor(0.0, 0.0, -10.0);
   //b->setRelDir(Quaternion(-M_PI/2.0f, Vector(0.0, 1.0, 0.0)));
 
-   //entityList->add(a);
-   entityList->add(b);
+  entityList->add(a);
+  entityList->add(b);
 
   CDEngine::getInstance()->setEntityList(entityList);
 
   LightManager* lightMan = LightManager::getInstance();
-    lightMan->setAmbientColor(.1,.1,.1);
+  lightMan->setAmbientColor(.1,.1,.1);
   lightMan->addLight();
   lightMan->setPosition(-5.0, 50.0, -40.0);

orxonox/trunk/src/world_entities/test_entity.cc

@@ -32 +32 @@
 
 //   this->md2Model = new MD2Model("models/tris.md2", "models/tris.pcx");
-  this->md2Model = new MD2Model("models/shogun.md2", "maps/shogun.pcx");
+  this->md2Model = new MD2Model("models/ogro.md2", "maps/ogro.pcx");
   this->obbTree = new OBBTree(7, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
 
-  this->md2Model->setAnim(0);
+  this->md2Model->setAnim(STAND);
   this->md2Model->debug();
 }