Changeset 10250 in orxonox.OLD

Timestamp:

Jan 17, 2007, 1:24:48 PM (17 years ago)

Author:

snellen

Message:

ping

Location:

branches/heathaze/src/lib/graphics/effects

Files:

• heat_haze_manager.cc (modified) (3 diffs)
• heat_haze_manager.h (modified) (1 diff)

branches/heathaze/src/lib/graphics/effects/heat_haze_manager.cc

@@ -29 +29 @@
 {
   this->registerObject(this, HeatHazeManager::_objectList);
+  this->init();
 }
 
@@ -49 +50 @@
 
   this->heatShader.activateShader();
-  ParticlesShot = new Shader::Uniform(heatShader, "ParticlesShot");
-  FinalRender = new Shader::Uniform(heatShader, "FinalRender");
+  Shader::Uniform(heatShader, "ParticlesShot").set(0);
+  Shader::Uniform(heatShader, "FinalRender").set(1);
   parameters = new Shader::Uniform(heatShader, "parameters");
+  //parameters->set(1.0f/offScreenWidth, 1.0f/offScreenHeight, scale, scale);
   this->heatShader.deactivateShader();
 
@@ -62 +64 @@
 void HeatHazeManager::acquireMask()
 {
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
  for (ObjectList<HeatParticles>::const_iterator it = HeatParticles::objectList().begin();
        it != HeatParticles::objectList().end();
        ++it)
      {
-     //TODO: Let all the HeatParticles draw the particles in a temporary buffer
+     //TODO: Let all the HeatParticles draw the particles in a temporary buffer (texture unit 1)
      }
 
+ // TODO: Copy the current framebuffer into a texture (particleMask)
+ //particleMask.
 }
 

branches/heathaze/src/lib/graphics/effects/heat_haze_manager.h

@@ -30 +30 @@
 
  private:
-  Texture  frameBuffer;
+  Texture  particleMask;
 
   Shader   heatShader;
 
 // uniforms
-  Shader::Uniform*  ParticlesShot;      //!< uniform that is used for the camera position
-  Shader::Uniform*  FinalRender;        //!< uniform that is used for the camera position
-  Shader::Uniform*  parameters;         //!< uniform that is used for the camera position
+  Shader::Uniform*  parameters;
 
 };