Changeset 7795 in orxonox.OLD

Timestamp:

May 24, 2006, 12:24:03 PM (18 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine: cloud tardis bugfix

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• cloud_effect.cc (modified) (2 diffs)
• volfog_effect.cc (modified) (1 diff)

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

@@ -20 +20 @@
 #include "glincl.h"
 //#include "graphics_engine.h"
+#include <math.h>
 
 #include "parser/tinyxml/tinyxml.h"
@@ -239 +240 @@
                         for (int y=0; y<256; y++)
                         {
-                                float scale = 1 / pow(2, 3-octave);
+                                float scale = 1 / pow(2.0f, (float) 3-octave);
                                 float noise = CloudEffect::interpolate(x*scale, y*scale , cloudMap32_c);
 
                                 //The octaves are added together with the proper weight factors.
                                 //You could replace pow(2, i) with 1<<i for faster computation
-                                cloudMap256[(y*256) + x] += noise / pow(2, octave);
+                                cloudMap256[(y*256) + x] += noise / pow(2.0f, (float) octave);
                         }
 }

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

@@ -26 +26 @@
 #define GLX_GLXEXT_PROTOTYPES
 #include <GL/glx.h>
-#include <GL/glut.h>
+// #include <GL/glut.h>
 
 //#include <GL/glext.h> //OpenGL Extensions