Changeset 3308 in orxonox.OLD

Timestamp:

Dec 30, 2004, 1:18:58 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/parenting: fixed a bug that prevented the program from changing to a new level (SEGFAULT), NOT yet following track

Location:

orxonox/branches/parenting/src

Files:

• null_parent.h (modified) (1 diff)
• world.cc (modified) (3 diffs)

orxonox/branches/parenting/src/null_parent.h

@@ -9 +9 @@
 
 #include "stdincl.h"
-#include "world_entity.h"
+#include "p_node.h"
 
 
-class NullParent : public WorldEntity {
+class NullParent : public PNode {
 
  public:

orxonox/branches/parenting/src/world.cc

@@ -169 +169 @@
             this->localPlayer->addChild (this->localCamera);
             
-            /*
-            Placement* plc = new Placement;
-            plc->r = Vector(100, 10, 10);
-            plc->w = Quaternion();
+
+            Vector* es = new Vector (20, 0, 10);
+            Quaternion* qs = new Quaternion ();
             WorldEntity* env = new Environment();
-            this->spawn(env, plc);
-            */
+            this->spawn(env, es, qs);
+
 
             break;
@@ -202 +201 @@
             // create a player
             WorldEntity* myPlayer = new Player();
+            myPlayer->setName ("player");
             this->spawn(myPlayer);
             this->localPlayer = myPlayer;           
@@ -210 +210 @@
             
             // bind camera
-            this->localCamera = new Camera(this);
+            this->localCamera = new Camera (this);
+            this->localCamera->setName ("camera");
             this->getCamera()->bind (myPlayer); 
+            this->localPlayer->addChild (this->localCamera);
             break;
           }