Changeset 10470 in orxonox.OLD for branches

Timestamp:

Jan 29, 2007, 12:41:03 AM (18 years ago)

Author:

stefalie

Message:

blink: blinki moutni works

Location:

branches/blink/src/world_entities

Files:

• effects/blink.cc (modified) (3 diffs)
• effects/blink.h (modified) (1 diff)
• mount_point.cc (modified) (1 diff)

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

@@ -91 +91 @@
   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 +105 @@
 void Blink::tick(float dt)
 {
+  this->bBoard->setAbsCoor(this->getAbsCoor());
+
   timer += dt;
 
@@ -118 +120 @@
 
   this->bBoard->colorTexture(Color(color.r(), color.g(), color.b(), this->blinkStr));
+
+  PRINTF(0)("hithere\n\n\n\n\n\n");
 }
 

branches/blink/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; }

branches/blink/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()))