Changeset 8316 in orxonox.OLD for trunk/src/lib/graphics/effects

Timestamp:

Jun 11, 2006, 1:57:27 PM (19 years ago)

Author:

bensch

Message:

trunk: fixed most -Wall warnings… but there are still many missing :/

Location:

trunk/src/lib/graphics/effects

Files:

• fog_effect.cc (modified) (6 diffs)
• graphics_effect.cc (modified) (1 diff)
• lense_flare.cc (modified) (4 diffs)
• lightening_effect.cc (modified) (9 diffs)
• rain_effect.cc (modified) (6 diffs)
• snow_effect.cc (modified) (7 diffs)
• volfog_effect.cc (modified) (6 diffs)
• weather_effect.cc (modified) (1 diff)

trunk/src/lib/graphics/effects/fog_effect.cc

@@ -72 +72 @@
         this->fogFadeDuration = 0;
         this->localTimer = 0;
-        
+
         this->fogMode = GL_EXP2;
         this->fogDensity = 0.001;
@@ -79 +79 @@
         this->colorVector = Vector(0.7, 0.7, 0.7);
 
+        return true;
 }
 
@@ -87 +88 @@
 
         this->fogActivate = true;
-        
+
         GLfloat fogColor[4] = { colorVector.x, colorVector.y, colorVector.z, 1.0};
         glFogi(GL_FOG_MODE, this->fogMode);
@@ -95 +96 @@
         glFogf(GL_FOG_START, this->fogStart);
         glFogf(GL_FOG_END, this->fogEnd);
-        
+
         glEnable(GL_FOG);
         // glClearColor(0.5, 0.5, 0.5, 1.0);
+        return true;
 }
 
@@ -106 +108 @@
 
         this->fogActivate = false;
-        
+
         glDisable(GL_FOG);
+
+        return true;
 }
 
@@ -122 +126 @@
         if (!this->fogActivate)
                 return;
-                
+
 
         if (this->fogFadeDuration != 0 && this->localTimer < this->fogFadeDuration) {

trunk/src/lib/graphics/effects/graphics_effect.cc

@@ -61 +61 @@
  */
 bool GraphicsEffect::init()
-{}
+{
+  return true;
+}
 
 

trunk/src/lib/graphics/effects/lense_flare.cc

@@ -104 +104 @@
  */
 bool LenseFlare::init()
-{}
+{
+  return true;
+}
 
 
@@ -113 +115 @@
 {
   this->bActivated = true;
+
+  return true;
 }
 
@@ -122 +126 @@
 {
   this->bActivated = false;
+
+  return true;
 }
 
@@ -130 +136 @@
  */
 GLint LenseFlare::stringToFogMode(const std::string& mode)
-{}
+{
+  PRINTF(1)("NOT IMPLEMENTED");
+  return 0;
+}
 
 

trunk/src/lib/graphics/effects/lightening_effect.cc

@@ -36 +36 @@
 {
         this->setClassID(CL_LIGHTENING_EFFECT, "LighteningEffect");
-  
+
         this->init();
 
@@ -54 +54 @@
 {
         WeatherEffect::loadParams(root);
-  
+
   LoadParam(root, "coord", this, LighteningEffect, coord);
   LoadParam(root, "option", this, LighteningEffect, setLighteningOption);
@@ -68 +68 @@
 {
   lighteningActivate = false;
-  
+
   this->time = 0.0;
   this->flashFrequency = 1.4f;
@@ -117 +117 @@
     ResourceManager::getInstance()->unload(this->thunderBuffer);
   this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/thunder.wav", WAV);*/
+
+  return true;
 }
 
@@ -149 +151 @@
   this->time = 0;
   lighteningActivate = true;
+
+  return true;
 }
 
@@ -160 +164 @@
   this->billboard[3]->setVisibiliy(false);
   lighteningActivate = false;
+
+
+  return true;
 }
 
@@ -166 +173 @@
   if(!lighteningActivate)
     return;
-  
+
   this->time += dt;
 
@@ -175 +182 @@
     else
       this->flashLight->setDiffuseColor(100,100,100);
-    
+
     //PRINTF(0)("100*time: %f %i\n", 100*time, (int)(100*time));
 }*/
-  
+
   if( this->time > this->flashFrequency)
   {
     this->billboard[0]->setVisibiliy(true);
     this->time = 0.0f;
-    
+
     this->flashLight = new Light();
     this->flashLight->setAbsCoor(this->billboard[0]->getAbsCoor().x, this->billboard[0]->getAbsCoor().y, this->billboard[0]->getAbsCoor().z);
     this->flashLight->setDiffuseColor(100,100,100);
-    
+
     //this->soundSource.play(this->thunderBuffer);
   }
@@ -195 +202 @@
     this->time = 0.0f;
     this->bNewCoordinate = true;
-    
+
     if(flashLight != NULL)
     {

trunk/src/lib/graphics/effects/rain_effect.cc

@@ -117 +117 @@
         lightMan = LightManager::getInstance();
         this->rainAmbient = lightMan->getAmbientColor();
+
+        return true;
 }
 
@@ -150 +152 @@
 
         this->emitter->setSpread(this->rainWindForce / 50, 0.2);
-        
+
         this->soundSource.loop(this->rainBuffer, this->soundRainVolume);
         if (this->rainWindForce != 0) this->soundSource.loop(this->windBuffer, 0.1f * this->rainWindForce);
 
         lightMan->setAmbientColor(.1,.1,.1);
+
+        return true;
 }
 
@@ -161 +165 @@
 {
         PRINTF(0)("Deactivating RainEffect\n");
-        
+
         this->rainActivate = false;
         this->emitter->setSystem(NULL);
@@ -170 +174 @@
         // Restore Light Ambient
         lightMan->setAmbientColor(this->rainAmbient, this->rainAmbient, this->rainAmbient);
+
+        return true;
 }
 
@@ -176 +182 @@
         if (!this->rainActivate)
                 return;
-                
+
         if (this->rainMove) {
                 this->rainCoord = State::getCameraNode()->getAbsCoor();
@@ -202 +208 @@
                 // this->soundSource.fadein(this->rainBuffer, 10);
         }
-        
+
 }
 

trunk/src/lib/graphics/effects/snow_effect.cc

@@ -79 +79 @@
         LoadParam(root, "size", this, SnowEffect, size);
         LoadParam(root, "coord", this, SnowEffect, coord);
-  
+
         LOAD_PARAM_START_CYCLE(root, element);
         {
@@ -111 +111 @@
         this->snowCoord = Vector(100,450,400);
         this->snowWindForce = 1;
+
+        return true;
 }
 
@@ -143 +145 @@
         if (this->snowWindForce > 1)
                 this->soundSource.loop(this->windBuffer);
+
+        return true;
 }
 
@@ -156 +160 @@
                 ResourceManager::getInstance()->unload(this->windBuffer);
 
+        return true;
 }
 
@@ -171 +176 @@
         /*
         float distance = (State::getCameraNode()->getAbsCoor() - Vector(snowCoord.x, State::getCameraNode()->getAbsCoor().y, snowCoord.z)).len();
-        
+
         if(activated)
         {
@@ -182 +187 @@
         else if(distance > 0.1*snowSize.x || distance > 0.1*snowSize.y)
         this->alpha = 0.4;
-        
+
         SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
         SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);
@@ -197 +202 @@
         else if( distance < 0.1*snowSize.x || distance < 0.1*snowSize.y )
         this->alpha = 0.5;
-        
+
         SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
         SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);

trunk/src/lib/graphics/effects/volfog_effect.cc

@@ -29 +29 @@
 
 //#include <GL/glext.h> //OpenGL Extensions
-//#include <GL/glxext.h> // GLX Extensions 
+//#include <GL/glxext.h> // GLX Extensions
 
 #ifndef GL_EXT_fog_coord
@@ -92 +92 @@
         // Set fog color
         float fogColor[4] = {0.6f,0.58f,0.79f,0.0f};
-        
+
 
         glFogCoordfEXT       = (PFNGLFOGCOORDFEXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoordfEXT");
@@ -132 +132 @@
 {
         PRINTF(0)("Activating VolFogEffect\n");
+
+        return true;
 }
 
@@ -139 +141 @@
 
         glDisable(GL_FOG);
+
+        return true;
 }
 
@@ -160 +164 @@
         //glEnable(GL_BLEND);
         //glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
-        
+
         int i;
         glLoadIdentity();
 
-        
+
         glBegin( GL_LINES );
                 glNormal3f(0,1,0);
@@ -210 +214 @@
 * ticks the effect if there is any time dependancy
 */
-void VolFogEffect::tick(float dt)       
-{
-}
+void VolFogEffect::tick(float dt)
+{
+}

trunk/src/lib/graphics/effects/weather_effect.cc

@@ -56 +56 @@
  */
 bool WeatherEffect::init()
-{}
+{
+  return true;
+}