Changeset 6167

Timestamp:

Nov 26, 2009, 7:41:49 PM (14 years ago)

Author:

landauf

Message:

• you don't have to set the syncMode of the CameraPosition to 0x0, this is already done in it's constructor
• you also don't have to attach or destroy the CameraPosition once it was added to a CE (it's automatically done)
• the same also holds for attached WorldEntities (like the model) - they get destroyed automatically unless they call setDeleteWithParent(false)
• … and also for collision shapes
• you probably don't want a ParticleSpawner for the fire trail. ParticleEmitter is more suitable (for continuous particle effects)

</teaching>

Location:

code/branches/presentation2/src/modules/weapons/projectiles

Files:

• Rocket.cc (modified) (3 diffs)
• Rocket.h (modified) (1 diff)

code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc

@@ -61 +61 @@
             this->bDestroy_ = false;
         
-            this->model_ = new Model(this);
-            this->model_->setMeshSource("rocket.mesh");
-            this->attach(this->model_);
-            ParticleSpawner* fire = new ParticleSpawner(this);
+            Model* model = new Model(this);
+            model->setMeshSource("rocket.mesh");
+            this->attach(model);
+            ParticleEmitter* fire = new ParticleEmitter(this);
             this->attach(fire);
             fire->setOrientation(this->getOrientation());
@@ -73 +73 @@
             this->setCollisionType(Kinematic);
 
-            this->collisionShape_ = new ConeCollisionShape(this);
-            this->collisionShape_->setRadius(3);
-            this->collisionShape_->setHeight(500);
-            this->attachCollisionShape(this->collisionShape_);
+            ConeCollisionShape* collisionShape = new ConeCollisionShape(this);
+            collisionShape->setRadius(3);
+            collisionShape->setHeight(500);
+            this->attachCollisionShape(collisionShape);
 
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&Rocket::destroyObject, this)));
         }
         
-        this->camPosition_ = new CameraPosition(this);
-        this->camPosition_->setPosition(0,10,40);
-        this->camPosition_->setSyncMode(0x0);
-        this->camPosition_->setAllowMouseLook(true);
-        this->attach( this->camPosition_ );
-        this->addCameraPosition( this->camPosition_ );
+        CameraPosition* camPosition = new CameraPosition(this);
+        camPosition->setPosition(0,10,40);
+        camPosition->setAllowMouseLook(true);
+        this->addCameraPosition(camPosition);
     }
 
@@ -97 +95 @@
         if(this->isInitialized())
         {
-            if (GameMode::isMaster() && this->player_.get())
-            {
-                this->model_->destroy();
-                this->collisionShape_->destroy();
+            if (GameMode::isMaster() && this->player_)
                 this->player_->stopTemporaryControl();
-            }
-            this->camPosition_->destroy();
         }
     }

code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h

@@ -119 +119 @@
             ControllableEntity* originalControllableEntity_;
             
-            Model* model_;
-            CameraPosition* camPosition_;
-            ConeCollisionShape* collisionShape_;
             WeakPtr<PlayerInfo> player_;
             Timer destroyTimer_;