Changeset 10253 in orxonox.OLD

Timestamp:

Jan 17, 2007, 1:51:22 PM (17 years ago)

Author:

stefalie

Message:

 

Location:

branches/blink/src/world_entities/effects

Files:

• blink.cc (modified) (4 diffs)
• blink.h (modified) (2 diffs)

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

@@ -18 +18 @@
 #include "util/loading/factory.h"
 #include "debug.h"
-
+#include "state.h"
 
 #include "material.h"
@@ -68 +68 @@
  // this->material->setSpecular(0.0,0.0,0.0);
  // this->material->setAmbient(1.0, 1.0, 1.0);
-  this->material->setBlendFunc(GL_ZERO,GL_ZERO);
-  this->material->setDiffuseMap("maps/acid3.png");
+  //this->material->setBlendFunc(GL_ZERO,GL_ZERO);
+  //this->material->setDiffuseMap("pictures/rblink2.png");
+  this->material->setDiffuseMap("maps/star.bmp");
   //this->setAbsCoor(0, 0, 0);d
   //this->setVisibiliy(true);
   // this->setSize(5, 5);
+
+  this->setAbsCoor(0, 0, 0); 
+  this->position = Vector(0, 0, 0); ///remove 
+  this->size = 10;
 }
 
@@ -82 +87 @@
 void Blink::loadParams(const TiXmlElement* root)
 {
+  WorldEntity::loadParams(root);
+
+  LoadParam(root, "position", this, Blink, setPosition);
+  LoadParam(root, "size", this, Blink, setSize);
+//   LoadParam(root, "watersize", this, Blink, setWaterSize);
+//   LoadParam(root, "wateruv", this, Blink, setWaterUV);
+//   LoadParam(root, "waterflow", this, Blink, setWaterFlow);
+//   LoadParam(root, "lightpos", this, Blink, setLightPos);
+//   LoadParam(root, "waterangle", this, Blink, setWaterAngle);
+//   LoadParam(root, "normalmapscale", this, Blink, setNormalMapScale);
+//   LoadParam(root, "shinesize", this, Blink, setShineSize);
+//   LoadParam(root, "shinestrength", this, Blink, setShineStrength);
+//   LoadParam(root, "reflstrength", this, Blink, setReflStrength);
+//   LoadParam(root, "refraction", this, Blink, setRefraction);
+//   LoadParam(root, "watercolor", this, Blink, setWaterColor);
   /*LoadParam(root, "texture", this->material, Material, setDiffuseMap)
       .describe("the texture-file to load onto the Blink");
@@ -107 +127 @@
   glDisable(GL_LIGHTING);
   glDisable(GL_FOG);
+  glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
+
+//   Vector pos = this->getAbsCoor();
+//   Vector dir = pos - State::getCameraNode()->getAbsCoor();
+//   dir.normalize();
+// 
+//   Vector up = Vector(0, 1, 0);
+//   Vector h = dir.cross(up);
+// 
+//   Vector pos = this->getAbsCoor();
+//   glTranslatef(pos.x, pos.y, pos.z);
+
+    /* translate */
+//     glTranslatef (this->getAbsCoor ().x,
+//                   this->getAbsCoor ().y,
+//                   this->getAbsCoor ().z);
+//     Vector tmpRot = this->getAbsDir().getSpacialAxis();
+//     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);
+
+  //glTranslatef(position.x + size/2, position.y + size/2, position.z);
+
+  glTranslatef(this->position.x - this->size/2, this->position.y - this->size/2, this->position.z);
+
+//   Vector view = this->getAbsCoor() - State::getCameraNode()->getAbsCoor();
+//   view.normalize();
+// 
+//   Vector up = Vector(0, 1, 0);
+//   Vector h = view.cross(up);
 
   this->material->select();
 
+
+  glColor4ub(255, 0, 0, 255);
   glBegin(GL_QUADS);
     glTexCoord2f(1, 1); glVertex3f(0, 0, 0);
-    glTexCoord2f(1, 0); glVertex3f(1000, 0, 0);
-    glTexCoord2f(0, 0); glVertex3f(1000, 1000, 0);
-    glTexCoord2f(0, 1); glVertex3f(0, 1000, 0);
+    glTexCoord2f(1, 0); glVertex3f(this->size, 0, 0);
+    glTexCoord2f(0, 0); glVertex3f(this->size, this->size, 0);
+    glTexCoord2f(0, 1); glVertex3f(0, this->size, 0);
   glEnd();
 

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

@@ -21 +21 @@
     void loadParams(const TiXmlElement* root);
 
-    //void setSize(float sizeX, float sizeY);
+    void setPosition(float x, float y, float z) { this->position = Vector(x, y, z); }
+    void setSize(float s) { this->size = s; }
     //void setTexture(const std::string& textureFile);
 
@@ -28 +29 @@
 
   private:
-    Material*        material;
+    Material*         material;
+    Vector            position;
+    float             size;             //! only one float caus' its quadratical
 };