Changeset 6786 in orxonox.OLD

Timestamp:

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

Author:

patrick

Message:

network: compiles again

Location:

branches/network/src

Files:

• lib/graphics/effects/lense_flare.cc (modified) (5 diffs)
• lib/graphics/effects/lense_flare.h (modified) (2 diffs)
• lib/graphics/graphics_engine.cc (modified) (1 diff)
• world_entities/power_ups/power_up.cc (modified) (1 diff)

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

@@ -25 +25 @@
 #include "texture.h"
 
+#include "light.h"
+
 #include "render2D/billboard.h"
 
@@ -41 +43 @@
   if (root != NULL)
     this->loadParams(root);
-
-  this->flareVector = new Vector();
-  this->screenCenter = new Vector();
 }
 
@@ -55 +54 @@
   for( it = flares.begin(); it != flares.end(); it++)
     delete (*it);
-
-  delete this-flareVector;
-  delete this->screenCenter;
 }
 
@@ -127 +123 @@
   if( this->flares.size() == 1 && this->lightSource != NULL)
   {
-    bb->setBindNode(this->lightSource);
+    bb->setBindNode(static_cast<PNode*>(this->lightSource));
   }
 }
@@ -150 +146 @@
     return;
 
+  std::vector<Billboard*>::const_iterator it;
   for( it = flares.begin(); it != flares.end(); it++)
     (*it)->draw();

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

@@ -11 +11 @@
 #include <vector>
 
+#include "vector.h"
 
 class TiXmlElement;
@@ -44 +45 @@
     std::vector<Billboard*>  flares;             //!< the flares array
 
-    Vector*                  flareVector;        //!< the axis to draw the flares on
-    Vector*                  screenCenter;       //!< the vector marking the center of the screen
+    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

@@ -615 +615 @@
 
   //draw the graphics
+  list<GraphicsEffect*>::const_iterator it;
   for (it = this->graphicsEffects.begin(); it != this->graphicsEffects.end(); it++)
     (*it)->draw();

branches/network/src/world_entities/power_ups/power_up.cc

@@ -20 +20 @@
 #include "extendable.h"
 #include "primitive_model.h"
+
+#include "assert.h"
 
 using namespace std;