Changeset 4142 in orxonox.OLD for orxonox/branches/md2_loader/src/lib
- Timestamp:
- May 10, 2005, 12:08:18 PM (19 years ago)
- 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 23 23 24 24 #include "stdincl.h" 25 25 26 #include "base_object.h" 26 27 27 template<class T> class tList;28 28 //template<class T> class tList; 29 template<class T> class vector; 29 30 30 31 //! This is our 3D point class. CONFLICTING with Vector.cc … … 93 94 int currentAnim; // The current index into pAnimations list (NEW) 94 95 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 model96 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 98 99 }; 99 100 -
orxonox/branches/md2_loader/src/lib/graphics/importer/md2Model.cc
r4141 r4142 20 20 #include <string> 21 21 22 #include "list.h"22 #include <vector> 23 23 24 24 … … 56 56 void MD2Model::draw(t3DModel *pModel) 57 57 { 58 if( pModel->objectList-> getSize() <= 0) return;58 if( pModel->objectList->size() <= 0) return; 59 59 60 60 t3DObject *pObject = pModel->objectList->firstElement(); … … 113 113 { 114 114 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>(); 118 118 119 119 this->pFile = fopen(fileName, "rb"); … … 231 231 if( strLastName != "") 232 232 { 233 printf("YYYYYYYYYYEEEEEEEEEEEEEEELLLLLLLLLLLLLLLLLLDDDDDDDDD-2!\n");234 233 strcpy(animationInfo->strName, strLastName.c_str()); 235 234 animationInfo->endFrame = i;
Note: See TracChangeset
for help on using the changeset viewer.