Changeset 10581 in orxonox.OLD for branches/cleanup/src/world_entities

Timestamp:

Feb 8, 2007, 12:20:20 AM (18 years ago)

Author:

bensch

Message:

changed the animation3D and t_animation to match the new list structure… but i think it breaks workability… they are strange anyways

also removed the track, as it seems quite hacked in.
Here i uncommented everything for later reinjection

Location:

branches/cleanup/src/world_entities

Files:

• camera.cc (modified) (3 diffs)
• npcs/npc.cc (modified) (3 diffs)
• space_ships/space_ship.cc (modified) (3 diffs)
• test_entity.cc (modified) (3 diffs)
• world_entity.cc (modified) (2 diffs)

branches/cleanup/src/world_entities/camera.cc

@@ -102 +102 @@
 
   //add to track
-  if(this->entityTrack)
+/*  if(this->entityTrack)
    {
     this->setParent(this->entityTrack->getTrackNode());
     //this->setRelCoor(0,0,0);
-   }
+   }*/
 }
 
@@ -227 +227 @@
   {
     //PRINTF(0)("tickytackytucky\n");
-    this->entityTrack->tick(dt);
+/*    this->entityTrack->tick(dt);*/
     //this->setAbsCoor(this->entityTrack->getTrackNode()->getAbsCoor());
   } 
@@ -240 +240 @@
 void Camera::draw() const
 {
-  if( this->entityTrack != NULL && this->isDrawTrack())
-    this->entityTrack->drawGraph();
+/*  if( this->entityTrack != NULL && this->isDrawTrack())
+    this->entityTrack->drawGraph();*/
 }
 

branches/cleanup/src/world_entities/npcs/npc.cc

@@ -153 +153 @@
   if( this->entityTrack)
   {
-      this->setParent(this->entityTrack->getTrackNode());
+/*      this->setParent(this->entityTrack->getTrackNode());*/
       this->setRelCoor(0,0,0);
   }
@@ -427 +427 @@
   this->bFire = false;
 
- if(this->entityTrack)
-    this->entityTrack->tick(dt);
+//  if(this->entityTrack)
+//     this->entityTrack->tick(dt);
 
 }
@@ -434 +434 @@
 void NPC::draw() const
 {
- if( this->entityTrack != NULL && this->isDrawTrack())
-  this->entityTrack->drawGraph();
+//  if( this->entityTrack != NULL && this->isDrawTrack())
+//   this->entityTrack->drawGraph();
 
  WorldEntity::draw();

branches/cleanup/src/world_entities/space_ships/space_ship.cc

@@ -494 +494 @@
 void SpaceShip::draw () const
 {
-  if( this->entityTrack != NULL && this->isDrawTrack())
-    this->entityTrack->drawGraph();
+//   if( this->entityTrack != NULL && this->isDrawTrack())
+//     this->entityTrack->drawGraph();
 
   WorldEntity::draw();
@@ -551 +551 @@
 
   // Tracktick
-  if(this->entityTrack)
-    this->entityTrack->tick(time);
+//   if(this->entityTrack)
+//     this->entityTrack->tick(time);
 
 
@@ -868 +868 @@
         this->isTravelDistanceInit = false;
 
-        if(this->entityTrack)
-           this->travelNode->setParent(this->entityTrack->getTrackNode());
+//         if(this->entityTrack)
+//            this->travelNode->setParent(this->entityTrack->getTrackNode());
 
         this->setParent(this->travelNode);

branches/cleanup/src/world_entities/test_entity.cc

@@ -86 +86 @@
 
  //add to track
-  if(this->entityTrack)
-    this->setParent(this->entityTrack->getTrackNode());
+//   if(this->entityTrack)
+//     this->setParent(this->entityTrack->getTrackNode());
 
 }
@@ -138 +138 @@
 
 
-if( this->entityTrack != NULL)
-    this->entityTrack->drawGraph();
+// if( this->entityTrack != NULL)
+//     this->entityTrack->drawGraph();
 
 }
@@ -148 +148 @@
 void TestEntity::tick (float time)
 {
- if(this->entityTrack)
-    this->entityTrack->tick(time);
+//  if(this->entityTrack)
+//     this->entityTrack->tick(time);
 
 

branches/cleanup/src/world_entities/world_entity.cc

@@ -185 +185 @@
 {
   // The problem we have is most likely here. The track should be constructed WITH the XML-Code
-  this->entityTrack = new Track(root);
+/*  this->entityTrack = new Track(root);
   this->setParent(this->entityTrack->getTrackNode());
-  this->entityTrack->getTrackNode()->setParentMode(PNODE_ALL);
+  this->entityTrack->getTrackNode()->setParentMode(PNODE_ALL);*/
   /*LOAD_PARAM_START_CYCLE(root, element);
   {
@@ -200 +200 @@
 void WorldEntity::pauseTrack(bool stop)
 {
-     if(this->entityTrack)
-       this->entityTrack->pauseTrack(stop);
+/*     if(this->entityTrack)
+       this->entityTrack->pauseTrack(stop);*/ 
 }