Changeset 2501 for code/branches/presentation/src/orxonox/objects

Timestamp:

Dec 17, 2008, 9:11:12 AM (16 years ago)

Author:

landauf

Message:

• GlobalShader in dedicated mode works again
• Shooting as a client works
• Fixed problem with NotificationQueue

Location:

code/branches/presentation/src/orxonox/objects

Files:

• GlobalShader.cc (modified) (1 diff)
• gametypes/Gametype.cc (modified) (1 diff)
• weaponSystem/Weapon.cc (modified) (1 diff)
• weaponSystem/projectiles/Projectile.cc (modified) (1 diff)
• worldentities/WorldEntity.cc (modified) (2 diffs)
• worldentities/pawns/Pawn.cc (modified) (5 diffs)
• worldentities/pawns/Pawn.h (modified) (2 diffs)

code/branches/presentation/src/orxonox/objects/GlobalShader.cc

@@ -45 +45 @@
         if (!this->getScene())
             ThrowException(AbortLoading, "Can't create GlobalShader, no scene given.");
-        if (!this->getScene()->getSceneManager())
-            ThrowException(AbortLoading, "Can't create GlobalShader, no scene manager given.");
+//        if (!this->getScene()->getSceneManager())
+//            ThrowException(AbortLoading, "Can't create GlobalShader, no scene manager given.");
 
-        this->shader_.setSceneManager(this->getScene()->getSceneManager());
+        if (this->getScene()->getSceneManager())
+            this->shader_.setSceneManager(this->getScene()->getSceneManager());
 
         this->registerVariables();

code/branches/presentation/src/orxonox/objects/gametypes/Gametype.cc

@@ -69 +69 @@
         this->addBots(this->numberOfBots_);
 
-        setConfigValues();
-
         // load the corresponding score board
         if (Core::showsGraphics() && this->scoreboardTemplate_ != "")

code/branches/presentation/src/orxonox/objects/weaponSystem/Weapon.cc

@@ -50 +50 @@
         this->magazineLoadingTime_ = 0;
         this->bReloading_ = false;
+
+        this->setObjectMode(0x0);
     }
 

code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc

@@ -54 +54 @@
 
         // Get notification about collisions
-        this->enableCollisionCallback();
 
-        this->setCollisionType(Kinematic);
+        if (Core::isMaster())
+        {
+            this->enableCollisionCallback();
 
-        SphereCollisionShape* shape = new SphereCollisionShape(this);
-        shape->setRadius(10);
-        this->attachCollisionShape(shape);
+            this->setCollisionType(Kinematic);
 
-        if(Core::isMaster())
-          this->destroyTimer_.setTimer(this->lifetime_, false, this, createExecutor(createFunctor(&Projectile::destroyObject)));
+            SphereCollisionShape* shape = new SphereCollisionShape(this);
+            shape->setRadius(10);
+            this->attachCollisionShape(shape);
+
+            this->destroyTimer_.setTimer(this->lifetime_, false, this, createExecutor(createFunctor(&Projectile::destroyObject)));
+        }
     }
 

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

@@ -545 +545 @@
         if (type != None && this->collisionType_ == None)
         {
+/*
             // Check whether there was some scaling applied.
             if (!this->node_->getScale().positionEquals(Vector3(1, 1, 1), 0.001))
@@ -551 +552 @@
                 return;
             }
-
+*/
             // Create new rigid body
             btRigidBody::btRigidBodyConstructionInfo bodyConstructionInfo(0, this, this->collisionShape_->getCollisionShape());

code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -49 +49 @@
 
         PawnManager::touch();
-        this->getPickUp().setPlayer(this);
         this->bAlive_ = true;
         this->fire_ = 0x0;
+        this->firehack_ = 0x0;
 
         this->health_ = 0;
@@ -60 +60 @@
 
         this->spawnparticleduration_ = 3.0f;
+
+        this->getPickUp().setPlayer(this);
 
         if (Core::isMaster())
@@ -108 +110 @@
         registerVariable(this->health_,        variableDirection::toclient);
         registerVariable(this->initialHealth_, variableDirection::toclient);
-        registerVariable(this->fire_,          variableDirection::toclient);
+        registerVariable(this->fire_,          variableDirection::toserver);
     }
 
@@ -124 +126 @@
                 this->weaponSystem_->fire(WeaponMode::altFire2);
         }
-        this->fire_ = 0x0;
+        this->fire_ = this->firehack_;
+        this->firehack_ = 0x0;
 
         if (this->health_ <= 0)
@@ -225 +228 @@
     void Pawn::fire(WeaponMode::Enum fireMode)
     {
-        this->fire_ |= fireMode;
+        this->firehack_ |= fireMode;
     }
 

code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -116 +116 @@
             ShipEquipment pickUp;
             bool bAlive_;
-            
+
 
             float health_;
@@ -126 +126 @@
             WeaponSystem* weaponSystem_;
             unsigned int fire_;
+            unsigned int firehack_;
 
             std::string spawnparticlesource_;