Changeset 4397 in orxonox.OLD

Timestamp:

May 30, 2005, 4:57:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ok… forces now apply to the right objects, but i don't really like the way it works…. we will see….

Location:

orxonox/trunk/src

Files:

• lib/graphics/particles/particle_system.cc (modified) (1 diff)
• lib/physics/physics_interface.cc (modified) (2 diffs)
• lib/physics/physics_interface.h (modified) (3 diffs)
• story_entities/world.cc (modified) (4 diffs)
• world_entities/player.cc (modified) (4 diffs)
• world_entities/test_entity.cc (modified) (1 diff)
• world_entities/test_entity.h (modified) (2 diffs)

orxonox/trunk/src/lib/graphics/particles/particle_system.cc

@@ -40 +40 @@
    \todo this constructor is not jet implemented - do it
 */
-ParticleSystem::ParticleSystem (unsigned int maxCount, PARTICLE_TYPE type)
+ParticleSystem::ParticleSystem (unsigned int maxCount, PARTICLE_TYPE type) : PhysicsInterface(this)
 {
   this->setClassID(CL_PARTICLE_SYSTEM, "ParticleSystem");

orxonox/trunk/src/lib/physics/physics_interface.cc

@@ -36 +36 @@
    \brief standard constructor
 */
-PhysicsInterface::PhysicsInterface () 
+PhysicsInterface::PhysicsInterface (void* objectPointer) 
 {
+  this->objectPointer = objectPointer;
+
   //   this->setClassName ("PhysicsInterface");
    this->mass = 1;
@@ -90 +92 @@
 void PhysicsInterface::applyField(Field* field)
 {
-  this->forceSum += field->calcForce(dynamic_cast<PNode*>(this)->getAbsCoor());
+  PNode* tmp = (PNode*) objectPointer;
+  this->forceSum += field->calcForce(tmp->getAbsCoor());  
 }
 
 void PhysicsInterface::tickPhys( float dt )
 {
-  Vector acc = this->forceSum / ( this->massChildren + this->mass );
-  PNode* coorTick =  (PNode*) this;
-  coorTick->setRelCoor(coorTick->getRelCoor() + (this->forceSum / this->mass * dt));
-
+  //  Vector acc = this->forceSum / ( this->massChildren + this->mass );
+  PNode* coorTick =  (PNode*)(this->objectPointer);
+  if (coorTick)
+    coorTick->setRelCoor(coorTick->getRelCoor() + this->forceSum/this->mass * dt);
   this->forceSum = Vector(0,0,0);
   // todo: introduce kinematics

orxonox/trunk/src/lib/physics/physics_interface.h

@@ -9 +9 @@
 #include "vector.h"
 #include "base_object.h"
+
+#ifndef NULL
+#define NULL 0
+#endif
 
 // Forward Declaration
@@ -26 +30 @@
 
  public:
-  PhysicsInterface();
+  PhysicsInterface(void* objectPointer);
   virtual ~PhysicsInterface();
   /** \param mass the mass to set for this node. */
@@ -43 +47 @@
   
  private:
+  void* objectPointer;
   float mass;                   //!< Mass of this object
   float massChildren;           //!< Sum of the masses of the children nodes

orxonox/trunk/src/story_entities/world.cc

@@ -477 +477 @@
 
   Field* gravity = new Gravity();
-  gravity->setMagnitude(1000);
+  gravity->setMagnitude(10.0);
   //  gravity->setParent(this->localCamera->getTarget());
   
@@ -484 +484 @@
 
   new PhysicsConnection(system, gravity);
-    new PhysicsConnection(this->localPlayer, gravity);
-  
-
-  WorldEntity* testEntity = new TestEntity();
-  //testEntity->setRelCoor(Vector(570, 10, -15));
-  testEntity->setRelCoor(Vector(25, -10, -20));
+  //    new PhysicsConnection(this->localPlayer, gravity);
+  
+
+  TestEntity* testEntity = new TestEntity();
+  testEntity->setRelCoor(Vector(570, 10, -15));
+  //testEntity->setRelCoor(Vector(25, -10, -20));
   testEntity->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
   this->spawn(testEntity);
-  this->localPlayer->addChild(testEntity);
+  //  this->localPlayer->addChild(testEntity);
+
+  new PhysicsConnection(testEntity, gravity);
 }
 
@@ -585 +587 @@
         this->localPlayer->setName ("player");
         this->spawn (this->localPlayer);
+        this->localPlayer->setRelCoor(Vector(5,0,0));
         /*monitor progress*/
         this->glmis->step();
+
+        Field* testField = new Gravity();
+        testField->setMagnitude(10);
+        new PhysicsConnection(this->localPlayer, testField);
 
         // bind camera
@@ -1010 +1017 @@
       this->localCamera->tick(this->dt);
       AnimationPlayer::getInstance()->tick(this->dtS);
-
       PhysicsEngine::getInstance()->tick(this->dtS);
 

orxonox/trunk/src/world_entities/player.cc

@@ -39 +39 @@
    \param isFree if the player is free
 */
-Player::Player() : WorldEntity()
+Player::Player() : WorldEntity(), PhysicsInterface(this)
 {
   /*
@@ -46 +46 @@
      the player.cc for debug also
   */
+  this->setClassName("Player");
   this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
   travelSpeed = 15.0;
@@ -82 +83 @@
    \todo add more parameters to load
 */
-Player::Player(const TiXmlElement* root) : WorldEntity(root)
-{
+Player::Player(const TiXmlElement* root) : WorldEntity(root), PhysicsInterface(this)
+{
+  this->setClassName("Player");
   this->weapons = new tList<Weapon>();
   this->activeWeapon = NULL;
@@ -196 +198 @@
 void Player::tick (float time)
 {
+  printf("%p\n", this);
+  this->getRelCoor().debug();
+  
   /* link tick to weapon */
   //this->activeWeapon->tick(time);

orxonox/trunk/src/world_entities/test_entity.cc

@@ -26 +26 @@
 
 
-TestEntity::TestEntity () : WorldEntity()
+TestEntity::TestEntity () : WorldEntity(), PhysicsInterface(this)
 {  
   this->setClassID(CL_TEST_ENTITY, "TestEntity");

orxonox/trunk/src/world_entities/test_entity.h

@@ -3 +3 @@
 
 #include "world_entity.h"
+#include "physics_interface.h"
 
 class MD2Loader;
@@ -10 +11 @@
 class Material;
 
-class TestEntity : public WorldEntity 
+class TestEntity : public WorldEntity, PhysicsInterface
 {
   friend class World;