Changeset 4168 in orxonox.OLD

Timestamp:

May 11, 2005, 5:17:21 PM (19 years ago)

Author:

patrick

Message:

orxonox/branches/md2_loader: started cleaning up: put model and md2model together

Location:

orxonox/branches/md2_loader/src

Files:

• lib/graphics/importer/Makefile.in (modified) (1 diff)
• lib/graphics/importer/md2Model.cc (modified) (6 diffs)
• lib/graphics/importer/md2Model.h (modified) (4 diffs)
• world_entities/test_entity.cc (modified) (2 diffs)

orxonox/branches/md2_loader/src/lib/graphics/importer/Makefile.in

@@ -42 +42 @@
 subdir = src/lib/graphics/importer
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in TODO
+        $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac

orxonox/branches/md2_loader/src/lib/graphics/importer/md2Model.cc

@@ -36 +36 @@
 {
   this->setClassName ("MD2Model");
+
+  MD2Loader* md2loader = new MD2Loader();
+  this->model = new t3DModel;
+  md2loader->importMD2(this->model, "../data/models/tris.md2");
 }
 
@@ -49 +53 @@
 
 
-void MD2Model::animate(t3DModel *pModel)
-{
-  if( unlikely(pModel->objectList.size() <= 0)) return;
+void MD2Model::animate()
+{
+  if( unlikely(this->model->objectList.size() <= 0)) return;
   /* get current animation from the list */
-  tAnimationInfo *pAnim = &(pModel->animationList[pModel->currentAnim]);
-
-  int nextFrame = (pModel->currentFrame + 1) % pAnim->endFrame;
+  tAnimationInfo *pAnim = &(this->model->animationList[this->model->currentAnim]);
+
+  int nextFrame = (this->model->currentFrame + 1) % pAnim->endFrame;
   if( unlikely(nextFrame == 0)) 
     nextFrame =  pAnim->startFrame;
 
-  t3DObject *pFrame = &pModel->objectList[pModel->currentFrame];
-  t3DObject *pNextFrame = &pModel->objectList[nextFrame];
+  t3DObject *pFrame = &this->model->objectList[this->model->currentFrame];
+  t3DObject *pNextFrame = &this->model->objectList[nextFrame];
 
   /* we have stored the texture and face information only in the first frame */
-  t3DObject *pFirstFrame = &pModel->objectList[0];
+  t3DObject *pFirstFrame = &this->model->objectList[0];
 
   /* get the current time as a value in the domain [0..1] :)) */
-  float t = this->getCurrentTime(pModel, nextFrame);
+  float t = this->getCurrentTime(this->model, nextFrame);
 
   glBegin(GL_TRIANGLES);
@@ -78 +82 @@
           if( likely(pFirstFrame->pTexVerts != NULL)) 
             {
-              glTexCoord2f(pFirstFrame->pTexVerts[ texIndex ].x, 
-                           pFirstFrame->pTexVerts[ texIndex ].y);
+              glTexCoord2f(pFirstFrame->pTexVerts[texIndex].x, 
+                           pFirstFrame->pTexVerts[texIndex].y);
             }
                         
@@ -106 +110 @@
     }
   printf("t = %f\n", this->localTime);
-  return (this->localTime/kAnimationSpeed);
+  return (this->localTime / kAnimationSpeed);
 }
 
@@ -112 +116 @@
 void MD2Model::tick(float dtS)
 {
-  /* TEMP TEMP TEMP: save the current step length */
-  this->dtS = dtS;
   this->localTime += dtS;
 }
@@ -122 +124 @@
    these function will take NO argument in the final version, just for testing
 */
-void MD2Model::draw(t3DModel *pModel)
-{
-  if( pModel->objectList.size() <= 0) return;
-
-  t3DObject *pObject = &pModel->objectList[0];
+void MD2Model::draw()
+{
+  if( this->model->objectList.size() <= 0) return;
+
+  t3DObject *pObject = &this->model->objectList[0];
   glBegin(GL_TRIANGLES);
   for(int j = 0; j < pObject->numOfFaces; j++)

orxonox/branches/md2_loader/src/lib/graphics/importer/md2Model.h

@@ -119 +119 @@
   void drawModel(float time);
   void drawFrame(int frame);
-  
-  void draw(t3DModel *pModel);
+  void draw();
   
   void setAnim(int type);
@@ -127 +126 @@
   void tick(float dtS);
 
-  void animate(/*float time*/ t3DModel *pModel);
+  void animate(/*float time*/);
 private:
   void processLightning();
@@ -134 +133 @@
   float getCurrentTime(t3DModel *pModel, int nextFrame);
 
-  float dtS;
+  t3DModel* model;
   float localTime;
 };
@@ -145 +144 @@
   virtual ~MD2Loader();
   
-  bool importMD2(t3DModel *pModel, char *fileName, char *texture);
+  bool importMD2(t3DModel *pModel, char *fileName, char *texture = NULL);
 
 private:

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

@@ -28 +28 @@
 TestEntity::TestEntity () : WorldEntity()
 {  
-  MD2Loader* md2loader = new MD2Loader();
-  this->model = new t3DModel;
   this->md2Model = new MD2Model();
 
-  md2loader->importMD2(this->model, "../data/models/tris.md2", "../data/models/tris.pcx");
-
-  this->material = new Material("Sky");
+  this->material = new Material("Clown");
   this->material->setDiffuseMap("../data/models/tris.pcx");
   this->material->setIllum(3);
@@ -70 +66 @@
   glMultMatrixf((float*)matrix);
   
-  //this->model->draw();
+
   /* TESTGING TESTING TESTING */
   this->material->select();
   //this->md2Model->draw(this->model);
-  this->md2Model->animate(this->model);
+  this->md2Model->animate();
 
   glPopMatrix();