Changeset 7807 in orxonox.OLD for branches/atmospheric_engine/src/lib/graphics/effects

Timestamp:

May 24, 2006, 3:21:13 PM (19 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine: renamed fake-billboard to imageplane and created new billboard

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• lense_flare.cc (modified) (5 diffs)
• lense_flare.h (modified) (2 diffs)
• lightening_effect.cc (modified) (2 diffs)
• lightening_effect.h (modified) (2 diffs)

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

@@ -28 +28 @@
 #include "state.h"
 
-#include "render2D/billboard.h"
+#include "render2D/image_plane.h"
 
 #include "light.h"
@@ -80 +80 @@
 LenseFlare::~LenseFlare()
 {
-  std::vector<Billboard*>::iterator it;
+  std::vector<ImagePlane*>::iterator it;
   for( it = flares.begin(); it != flares.end(); it++)
     delete (*it);
@@ -155 +155 @@
   }
 
-  Billboard* bb = new Billboard(NULL);
+  ImagePlane* bb = new ImagePlane(NULL);
   bb->setTexture(textureName);
   bb->setSize(50, 50);
   this->flares.push_back(bb);
-  PRINTF(4)("Added a Lenseflare Billboard with texture %s\n", textureName.c_str());
+  PRINTF(4)("Added a Lenseflare ImagePlane with texture %s\n", textureName.c_str());
 
   // the first flare belongs to the light source
@@ -178 +178 @@
   float dist = this->frustumPlane.distancePoint(this->lightSource->getAbsCoor());
   PRINTF(0)("dist: %f\n", dist);
-  std::vector<Billboard*>::const_iterator it;
+  std::vector<ImagePlane*>::const_iterator it;
     for(it = flares.begin(); it != flares.end(); it++)
       (*it)->setVisibility(visibility);
@@ -220 +220 @@
 
   // now calculate the new coordinates of the billboards
-  std::vector<Billboard*>::iterator it;
+  std::vector<ImagePlane*>::iterator it;
   int i;
   for( it = flares.begin(), i = 0; it != flares.end(); it++, i++)

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

@@ -20 +20 @@
 class TiXmlElement;
 class Light;
-class Billboard;
+class ImagePlane;
 
 //! A class that handles LenseFlares. The LenseFlareManager operates on this.
@@ -50 +50 @@
     float                    isVisible;          //!< Checks visibility
     Light*                   lightSource;        //!< reference to the sun (or primary light source)
-    std::vector<Billboard*>  flares;             //!< the flares array
+    std::vector<ImagePlane*>  flares;             //!< the flares array
 
     Vector2D                 flareVector;        //!< the axis to draw the flares on

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

@@ -15 +15 @@
 #include "lightening_effect.h"
 
+#include "state.h"
 #include "util/loading/load_param.h"
 #include "util/loading/factory.h"
-#include "render2D/billboard.h"
+#include "render2D/image_plane.h"
 
 #include "glincl.h"
@@ -31 +32 @@
   
   
-  lightening = new Billboard(NULL);
-  lightening->setTexture("pictures/lense_flare/lens2.png");
+  lightening = new ImagePlane(NULL);
+  lightening->setTexture("maps/lightning_bolt.png");
   lightening->setSize(50, 50);
-  lightening->setAbsCoor2D(0,0);
+  lightening->setAbsCoor2D(10,10);
   lightening->setVisibility(true);
+  
   
         this->init();

branches/atmospheric_engine/src/lib/graphics/effects/lightening_effect.h

@@ -15 +15 @@
 
 
-class Billboard;
+class ImagePlane;
 
 class LighteningEffect : public WeatherEffect
@@ -33 +33 @@
 
         private:
-    Billboard* lightening;
+    ImagePlane* lightening;
 
 };