Changeset 1261 for code/branches/network3/src/orxonox/objects

Timestamp:

May 12, 2008, 11:44:01 PM (17 years ago)

Author:

scheusso

Message:

fixed a 'bug' in WE-Model-Spaceship

Location:

code/branches/network3/src/orxonox/objects

Files:

• SpaceShip.cc (modified) (1 diff)
• WorldEntity.cc (modified) (2 diffs)

code/branches/network3/src/orxonox/objects/SpaceShip.cc

@@ -113 +113 @@
     SpaceShip::~SpaceShip()
     {
-        if (this->tt_)
+        if (this->tt_){
             delete this->tt_;
+        }
     }
 

code/branches/network3/src/orxonox/objects/WorldEntity.cc

@@ -75 +75 @@
     WorldEntity::~WorldEntity()
     {
+      // just to make sure we clean out all scene nodes
+      this->getNode()->removeAndDestroyAllChildren();
     }
 
@@ -207 +209 @@
       registerVar( (void*) &(this->getOrientation().z), sizeof(this->getOrientation().z), network::DATA, 0x3);
       // register velocity_
-      registerVar( (void*) &(this->getVelocity().x), sizeof(this->getVelocity().x), network::DATA, 0x3);
-      registerVar( (void*) &(this->getVelocity().y), sizeof(this->getVelocity().y), network::DATA, 0x3);
-      registerVar( (void*) &(this->getVelocity().z), sizeof(this->getVelocity().z), network::DATA, 0x3);
-      // register rotationAxis/rate
-      registerVar( (void*) &(this->getRotationRate()), sizeof(this->getRotationRate()), network::DATA, 0x3);
-      registerVar( (void*) &(this->getRotationAxis().x), sizeof(this->getRotationAxis().x), network::DATA, 0x3);
-      registerVar( (void*) &(this->getRotationAxis().y), sizeof(this->getRotationAxis().y), network::DATA, 0x3);
-      registerVar( (void*) &(this->getRotationAxis().z), sizeof(this->getRotationAxis().z), network::DATA, 0x3);
+//       registerVar( (void*) &(this->getVelocity().x), sizeof(this->getVelocity().x), network::DATA, 0x3);
+//       registerVar( (void*) &(this->getVelocity().y), sizeof(this->getVelocity().y), network::DATA, 0x3);
+//       registerVar( (void*) &(this->getVelocity().z), sizeof(this->getVelocity().z), network::DATA, 0x3);
+//       // register rotationAxis/rate
+//       registerVar( (void*) &(this->getRotationRate()), sizeof(this->getRotationRate()), network::DATA, 0x3);
+//       registerVar( (void*) &(this->getRotationAxis().x), sizeof(this->getRotationAxis().x), network::DATA, 0x3);
+//       registerVar( (void*) &(this->getRotationAxis().y), sizeof(this->getRotationAxis().y), network::DATA, 0x3);
+//       registerVar( (void*) &(this->getRotationAxis().z), sizeof(this->getRotationAxis().z), network::DATA, 0x3);
       // register scale of node
       registerVar( (void*) &(this->getScale().x), sizeof(this->getScale().x), network::DATA, 0x3);