Changeset 2497 for code/branches/presentation/src/orxonox/objects/worldentities

Timestamp:

Dec 17, 2008, 5:41:29 AM (16 years ago)

Author:

landauf

Message:

• some changes, maybe fixed a crash, not sure
• fixed strange camera behavior

Location:

code/branches/presentation/src/orxonox/objects/worldentities

Files:

• Camera.cc (modified) (1 diff)
• ParticleEmitter.cc (modified) (2 diffs)
• WorldEntity.cc (modified) (1 diff)

code/branches/presentation/src/orxonox/objects/worldentities/Camera.cc

@@ -112 +112 @@
             this->cameraNode_->translate(coeff * offset);
 
-            this->cameraNode_->setOrientation(Quaternion::Slerp(coeff, this->cameraNode_->getWorldOrientation(), this->getWorldOrientation(), false));
+            this->cameraNode_->setOrientation(Quaternion::Slerp(coeff, this->cameraNode_->getWorldOrientation(), this->getWorldOrientation(), true));
             //this->cameraNode_->setOrientation(this->getWorldOrientation());
         }

code/branches/presentation/src/orxonox/objects/worldentities/ParticleEmitter.cc

@@ -102 +102 @@
     {
         if (this->particles_)
+        {
             delete this->particles_;
+            this->particles_ = 0;
+        }
 
         if (this->getScene() && this->getScene()->getSceneManager())
@@ -119 +122 @@
             }
         }
-        else
-            this->particles_ = 0;
     }
 

code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -104 +104 @@
             this->node_->removeAllChildren();
 
+            if (this->physicalBody_)
+            {
+                this->deactivatePhysics();
+                delete this->physicalBody_;
+            }
+            delete this->collisionShape_;
+
             if (this->getScene()->getSceneManager())
                 this->getScene()->getSceneManager()->destroySceneNode(this->node_->getName());
-
-            // TODO: Detach from parent and detach all children.
-
-            if (this->physicalBody_)
-            {
-                this->deactivatePhysics();
-                delete this->physicalBody_;
-            }
-            delete this->collisionShape_;
         }
     }