Changeset 10325 in orxonox.OLD

Timestamp:

Jan 24, 2007, 11:30:09 AM (18 years ago)

Author:

stefalie

Message:

 

Location:

branches/blink/src/world_entities/effects

Files:

• blink.cc (modified) (7 diffs)
• blink.h (modified) (3 diffs)

branches/blink/src/world_entities/effects/blink.cc

@@ -19 +19 @@
 #include "debug.h"
 #include "state.h"
+
 
 #include "material.h"
@@ -70 +71 @@
   //this->material->setBlendFunc(GL_ZERO,GL_ZERO);
   //this->material->setDiffuseMap("pictures/rblink2.png");
-  this->material->setDiffuseMap("maps/star.bmp");
+  this->material->setDiffuseMap("maps/star_alpha.png");
   //this->setAbsCoor(0, 0, 0);d
   //this->setVisibiliy(true);
   // this->setSize(5, 5);
 
+  //srand((unsigned)time(NULL));
+
+
+  /// Standard values
   this->setAbsCoor(0, 0, 0); 
-  this->position = Vector(0, 0, 0); ///remove 
+  this->position = Vector(0, 0, 0); ///remove
+  this->color = Vector(255, 255, 255);
   this->size = 10;
+  this->omega = 10;
+  this->angle = rand() % 1000;
+  PRINTF(0)("\n\n\n\n\n\n\nangle: %f\n\n\n\n\n\n\n\n", this->angle);
+  this->angle *= 2 * M_PI;
+  PRINTF(0)("\n\n\n\n\n\n\nangle: %f\n\n\n\n\n\n\n\n", this->angle);
 }
 
@@ -91 +102 @@
   LoadParam(root, "position", this, Blink, setPosition);
   LoadParam(root, "size", this, Blink, setSize);
+  LoadParam(root, "color", this, Blink, setColor);
+  LoadParam(root, "omega", this, Blink, setOmega);
 //   LoadParam(root, "watersize", this, Blink, setWaterSize);
 //   LoadParam(root, "wateruv", this, Blink, setWaterUV);
@@ -116 +129 @@
 void Blink::tick(float dt)
 {
+  this->angle += dt * this->omega;
+
+  if (this->angle > 2 * M_PI)
+    this->angle -= 2 * M_PI;
+
+  this->blinkStr = sinf(angle);
 }
 
@@ -125 +144 @@
 {
   glPushAttrib(GL_ENABLE_BIT);
-  glDisable(GL_LIGHTING);
+  glEnable(GL_LIGHTING); //glDisable(GL_LIGHTING);
   glDisable(GL_FOG);
   glMatrixMode(GL_MODELVIEW);
@@ -147 +166 @@
 //     glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-  glBlendFunc(GL_SRC_ALPHA,GL_ONE); // Set The Blending Function For Translucency
-  glEnable(GL_BLEND);
-  glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+//   glBlendFunc(GL_SRC_ALPHA,GL_ONE); // Set The Blending Function For Translucency
+//   glEnable(GL_BLEND);
+//   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+//   glShadeModel(GL_SMOOTH);
+
+
+  Vector camCoor = State::getCameraNode()->getAbsCoor();
+  Vector diff = camCoor - this->position;
 
   //glTranslatef(position.x + size/2, position.y + size/2, position.z);
@@ -164 +188 @@
 
 
-  glColor4ub(255, 0, 0, 255);
+  glColor4ub(this->color.x, this->color.y, this->color.z, 127.5*(this->blinkStr + 1));
   glBegin(GL_QUADS);
     glTexCoord2f(1, 1); glVertex3f(0, 0, 0);

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

@@ -7 +7 @@
 
 #include "world_entity.h"
+#include "color.h"
 
 class Material;
@@ -23 +24 @@
     void setPosition(float x, float y, float z) { this->position = Vector(x, y, z); }
     void setSize(float s) { this->size = s; }
+    void setOmega(float w) { this->omega = w; }
+    void setColor(float r, float g, float b) { this->color = Vector(r, g, b); }
     //void setTexture(const std::string& textureFile);
 
@@ -31 +34 @@
     Material*         material;
     Vector            position;
+    Vector            color;
+    float             angle;
+    float             omega;
+    float             blinkStr;
     float             size;             //! only one float caus' its quadratical
 };