Changeset 3405 in orxonox.OLD for orxonox/branches/dave/src

Timestamp:

Feb 13, 2005, 9:10:20 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/dave: Fixed issue with texture-class

1. Not using Texture but Material class
2. TextureCoordinates are set even along the whole surface, this just streches the little Map to the whole scene
3. enabled textures, using glEnable(GL_TEXTURE_2D)

Location:

orxonox/branches/dave/src

Files:

• world.cc (modified) (7 diffs)
• world.h (modified) (1 diff)

orxonox/branches/dave/src/world.cc

@@ -28 +28 @@
 #include "helper_parent.h"
 #include "glmenu_imagescreen.h"
+#include "importer/material.h"
 
 using namespace std;
@@ -372 +373 @@
     
  
+  // Initializing the Ground, and loading a Texture into it.
+  Material* boden = new Material("Ground");
+  boden->setDiffuseMap("../data/pictures/ground.tga");
+  // Setting the illumination mode otherwise it is flat-shaded.
+  boden->setIllum(3);
+
   objectList = glGenLists(1);
   glNewList (objectList, GL_COMPILE);
@@ -377 +384 @@
   //glColor3f(1.0,0,0);
   
-  //BodenTextur reinladen
-  Texture* boden=new Texture();
-  boden->loadImage("../data/pictures/ground.tga");
-  
+  // Enabling Textures
+  glEnable(GL_TEXTURE_2D);
+  
+  // Selecting the new Ground Material.
+  boden->select();
   
   
@@ -453 +461 @@
         }
         glNormal3f(normal_vectors[i][j].x, normal_vectors[i][j].y, normal_vectors[i][j].z);
-        glTexCoord2f(0.0f,0.0f);
+        glTexCoord2f((float)i/(float)sizeX,(float)j/(float)sizeZ);
         glVertex3f(v1.x, v1.y, v1.z);
+
+
         if(height[i+1][j]<snowheight){
           a[0]=0;
@@ -466 +476 @@
           a[2]=1.0;
           glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-          
         }
         glNormal3f(normal_vectors[i+1][j].x, normal_vectors[i+1][j].y, normal_vectors[i+1][j].z);
-        glTexCoord2f(1.0f,0.0f);
+        glTexCoord2f((float)(i+1.0)/(float)sizeX,(float)j/(float)sizeZ);
         glVertex3f(v2.x, v2.y, v2.z);
+
         if(height[i+1][j+1]<snowheight){
           a[0]=0;
@@ -482 +492 @@
           a[2]=1.0;
           glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-          
-          
         }
         glNormal3f(normal_vectors[i+1][j+1].x, normal_vectors[i+1][j+1].y, normal_vectors[i+1][j+1].z);
-        glTexCoord2f(1.0f,1.0f);
+        glTexCoord2f((float)(i+1.0)/(float)sizeX,(float)(j+1.0)/(float)sizeZ);
         glVertex3f(v3.x, v3.y, v3.z);
+
         if(height[i][j+1]<snowheight){
           a[0]=0;
@@ -501 +510 @@
         }
         glNormal3f(normal_vectors[i][j+1].x, normal_vectors[i][j+1].y, normal_vectors[i][j+1].z);
-        glTexCoord2f(0.0f,1.0f);
+        glTexCoord2f((float)(i)/(float)sizeX,(float)(j+1.0)/(float)sizeZ);
         glVertex3f(v4.x, v4.y, v4.z);
         
       }
   glEnd();
+  
+  // Disable Textures Again, for Performance reasons.
+  glDisable(GL_TEXTURE_2D);
+
   /*  
   glBegin(GL_LINES);

orxonox/branches/dave/src/world.h

@@ -10 +10 @@
 #include "stdincl.h"
 #include "story_entity.h"
-#include "importer/texture.h"
-
+class Material;