Changeset 4162 in orxonox.OLD for orxonox

Timestamp:

May 11, 2005, 9:58:06 AM (20 years ago)

Author:

patrick

Message:

orxonox/branches/md2_importer: reimplemented the animation functions, compiles again

Location:

orxonox/branches/md2_loader/src/lib/graphics/importer

Files:

• md2Model.cc (modified) (1 diff)
• md2Model.h (modified) (1 diff)

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

@@ -49 +49 @@
 
 
-MD2Model::animateModel()
-{
-        if( unlikely(pModel->pObject.size() <= 0)) return;
-        /* get current animation from the list */
-        tAnimationInfo *pAnim = &(pModel->pAnimations[pModel->currentAnim]);
-
-        int nextFrame = (pModel->currentFrame + 1) % pAnim->endFrame;
-        if( unlikely(nextFrame == 0)) 
-                nextFrame =  pAnim->startFrame;
-
-        t3DObject *pFrame = &pModel->pObject[pModel->currentFrame];
-        t3DObject *pNextFrame = &pModel->pObject[nextFrame];
-
-        /* we have stored the texture and face information only in the first frame */
-        t3DObject *pFirstFrame = &pModel->pObject[0];
-
-        /* get the current time as a value in the domain [0..1] :)) */
-        float t = ReturnCurrentTime(pModel, nextFrame);
-
-        glBegin(g_ViewMode);
-                for(int j = 0; j < pFrame->numOfFaces; j++)
-                {
-                        for(int whichVertex = 0; whichVertex < 3; whichVertex++)
-                        {
-                                int vertIndex = pFirstFrame->pFaces[j].vertIndex[whichVertex];
-                                int texIndex  = pFirstFrame->pFaces[j].coordIndex[whichVertex];
+void MD2Model::animate(t3DModel *pModel)
+{
+  if( unlikely(pModel->objectList.size() <= 0)) return;
+  /* get current animation from the list */
+  tAnimationInfo *pAnim = &(pModel->animationList[pModel->currentAnim]);
+
+  int nextFrame = (pModel->currentFrame + 1) % pAnim->endFrame;
+  if( unlikely(nextFrame == 0)) 
+    nextFrame =  pAnim->startFrame;
+
+  t3DObject *pFrame = &pModel->objectList[pModel->currentFrame];
+  t3DObject *pNextFrame = &pModel->objectList[nextFrame];
+
+  /* we have stored the texture and face information only in the first frame */
+  t3DObject *pFirstFrame = &pModel->objectList[0];
+
+  /* get the current time as a value in the domain [0..1] :)) */
+  float t = this->getCurrentTime(pModel, nextFrame);
+
+  glBegin(GL_TRIANGLES);
+  for(int j = 0; j < pFrame->numOfFaces; j++)
+    {
+      for(int whichVertex = 0; whichVertex < 3; whichVertex++)
+        {
+          int vertIndex = pFirstFrame->pFaces[j].vertIndex[whichVertex];
+          int texIndex  = pFirstFrame->pFaces[j].coordIndex[whichVertex];
                                                 
-                                if( likely(pFirstFrame->pTexVerts != NULL)) 
-                                {
-                                        glTexCoord2f(pFirstFrame->pTexVerts[ texIndex ].x, 
-                                                                 pFirstFrame->pTexVerts[ texIndex ].y);
-                                }
+          if( likely(pFirstFrame->pTexVerts != NULL)) 
+            {
+              glTexCoord2f(pFirstFrame->pTexVerts[ texIndex ].x, 
+                           pFirstFrame->pTexVerts[ texIndex ].y);
+            }
                         
-                                /* here comes the interpolation part */
-                                CVector3 vPoint1 = pFrame->pVerts[vertIndex];
-                                CVector3 vPoint2 = pNextFrame->pVerts[vertIndex];
-                                glVertex3f(vPoint1.x + t * (vPoint2.x - vPoint1.x), 
-                                                   vPoint1.y + t * (vPoint2.y - vPoint1.y),
-                                                   vPoint1.z + t * (vPoint2.z - vPoint1.z));
-                        }
-                }
-        glEnd();
-}
-
-
-float MD2Model::returnCurrentTime(t3DModel *pModel, int nextFrame)
-{
-        static float elapsedTime   = 0.0f;
-        static float lastTime     = 0.0f;
-
-        /* this is the same like tick(float time) */
-        //float time = GetTickCount();
-        //elapsedTime = time - lastTime;
-        
-        /* stretch the time with animation speed (and make seconds out of it) */
-        float t = elapsedTime / (1000.0f / kAnimationSpeed);
-        
-        if (elapsedTime >= (1000.0f / kAnimationSpeed) )
-        {
-                pModel->currentFrame = nextFrame;
-                lastTime = time;
-        }
-        return t;
+          /* here comes the interpolation part */
+          CVector3 vPoint1 = pFrame->pVerts[vertIndex];
+          CVector3 vPoint2 = pNextFrame->pVerts[vertIndex];
+          glVertex3f(vPoint1.x + t * (vPoint2.x - vPoint1.x), 
+                     vPoint1.y + t * (vPoint2.y - vPoint1.y),
+                     vPoint1.z + t * (vPoint2.z - vPoint1.z));
+        }
+    }
+  glEnd();
+}
+
+
+float MD2Model::getCurrentTime(t3DModel *pModel, int nextFrame)
+{
+  /* stretch the time with animation speed (and make seconds out of it) */
+  float t = this->dtS / (1000.0f / kAnimationSpeed);
+        
+  if ( unlikely(this->dtS >= (1000.0f / kAnimationSpeed)) )
+      pModel->currentFrame = nextFrame;
+  return t;
+}
+
+
+void MD2Model::tick(float dtS)
+{
+  /* TEMP TEMP TEMP: save the current step length */
+  this->dtS = dtS;
 }
 

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

@@ -124 +124 @@
   void setAnim(int type);
   void scaleModel(float s);
+
+  void tick(float dtS);
   
 private:
-  void animate(float time);
+  void animate(/*float time*/ t3DModel *pModel);
   void processLightning();
   void interpolate(CVector3* vertlist);
   void renderFrame();
+  float getCurrentTime(t3DModel *pModel, int nextFrame);
+
+  float dtS;
 };