Changeset 4396 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

May 30, 2005, 3:27:36 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: now Objects should be affected by the PhysicsEngine too

Location:

orxonox/trunk/src/story_entities

Files:

• world.cc (modified) (4 diffs)
• world.h (modified) (2 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -48 +48 @@
 #include "graphics_engine.h"
 #include "physics_engine.h"
+#include "fields.h"
 
 #include "command_node.h"
@@ -181 +182 @@
   TextEngine::getInstance()->flush();
   delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
+  delete PhysicsEngine::getInstance();
   //delete garbagecollecor
   //delete animator
@@ -473 +475 @@
   emitter->setParent(this->localPlayer);
   emitter->setRelCoor(Vector(-3,0,0));
+
+  Field* gravity = new Gravity();
+  gravity->setMagnitude(1000);
+  //  gravity->setParent(this->localCamera->getTarget());
   
   // Add the Flow from the Emitter into the System
   particleEngine->addConnection(emitter, system);
 
+  new PhysicsConnection(system, gravity);
+    new PhysicsConnection(this->localPlayer, gravity);
+  
 
   WorldEntity* testEntity = new TestEntity();
@@ -1002 +1011 @@
       AnimationPlayer::getInstance()->tick(this->dtS);
 
+      PhysicsEngine::getInstance()->tick(this->dtS);
+
+
       particleEngine->tick(this->dtS);
       this->garbageCollector->tick(this->dtS);

orxonox/trunk/src/story_entities/world.h

@@ -16 +16 @@
 class TrackManager;
 class Camera;
+class Player;
 class PNode;
 class GLMenuImageScreen;
@@ -123 +124 @@
   GLuint objectList;                  //!< temporary: \todo this will be ereased soon
   tList<WorldEntity>* entities;       //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
-  WorldEntity* localPlayer;           //!< The Player, you fly through the level.
+  Player* localPlayer;                //!< The Player, you fly through the level.
   PilotNode* pilotNode;               //!< THe pilot node to fly with the mouse