Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4142 in orxonox.OLD for orxonox/branches/md2_loader/src/lib


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/md2_loader/src/lib/graphics/importer/abstract_model.h

    r4079 r4142  
    2323
    2424#include "stdincl.h"
     25
    2526#include "base_object.h"
    2627
    27 template<class T> class tList;
    28 
     28//template<class T> class tList;
     29template<class T> class vector;
    2930
    3031//! This is our 3D point class.  CONFLICTING with Vector.cc
     
    9394        int currentAnim;                                        // The current index into pAnimations list (NEW)
    9495        int currentFrame;                                       // The current frame of the current animation (NEW)
    95         tList<tAnimationInfo>* animationList; // The list of animations (NEW)
    96         tList<tMaterialInfo>* materialList;     // The list of material information (Textures and colors)
    97         tList<t3DObject>* objectList;                   // The object list for our model
     96        vector<tAnimationInfo>* animationList; // The list of animations (NEW)
     97        vector<tMaterialInfo>* materialList;    // The list of material information (Textures and colors)
     98        vector<t3DObject>* objectList;                  // The object list for our model
    9899};
    99100
  • orxonox/branches/md2_loader/src/lib/graphics/importer/md2Model.cc

    r4141 r4142  
    2020#include <string>
    2121
    22 #include "list.h"
     22#include <vector>
    2323
    2424
     
    5656void MD2Model::draw(t3DModel *pModel)
    5757{
    58   if( pModel->objectList->getSize() <= 0) return;
     58  if( pModel->objectList->size() <= 0) return;
    5959
    6060  t3DObject *pObject = pModel->objectList->firstElement();
     
    113113{
    114114
    115   pModel->animationList = new tList<tAnimationInfo>();
    116   pModel->objectList = new tList<t3DObject>();
    117   pModel->materialList = new tList<tMaterialInfo>();
     115  pModel->animationList = new vector<tAnimationInfo>();
     116  pModel->objectList = new vector<t3DObject>();
     117  pModel->materialList = new vector<tMaterialInfo>();
    118118
    119119  this->pFile = fopen(fileName, "rb");
     
    231231          if( strLastName != "")
    232232            {
    233       printf("YYYYYYYYYYEEEEEEEEEEEEEEELLLLLLLLLLLLLLLLLLDDDDDDDDD-2!\n");
    234233              strcpy(animationInfo->strName, strLastName.c_str());
    235234              animationInfo->endFrame = i;
Note: See TracChangeset for help on using the changeset viewer.