Changeset 4142 in orxonox.OLD

Timestamp:

May 10, 2005, 12:08:18 PM (19 years ago)

Author:

patrick

Message:

orxonox/branches/md2_laoder: changed to vector container, since its faster for this application. there are compile errors

Location:

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

Files:

• abstract_model.h (modified) (2 diffs)
• md2Model.cc (modified) (4 diffs)

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

@@ -23 +23 @@
 
 #include "stdincl.h"
+
 #include "base_object.h"
 
-template<class T> class tList;
-
+//template<class T> class tList;
+template<class T> class vector;
 
 //! This is our 3D point class.  CONFLICTING with Vector.cc
@@ -93 +94 @@
         int currentAnim;                                        // The current index into pAnimations list (NEW)
         int currentFrame;                                       // The current frame of the current animation (NEW)
-        tList<tAnimationInfo>* animationList; // The list of animations (NEW)
-        tList<tMaterialInfo>* materialList;     // The list of material information (Textures and colors)
-        tList<t3DObject>* objectList;                   // The object list for our model
+        vector<tAnimationInfo>* animationList; // The list of animations (NEW)
+        vector<tMaterialInfo>* materialList;    // The list of material information (Textures and colors)
+        vector<t3DObject>* objectList;                  // The object list for our model
 };
 

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

@@ -20 +20 @@
 #include <string>
 
-#include "list.h"
+#include <vector>
 
 
@@ -56 +56 @@
 void MD2Model::draw(t3DModel *pModel)
 {
-  if( pModel->objectList->getSize() <= 0) return;
+  if( pModel->objectList->size() <= 0) return;
 
   t3DObject *pObject = pModel->objectList->firstElement();
@@ -113 +113 @@
 {
 
-  pModel->animationList = new tList<tAnimationInfo>();
-  pModel->objectList = new tList<t3DObject>();
-  pModel->materialList = new tList<tMaterialInfo>();
+  pModel->animationList = new vector<tAnimationInfo>();
+  pModel->objectList = new vector<t3DObject>();
+  pModel->materialList = new vector<tMaterialInfo>();
 
   this->pFile = fopen(fileName, "rb");
@@ -231 +231 @@
           if( strLastName != "")
             {
-      printf("YYYYYYYYYYEEEEEEEEEEEEEEELLLLLLLLLLLLLLLLLLDDDDDDDDD-2!\n");
               strcpy(animationInfo->strName, strLastName.c_str());
               animationInfo->endFrame = i;