Changeset 6087 for code/branches/particles2/src/modules/weapons/projectiles

Timestamp:

Nov 18, 2009, 1:34:14 PM (15 years ago)

Author:

scheusso

Message:

changes in PlayerInfo and Rocket (and scene)
not yet working in network though

Location:

code/branches/particles2/src/modules/weapons/projectiles

Files:

• Rocket.cc (modified) (6 diffs)
• Rocket.h (modified) (2 diffs)

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

@@ -52 +52 @@
         RegisterObject(Rocket);// - register the Rocket class to the core
         
-        this->setCollisionType(WorldEntity::Kinematic);
-        this->setVelocity(0,0,-100);
-        this->model_ = new Model(this);
-        this->model_->setMeshSource("rocket_test.mesh");
-        this->attach(this->model_);
-        this->lifetime_ = 100;
-        this->bDestroy_ = false;
-        
         if (GameMode::isMaster())
         {
+            this->setCollisionType(WorldEntity::Kinematic);
+            this->setVelocity(0,0,-100);
+            this->lifetime_ = 100;
+            this->bDestroy_ = false;
+        
+            this->model_ = new Model(this);
+            this->model_->setMeshSource("rocket_test.mesh");
+            this->attach(this->model_);
+        
             this->enableCollisionCallback();
             this->setCollisionResponse(false);
@@ -76 +77 @@
         this->camPosition_ = new CameraPosition(this);
         this->camPosition_->setPosition(0,10,40);
+        this->camPosition_->setSyncMode(0x0);
         this->attach( this->camPosition_ );
         this->addCameraPosition( this->camPosition_ );
@@ -88 +90 @@
         if(this->isInitialized())
         {
-            this->collisionShape_->destroy();
-            this->model_->destroy();
             
-            if (GameMode::isMaster() && this->player_)
+            if (GameMode::isMaster() && this->player_.get())
+            {
+                this->model_->destroy();
+                this->collisionShape_->destroy();
                 this->player_->stopTemporaryControl();
+            }
             this->camPosition_->destroy();
         }
@@ -110 +114 @@
     {
         this->owner_ = owner;
-        
         this->originalControllableEntity_ = this->owner_->getPlayer()->getControllableEntity();
         this->player_ = this->owner_->getPlayer();
@@ -126 +129 @@
         SUPER(Rocket, tick, dt);
         
-        this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
-        this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
-        this->localAngularVelocity_ = 0;
-        
-        if( this->bDestroy_ )
-            this->destroy();
+        if( GameMode::isMaster() )
+        {
+            this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
+            this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
+            this->localAngularVelocity_ = 0;
+            
+            if( this->bDestroy_ )
+                this->destroy();
+        }
     }
     
@@ -180 +186 @@
             this->destroy();
     }
+    
+    void Rocket::fire(unsigned int firemode)
+    {
+        if (this->owner_)
+        {
+            {
+                ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+                effect->setPosition(this->getPosition());
+                effect->setOrientation(this->getOrientation());
+                effect->setDestroyAfterLife(true);
+                effect->setSource("Orxonox/explosion3");
+                effect->setLifetime(2.0f);
+            }
+            {
+                ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+                effect->setPosition(this->getPosition());
+                effect->setOrientation(this->getOrientation());
+                effect->setDestroyAfterLife(true);
+                effect->setSource("Orxonox/smoke4");
+                effect->setLifetime(3.0f);
+            }
+            this->destroy();
+        }
+    }
 
     /**

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

@@ -110 +110 @@
             inline float getDamage() const
                 { return this->damage_; }
-            virtual void fire(unsigned int firemode) { this->destroy(); }
+            virtual void fire(unsigned int firemode);
             
         private:
@@ -122 +122 @@
             CameraPosition* camPosition_;
             ConeCollisionShape* collisionShape_;
-            PlayerInfo* player_;
+            WeakPtr<PlayerInfo> player_;
             Timer destroyTimer_;
             float lifetime_;