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

Timestamp:

May 27, 2005, 9:16:53 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/physics back to the trunk
merged with command
svn merge -r 3866:HEAD . ../../trunk/
many conflict that i tried to resolv
@patrick: i hope i did not interfere with your stuff :/

Location:

orxonox/trunk/src/story_entities

Files:

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

orxonox/trunk/src/story_entities/world.cc

@@ -45 +45 @@
 #include "particle_engine.h"
 #include "graphics_engine.h"
+#include "physics_engine.h"
 
 #include "command_node.h"
@@ -279 +280 @@
 
   AnimationPlayer::getInstance(); // initializes the animationPlayer
+  PhysicsEngine::getInstance();
 
   this->localCamera = new Camera();
@@ -453 +455 @@
 
 
-
-  ParticleSystem* system = new ParticleSystem(1000, PARTICLE_SPRITE);
-  system->setLifeSpan(.5);
-  system->setConserve(.99);
-  system->setRadius(2, 0, 2, 0);
-
-  ParticleEmitter* emitter = new ParticleEmitter(Vector(-1, 0, 0), M_PI_4, 100, .05);
-  emitter->setParent(this->localPlayer);
-  
-  particleEngine->addConnection(emitter, system);
-
+  /*
+    ParticleSystem* system = new ParticleSystem(1000, PARTICLE_SPRITE);
+    system->setLifeSpan(.5);
+    system->setConserve(.99);
+    system->setRadius(2, 0, 2, 0);
+    
+    ParticleEmitter* emitter = new ParticleEmitter(Vector(-1, 0, 0), M_PI_4, 100, .05);
+    emitter->setParent(this->localPlayer);
+    
+    particleEngine->addConnection(emitter, system);
+  */
   WorldEntity* testEntity = new TestEntity();
   //testEntity->setRelCoor(Vector(570, 10, -15));

orxonox/trunk/src/story_entities/world.h

@@ -37 +37 @@
   static WorldInterface* getInstance();
   void init(World* world);
+  inline World* getCurrentWorld(void) {return this->worldReference;}
   tList<WorldEntity>* getEntityList();
 
@@ -93 +94 @@
   void setPath( const char* name);
 
+  inline Camera* getLocalCamera(void) {return this->localCamera;}
+
  private:
   void constuctorInit(char* name, int worldID);