Changeset 7976 in orxonox.OLD

Timestamp:

May 30, 2006, 1:21:55 PM (18 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• cloud_effect.cc (modified) (3 diffs)
• rain_effect.cc (modified) (1 diff)

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

@@ -63 +63 @@
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
+        glGenTextures(2, &texID[0]);
 
         // Generate noise map a
@@ -101 +103 @@
                 }
 
-        glGenTextures(2, &texID[0]);
         glBindTexture(GL_TEXTURE_2D, texID[0]);
+
+        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 256, 256, GL_RGB, GL_UNSIGNED_BYTE, cloudTexture);
         gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB, 256, 256, GL_RGB, GL_UNSIGNED_BYTE, cloudTexture);
+
 }
 
@@ -145 +149 @@
                 //map32anim = (map32a * (10 - timer)) + (map32b * timer);
                 CloudEffect::calcAnimMap(timer);
-
-                CloudEffect::overlapOctaves();
-                CloudEffect::expFilter();
+                //CloudEffect::overlapOctaves();
+                //CloudEffect::expFilter();
                 CloudEffect::genCloudTexture();
 

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

@@ -34 +34 @@
 
 CREATE_FACTORY(RainEffect, CL_RAIN_EFFECT);
+
+// TODO: Dim Light with Rain, Finish preCaching, check out if multiple rain emitters work
 
 RainEffect::RainEffect(const TiXmlElement* root)