Changeset 4158 in orxonox.OLD for orxonox/branches

Timestamp:

May 11, 2005, 12:32:36 AM (20 years ago)

Author:

patrick

Message:

orxonox/branches/md2_loader: now using the home brewed material class for the model - and it works just perfect! orxonox has a very powerfull material class./orxonox

Location:

orxonox/branches/md2_loader/src

Files:

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

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

@@ -77 +77 @@
         char strName[255];                      // The name of the object
         CVector3  *pVerts;                      // The object's vertices
-        CVector3  *pNormals;            // The object's normals
-        CVector2  *pTexVerts;           // The texture's UV coordinates
+        CVector3  *pNormals;                    // The object's normals
+        CVector2  *pTexVerts;                   // The texture's UV coordinates
         tFace *pFaces;                          // The faces information of the object
 };
@@ -203 +203 @@
       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_RGBA, GL_UNSIGNED_BYTE, image->pixels);        
+      gluBuild2DMipmaps(GL_TEXTURE_2D, 3, image->w, image->h, GL_RGB, GL_UNSIGNED_BYTE, image->pixels); 
 
       SDL_FreeSurface(image);

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];
@@ -69 +72 @@
           glNormal3f(-pObject->pNormals[index].x, -pObject->pNormals[index].y, -pObject->pNormals[index].z);
 
-          if( pObject->pTexVerts) 
+          if( likely(pObject->pTexVerts != NULL)) 
             {
-              glTexCoord2f(pObject->pTexVerts[ index2 ].x, pObject->pTexVerts[ index2 ].y);
+              glTexCoord2f(pObject->pTexVerts[index2].x, pObject->pTexVerts[index2].y);
             }
-          glVertex3f(pObject->pVerts[ index ].x, pObject->pVerts[ index ].y, pObject->pVerts[ index ].z);
+          glVertex3f(pObject->pVerts[index].x, pObject->pVerts[index].y, pObject->pVerts[index].z);
         }
     }
   glEnd();
+
+  glDisable(GL_TEXTURE_2D);
 }
 

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

@@ -45 +45 @@
       this->model->materialList[i].texureId = i;
     }
+
+  this->material = new Material("Sky");
+  this->material->setDiffuseMap("../data/models/tris.pcx");
+  this->material->setIllum(3);
+  this->material->setAmbient(1.0, 1.0, 1.0);
 }
 
@@ -76 +81 @@
   //this->model->draw();
   /* TESTGING TESTING TESTING */
+  this->material->select();
   this->md2Model->draw(this->model);
 

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

@@ -7 +7 @@
 class MD2Model;
 struct t3DModel;
+class Material;
 
 class TestEntity : public WorldEntity 
@@ -29 +30 @@
 
   unsigned int* textureArray;
+  Material* material;
 
 };