Changeset 7782 in orxonox.OLD

Timestamp:

May 24, 2006, 12:41:23 AM (18 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine: simple cloud texture creation working

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• cloud_effect.cc (modified) (4 diffs)
• cloud_effect.h (modified) (1 diff)

branches/atmospheric_engine/src/lib/graphics/effects/cloud_effect.cc

@@ -71 +71 @@
                 {
                         float color = map256[i*256+j]; 
-                        texture[i][j][0] = color;
-                        texture[i][j][1] = color;
-                        texture[i][j][2] = color;
+                        texture[i][j][0] = (char) color;
+                        texture[i][j][1] = (char) color;
+                        texture[i][j][2] = (char) color;
                 }
 
@@ -82 +82 @@
                 } */
 
-        unsigned int ID;                 //Generate an ID for texture binding
-        glGenTextures(1, &ID);           //Texture binding 
-        glBindTexture(GL_TEXTURE_2D, ID);
-
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
+        glGenTextures(1, &texID[0]);           //Texture binding 
+        glBindTexture(GL_TEXTURE_2D, texID[0]);
         
         gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB, 256, 256, GL_RGB, GL_UNSIGNED_BYTE, texture);
-
 }
 
@@ -103 +101 @@
 void CloudEffect::draw() const
 {
-        glPushAttrib(GL_ENABLE_BIT);
+        //glPushAttrib(GL_ENABLE_BIT);
+        //glMatrixMode(GL_MODELVIEW);
+
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+        glPushMatrix();
         glEnable(GL_TEXTURE_2D);
-        glMatrixMode(GL_MODELVIEW);
-        glPushMatrix();
-
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-        glEnable(GL_TEXTURE_2D);
 
         //glLoadIdentity();
+        glBindTexture(GL_TEXTURE_2D, texID[0]);
 
         //glMatrixMode(GL_TEXTURE);        //Let's move the clouds from left to right
@@ -121 +119 @@
         glBegin(GL_QUADS);
                 // Front Face
-                glTexCoord2f(0.0f, 0.0f); glVertex3f(-100.0f, -100.0f,  100.0f);        // Bottom Left Of The Texture and Quad
-                glTexCoord2f(1.0f, 0.0f); glVertex3f( 100.0f, -100.0f,  100.0f);        // Bottom Right Of The Texture and Quad
-                glTexCoord2f(1.0f, 1.0f); glVertex3f( 100.0f,  100.0f,  100.0f);        // Top Right Of The Texture and Quad
-                glTexCoord2f(0.0f, 1.0f); glVertex3f(-100.0f,  100.0f,  100.0f);        // Top Left Of The Texture and Quad
+                glTexCoord2f(0.0f, 0.0f); glVertex3f(20, 20,  60);      // Bottom Left Of The Texture and Quad
+                glTexCoord2f(1.0f, 0.0f); glVertex3f(60, 20,  60);      // Bottom Right Of The Texture and Quad
+                glTexCoord2f(1.0f, 1.0f); glVertex3f(60, 60,  60);      // Top Right Of The Texture and Quad
+                glTexCoord2f(0.0f, 1.0f); glVertex3f(20, 60,  60);      // Top Left Of The Texture and Quad
         glEnd(); 
 
         glPopMatrix();
-        glPopAttrib();
+        //glPopAttrib();
 
 }

branches/atmospheric_engine/src/lib/graphics/effects/cloud_effect.h

@@ -44 +44 @@
                 void overlapOctaves(float  *map32, float  *map256);
                 void expFilter(float  *map);
+                GLuint texID[1];
+
 };