Changeset 5382 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Oct 15, 2005, 8:22:30 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed a reparenting bug
made the naming more compliant

Location:

trunk/src/world_entities

Files:

• camera.cc (modified) (6 diffs)
• weapons/test_gun.cc (modified) (1 diff)

trunk/src/world_entities/camera.cc

@@ -120 +120 @@
     case VIEW_NORMAL:
       this->toFovy = 60.0;
-      this->softReparent("TrackNode");
-      this->target->softReparent("TrackNode");
+      this->setParentSoft("TrackNode");
+      this->target->setParentSoft("TrackNode");
       this->setRelCoorSoft(-10, 5, 0);
       this->target->setRelCoorSoft(0,0,0);
@@ -131 +131 @@
 
       if (!strcmp(this->target->getParent()->getName(), "Player"))
-        this->target->softReparent("TrackNode");
+        this->target->setParentSoft("TrackNode");
       else
-        this->target->softReparent("Player");
+        this->target->setParentSoft("Player");
       this->getParent()->debug(0);
 
 //      this->setParent("main-Turret");
 //      this->setParentMode(PNODE_ALL);
-//      this->target->softReparent("Player");
+//      this->target->setParentSoft("Player");
 
       break;
     case VIEW_FRONT:
       this->toFovy = 120.0;
-       this->softReparent("Player");
-       this->target->softReparent("Player");
+       this->setParentSoft("Player");
+       this->target->setParentSoft("Player");
        this->setRelCoorSoft(4, 0, 0, 5);
        this->target->setRelCoorSoft(Vector(10,0,0), 5);
@@ -151 +151 @@
     case VIEW_LEFT:
       this->toFovy = 90;
-      this->softReparent("TrackNode");
-      this->target->softReparent("TrackNode");
+      this->setParentSoft("TrackNode");
+      this->target->setParentSoft("TrackNode");
       this->setRelCoorSoft(0, 1, -10, .5);
       this->target->setRelCoorSoft(0,0,0);
@@ -158 +158 @@
     case VIEW_RIGHT:
       this->toFovy = 90;
-      this->softReparent("TrackNode");
-      this->target->softReparent("TrackNode");
+      this->setParentSoft("TrackNode");
+      this->target->setParentSoft("TrackNode");
       this->setRelCoorSoft(Vector(0, 1, 10));
       this->target->setRelCoorSoft(0,0,0);
@@ -165 +165 @@
     case VIEW_TOP:
       this->toFovy= 120;
-      this->softReparent("TrackNode");
-      this->target->softReparent("TrackNode");
+      this->setParentSoft("TrackNode");
+      this->target->setParentSoft("TrackNode");
       this->setRelCoorSoft(Vector(0, 10, 0));
       this->target->setRelCoorSoft(0,0,0);
@@ -215 +215 @@
   // switching back to Modeling Matrix
   glMatrixMode (GL_MODELVIEW);
-//  this->target->getParent()->getParent()->debugDraw(0, 2, Vector(1,0,0));
+  this->target->getParent()->getParent()->debugDraw(0, 2, Vector(1,0,0));
 }
 

trunk/src/world_entities/weapons/test_gun.cc

@@ -62 +62 @@
   Animation3D* animation3 = this->getAnimation(WS_DEACTIVATING, this);
   //parent->addChild(this->objectComponent1, PNODE_ALL);
-  this->addChild(this->objectComponent1, PNODE_ALL);
+  this->addChild(this->objectComponent1);
 
   animation1->setInfinity(ANIM_INF_CONSTANT);