Changeset 10157 in orxonox.OLD

Timestamp:

Jan 1, 2007, 10:12:43 PM (17 years ago)

Author:

marcscha

Message:

replacement of wobble upgrade function through function pointer approach

Location:

branches/playability/src/world_entities/effects

Files:

• wobblegrid.cc (modified) (3 diffs)
• wobblegrid.h (modified) (1 diff)

branches/playability/src/world_entities/effects/wobblegrid.cc

@@ -91 +91 @@
   this->angularSpeed = M_PI; //180;
   this->setModel(this->grid);
+
+  this->setUpdateFunction((*sinf));
 }
 
@@ -139 +141 @@
 
       Vector2D& vec = this->grid->texCoord(z*this->subdivision + x);
-      vec.y  = (x * fac + sgn(x-2)*sinf(angle)*fac/2.0);
-      vec.x  = (z * fac + sgn(z-2)*sinf(angle)*fac/2.0);
+      vec.y  = (x * fac + sgn(x-2)*updateWobble(angle)*fac/2.0);
+      vec.x  = (z * fac + sgn(z-2)*updateWobble(angle)*fac/2.0);
     }
   }
   //this->grid->finalize();
-
-  Vector view = this->getAbsCoor() - State::getCameraNode()->getAbsCoor();
-  view.normalize();
-
-  Vector up = Vector(0, 1, 0);
-  Vector h = up.cross(view);
-  up = h.cross(view);
-
-  Quaternion dir = Quaternion::lookAt( this->getAbsCoor(), this->getAbsCoor() + up, view);
-  this->setAbsDir(dir);
-
+  this->orient();
 }
 
@@ -200 +192 @@
   glPopAttrib();
 }
+
+void Wobblegrid::orient()
+{
+
+  Vector view = this->getAbsCoor() - State::getCameraNode()->getAbsCoor();
+  view.normalize();
+
+  Vector up = Vector(0, 1, 0);
+  Vector h = up.cross(view);
+  up = h.cross(view);
+
+  Quaternion dir = Quaternion::lookAt( this->getAbsCoor(), this->getAbsCoor() + up, view);
+  this->setAbsDir(dir);
+}

branches/playability/src/world_entities/effects/wobblegrid.h

@@ -29 +29 @@
     virtual void draw() const;
 
+    inline void setUpdateFunction(float (*updateFct)(float value)) { if( updateFct)  this->updateWobble = updateFct;};
+
   private:
+    float (*updateWobble)(float value);
+
+    void orient();
+
     Material*        material;
     Grid*            grid;      //!< current projected positions transformed into billboard state