Changeset 10425 in orxonox.OLD for branches/blink/src/world_entities/effects/blink.h

Timestamp:

Jan 28, 2007, 1:08:54 AM (17 years ago)

Author:

stefalie

Message:

blink: 1 bug less

File:

• branches/blink/src/world_entities/effects/blink.h (modified) (3 diffs)

branches/blink/src/world_entities/effects/blink.h

@@ -8 +8 @@
 #include "world_entity.h"
 #include "effects/billboard.h"
+#include "color.h"
 
 class Material;
@@ -26 +27 @@
     void setSize(float s) { this->size = s; this->bBoard->setSize(this->size, this->size); }
     void setOmega(float w) { this->omega = w; }
-    void setColor(float r, float g, float b) { this->color = Vector(r, g, b); }
+    void setColor(float r, float g, float b) { this->color = Color(r/255, g/255, b/255); }
     //void setTexture(const std::string& textureFile);
 
@@ -33 +34 @@
 
   private:
-    Material*         material;
+    //Material*         material;
     Billboard*        bBoard;
     Vector            position;
-    Vector            color;
+    Color             color;
     float             angle;
     float             omega;