Changeset 10433 in orxonox.OLD

Timestamp:

Jan 28, 2007, 12:01:34 PM (17 years ago)

Author:

patrick

Message:

merged blinki into trunk

Location:

trunk/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• effects/billboard.cc (modified) (4 diffs)
• effects/billboard.h (modified) (3 diffs)
• effects/blink.cc (copied) (copied from branches/blink/src/world_entities/effects/blink.cc)
• effects/blink.h (copied) (copied from branches/blink/src/world_entities/effects/blink.h)

trunk/src/world_entities/WorldEntities.am

@@ -98 +98 @@
                 \
                 world_entities/effects/lightning_bolt.cc \
+                world_entities/effects/blink.cc \
                 \
                 world_entities/script_trigger.cc \
@@ -228 +229 @@
                 \
                 effects/lightning_bolt.h \
+                effects/blink.h \
                 \
                 script_trigger.h \

trunk/src/world_entities/effects/billboard.cc

@@ -24 +24 @@
 
 
-
+#include "debug.h"
 
 
@@ -66 +66 @@
   //this->setVisibiliy(true);
   this->setSize(5, 5);
+
+  this->texColor = NULL;
 }
 
@@ -147 +149 @@
 //v += this->getAbsCoor();
     //PRINTF(0)("sizeX: %f sizeY: %f\n", sizeX, sizeY);
+
+  // changes the color of the texture (if any is set)
+  if(this->texColor != NULL)
+    glColor4ub((GLubyte)this->texColor->r()*255, (GLubyte)this->texColor->g()*255, (GLubyte)this->texColor->b()*255, (GLubyte)(this->texColor->a()*255));
+
   glBegin(GL_QUADS);
   glTexCoord2f(0.0f, 0.0f);
@@ -171 +178 @@
   glPopAttrib();
 }
+
+
+/**
+ * changes the texture color
+ * @param col color for the texture
+ */
+void Billboard::colorTexture(const Color col)
+{
+  this->texColor = new Color(col.r(), col.g(), col.b(), col.a());
+}

trunk/src/world_entities/effects/billboard.h

@@ -10 +10 @@
 class Material;
 class TiXmlElement;
+class Color;
 
 class Billboard : public WorldEntity
@@ -23 +24 @@
     void setSize(float sizeX, float sizeY);
     void setTexture(const std::string& textureFile);
+    void colorTexture(const Color col);
 
     virtual void tick(float dt);
@@ -29 +31 @@
   private:
     Material*        material;
+    Color*           texColor;
     float sizeX;
     float sizeY;