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

Timestamp:

Jun 20, 2006, 1:24:11 PM (19 years ago)

Author:

bensch

Message:

trunk: merged the gui-branche back.
merged with command:
svn merge -r8520:HEAD ​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

Location:

trunk/src/lib/graphics/effects

Files:

• lense_flare.cc (modified) (1 diff)
• lense_flare.h (modified) (2 diffs)

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

@@ -47 +47 @@
     this->setClassID(CL_LENSE_FLARE, "LenseFlare");
 
-    this->flareMatrix = new float[14];
     /*          length                      image scale */
     this->flareMatrix[0] = 1.0f;

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

@@ -51 +51 @@
     bool                     bVisible;          //!< Checks visibility
     Light*                   lightSource;        //!< reference to the sun (or primary light source)
-    std::vector<ImagePlane*>  flares;             //!< the flares array
+    std::vector<ImagePlane*> flares;             //!< the flares array
 
     Vector2D                 flareVector;        //!< the axis to draw the flares on
@@ -57 +57 @@
     Vector2D                 screenCenter;       //!< the vector marking the center of the screen
 
-    float*                   flareMatrix;
+    float                    flareMatrix[14];
     Plane                    frustumPlane;       //!< plane that marks the view frustum
 };