Changeset 10491 in orxonox.OLD for trunk

Timestamp:

Jan 30, 2007, 1:13:28 AM (18 years ago)

Author:

patrick

Message:

merged blinki branche back to trunk

Location:

trunk/src/world_entities

Files:

• effects/billboard.cc (modified) (1 diff)
• effects/blink.cc (modified) (4 diffs)
• effects/blink.h (modified) (2 diffs)
• mount_point.cc (modified) (1 diff)
• questGUI/quest_gui.cc (modified) (2 diffs)

trunk/src/world_entities/effects/billboard.cc

@@ -154 +154 @@
   // 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));
+    glColor4ub((GLubyte)(this->texColor->r()*255.0f), (GLubyte)(this->texColor->g()*255.0f), (GLubyte)(this->texColor->b()*255.0f), (GLubyte)(this->texColor->a()*255));
 
   glBegin(GL_QUADS);

trunk/src/world_entities/effects/blink.cc

@@ -38 +38 @@
   // calculation of the symbolTime
   this->symbolTime = this->period / this->blinkSequence.length();
+  //PRINTF(0)("\n\n\nperiod: %f\n\n\n", this->period);
 }
 
@@ -80 +81 @@
   this->timer = 0;
   this->seqCounter = 0;
+
+  // ugly hack continued
+  this->setCoor = true;
 }
 
@@ -91 +95 @@
   WorldEntity::loadParams(root);
 
-  LoadParam(root, "position", this, Blink, setPosition);
+  LoadParam(root, "position", this, Blink, PNode::setAbsCoor);
   LoadParam(root, "size", this, Blink, setSize);
   LoadParam(root, "color", this, Blink, setColor);
@@ -105 +109 @@
 void Blink::tick(float dt)
 {
+  // ugly hack continued, set absCoor only once
+  if(this->setCoor) {
+    this->bBoard->setAbsCoor(this->getAbsCoor());
+    this->setCoor = false;
+    this->symbolTime = this->period / this->blinkSequence.length();
+  }
+
   timer += dt;
 

trunk/src/world_entities/effects/blink.h

@@ -36 +36 @@
     void loadParams(const TiXmlElement* root);
 
-    void setPosition(float x, float y, float z) { this->bBoard->setAbsCoor(x, y, z); }
+    //void setAbsCoor(const Vector& absCoor) { this->bBoard->setAbsCoor(absCoor); }
+    //void setAbsCoor(float x, float y, float z) { this->bBoard->setAbsCoor(x, y, z); }
+    //void setPosition(float x, float y, float z) { this->bBoard->setAbsCoor(x, y, z); }
     void setSize(float s) { this->size = s; this->bBoard->setSize(this->size, this->size); }
     void setPeriod(float t) { this->period = t; }
@@ -56 +58 @@
     float             symbolTime;       //! defines how long one symbol of the sequence will be shown in sec
     float             timer;
+    bool              setCoor;          // this is a really ugly hack
 };
 

trunk/src/world_entities/mount_point.cc

@@ -176 +176 @@
       this->_mount->setParent( this);
 
-      this->_mount->toList( (OM_LIST)(this->getOMListNumber()+1));
+      this->_mount->toList((OM_LIST)(this->getOMListNumber()));
     }
     else if( obj->isA( WeaponSlot::staticClassID()))

trunk/src/world_entities/questGUI/quest_gui.cc

@@ -157 +157 @@
       OrxGui::GLGuiImage* placeImage = new OrxGui::GLGuiImage();
       placeImage->setWidgetSize(85, 10);
-      placeImage->loadImageFromFile("maps/schwarz.png");
+      placeImage->loadImageFromFile("textures/gui/gui_quest_black.png");
       placeImage->show();
       labelBox->pack(placeImage);
@@ -191 +191 @@
       OrxGui::GLGuiImage* placeImage = new OrxGui::GLGuiImage();
       placeImage->setWidgetSize(20, 10);
-      placeImage->loadImageFromFile("maps/schwarz.png");
+      placeImage->loadImageFromFile("textures/gui/gui_quest_black.png");
       placeImage->show();
       answerBox->pack(placeImage);