Changeset 4159 in orxonox.OLD

Timestamp:

May 11, 2005, 12:35:32 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/md2_loader: cleaned out the unuseable texture loader and fixed also some minor issues

Location:

orxonox/branches/md2_loader/src

Files:

• lib/graphics/importer/abstract_model.h (modified) (1 diff)
• lib/graphics/importer/md2Model.cc (modified) (2 diffs)
• world_entities/test_entity.cc (modified) (2 diffs)
• world_entities/test_entity.h (modified) (1 diff)

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

@@ -182 +182 @@
 };
 
-class Helper
-{
-
- public:
-  
-  static void createTexture(unsigned int textureArray[], char* strFileName, int textureID)
-    {
-      SDL_Surface *image = NULL;
-      
-      if(!strFileName)                                                         
-        return;
-
-      image = IMG_Load(strFileName);
-      if( !image)
-        PRINTF(0)("IMG_Load: %s\n", IMG_GetError());
-        
-      glGenTextures(1, &textureArray[textureID]);
-      glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
-      glBindTexture(GL_TEXTURE_2D, textureArray[textureID]);
-      glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
-      glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR_MIPMAP_LINEAR);
-      gluBuild2DMipmaps(GL_TEXTURE_2D, 3, image->w, image->h, GL_RGB, GL_UNSIGNED_BYTE, image->pixels); 
-
-      SDL_FreeSurface(image);
-    }
-
-};
 
 #endif /* _ABSTRACT_MODEL_H */

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

@@ -56 +56 @@
 {
   if( pModel->objectList.size() <= 0) return;
-
-  glEnable(GL_TEXTURE_2D);
-  //glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
 
   t3DObject *pObject = &pModel->objectList[0];
@@ -80 +77 @@
     }
   glEnd();
-
-  glDisable(GL_TEXTURE_2D);
 }
 

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

@@ -27 +27 @@
 
 TestEntity::TestEntity () : WorldEntity()
-{
-  this->textureArray = new unsigned int[100];
-  memset(this->textureArray, 0, 100*sizeof(unsigned int));
-  
+{  
   MD2Loader* md2loader = new MD2Loader();
   this->model = new t3DModel;
@@ -36 +33 @@
 
   md2loader->importMD2(this->model, "../data/models/tris.md2", "../data/models/tris.pcx");
-
-  for(int i = 0; i < this->model->numOfMaterials; i++)
-    {
-      if( strlen(this->model->materialList[i].strFile) > 0)
-        {
-          Helper::createTexture(textureArray, this->model->materialList[i].strFile, i);
-        }
-      this->model->materialList[i].texureId = i;
-    }
 
   this->material = new Material("Sky");

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

@@ -28 +28 @@
   t3DModel* model;
   MD2Model* md2Model;
-
-  unsigned int* textureArray;
   Material* material;