Changeset 7048 in orxonox.OLD

Timestamp:

Feb 6, 2006, 1:46:54 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: modelEntity should now also be able to load momentum and movement

Location:

trunk/src/world_entities/environments

Files:

• model_entity.cc (modified) (2 diffs)
• model_entity.h (modified) (1 diff)

trunk/src/world_entities/environments/model_entity.cc

@@ -34 +34 @@
   this->toList(OM_ENVIRON_NOTICK);
 
+  this->speed = NULL;
+  this->momentum = NULL;
+
   if (root != NULL)
     this->loadParams(root);
@@ -44 +47 @@
 ModelEntity::~ModelEntity()
 {
+  if (this->speed != NULL)
+    delete this->speed;
+  if (this->momentum)
+    delete this->momentum;
+}
+
+void ModelEntity::loadParams(const TiXmlElement* root)
+{
+  WorldEntity::loadParams(root);
+
+  LoadParam(root, "speed", this, ModelEntity, setSpeed);
+  LoadParam(root, "momentum", this, ModelEntity, setMomentum);
 }
 
 
+void ModelEntity::setSpeed(float x, float y, float z)
+{
+  if (this->speed == NULL)
+    this->speed = new Vector;
+  *this->speed = Vector(x,y,z);
+}
+
+void ModelEntity::setMomentum (float angle, float x, float y, float z)
+{
+  if (this->momentum == NULL)
+    this->momentum = new Quaternion;
+  *this->momentum = Quaternion(angle, Vector(x, y, z));
+}
+
+void ModelEntity::tick(float dt)
+{
+  if (this->speed != NULL)
+    this->shiftCoor(*this->speed * dt);
+
+  if (this->momentum != NULL)
+    this->shiftDir(*this->momentum * dt);
+}

trunk/src/world_entities/environments/model_entity.h

@@ -20 +20 @@
   virtual ~ModelEntity();
 
+  virtual void loadParams(const TiXmlElement* root);
+
+  void setSpeed(float x, float y, float z);
+  void setMomentum (float angle, float x, float y, float z);
+
+  virtual void tick(float dt);
+
+  private:
+    Vector*           speed;
+    Quaternion*       momentum;
 };