Changeset 6785 in orxonox.OLD

Timestamp:

Jan 27, 2006, 10:15:46 AM (18 years ago)

Author:

patrick

Message:

network: lense flare work

Location:

branches/network/src/lib/graphics

Files:

• Makefile.am (modified) (1 diff)
• effects/graphics_effect.cc (modified) (1 diff)
• effects/graphics_effect.h (modified) (1 diff)
• effects/lense_flare.cc (modified) (5 diffs)
• effects/lense_flare.h (modified) (2 diffs)
• graphics_engine.cc (modified) (2 diffs)

branches/network/src/lib/graphics/Makefile.am

@@ -16 +16 @@
                            effects/fog_effect.cc \
                            effects/lense_flare.cc
+
 
 noinst_HEADERS = graphics_engine.h \

branches/network/src/lib/graphics/effects/graphics_effect.cc

@@ -80 +80 @@
 void GraphicsEffect::draw() const
 {}
+
+
+
+/**
+ * ticks the effect if there is any time dependancy
+ */
+void GraphicsEffect::tick(float dt)
+{}

branches/network/src/lib/graphics/effects/graphics_effect.h

@@ -26 +26 @@
 
     virtual void draw() const;
+    virtual void tick(float dt);
 
     inline bool isActivated() const { return this->bActivated; }

branches/network/src/lib/graphics/effects/lense_flare.cc

@@ -41 +41 @@
   if (root != NULL)
     this->loadParams(root);
+
+  this->flareVector = new Vector();
+  this->screenCenter = new Vector();
 }
 
@@ -52 +55 @@
   for( it = flares.begin(); it != flares.end(); it++)
     delete (*it);
+
+  delete this-flareVector;
+  delete this->screenCenter;
 }
 
@@ -104 +110 @@
  * @param textureName the name of the flare texture
  *
- *  1st Flare: Texture of the Sun/Light source itself
- *  2nd Flare: Texture of the
+ *  1st: Texture of the Sun/Light source itself
+ *  2nd: Texture of the fist halo
+ *  3rd: Texture of small burst
+ *  4th: Texture of the second halo
+ *  5th: Texutre of the second burst
+ *  6th: Texture of the third halo
+ *  7th: Texture of the third burst
  */
 void LenseFlare::addFlare(const char* textureName)
@@ -112 +123 @@
   bb->setTexture(textureName);
   this->flares.push_back(bb);
+
+  // the first flare belongs to the light source
+  if( this->flares.size() == 1 && this->lightSource != NULL)
+  {
+    bb->setBindNode(this->lightSource);
+  }
+}
+
+
+
+/**
+ * tick the effect
+ */
+void LenseFlare::tick(float dt)
+{
+
 }
 
@@ -123 +150 @@
     return;
 
-
+  for( it = flares.begin(); it != flares.end(); it++)
+    (*it)->draw();
 }

branches/network/src/lib/graphics/effects/lense_flare.h

@@ -31 +31 @@
 
     virtual void draw() const;
+    virtual void tick(float dt);
 
     void addFlare(const char* textureName);
@@ -44 +45 @@
 
     Vector*                  flareVector;        //!< the axis to draw the flares on
+    Vector*                  screenCenter;       //!< the vector marking the center of the screen
 };
 

branches/network/src/lib/graphics/graphics_engine.cc

@@ -594 +594 @@
 #endif /* NO_TEXT */
 
-
-  }
+  }
+
   Render2D::getInstance()->tick(dt);
+
+  // tick the graphics effects
+  list<GraphicsEffect*>::iterator it;
+  for (it = this->graphicsEffects.begin(); it != this->graphicsEffects.end(); it++)
+    (*it)->tick(dt);
 }
 
@@ -608 +613 @@
   Render2D::getInstance()->draw(E2D_LAYER_ALL);
   Shader::restoreShader();
+
+  //draw the graphics
+  for (it = this->graphicsEffects.begin(); it != this->graphicsEffects.end(); it++)
+    (*it)->draw();
 }