Changeset 11004 for code/branches/cpp11_v2/src/modules/weapons

Timestamp:

Dec 30, 2015, 10:07:09 PM (9 years ago)

Author:

landauf

Message:

using strongly typed enum class in WorldEntity

Location:

code/branches/cpp11_v2/src/modules/weapons/projectiles

Files:

• GravityBomb.cc (modified) (1 diff)
• IceGunProjectile.cc (modified) (1 diff)
• LightningGunProjectile.cc (modified) (1 diff)
• Projectile.cc (modified) (1 diff)
• Rocket.cc (modified) (2 diffs)
• RocketOld.cc (modified) (2 diffs)
• SimpleRocket.cc (modified) (2 diffs)

code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBomb.cc

@@ -28 +28 @@
                 this->timeToLife_= LIFETIME;
                 this->setCollisionResponse(false);
-                this->setCollisionType(WorldEntity::Dynamic);
+                this->setCollisionType(WorldEntity::CollisionType::Dynamic);
                 this->enableCollisionCallback();
 

code/branches/cpp11_v2/src/modules/weapons/projectiles/IceGunProjectile.cc

@@ -89 +89 @@
             Vector3 offset = this->getWorldPosition() - otherObject->getWorldPosition();
             freezer->setPosition(Vector3(0,0,0));
-            freezer->translate(offset, WorldEntity::World);
+            freezer->translate(offset, WorldEntity::TransformSpace::World);
             // Start the freezing effect.
             freezer->startFreezing();

code/branches/cpp11_v2/src/modules/weapons/projectiles/LightningGunProjectile.cc

@@ -48 +48 @@
         this->textureIndex_ = 1;
         this->setMass(2);
-        this->setCollisionType(Dynamic);
+        this->setCollisionType(CollisionType::Dynamic);
         this->maxTextureIndex_ = 8;
         this->textureTimer_.setTimer(0.01f, true, createExecutor(createFunctor(&LightningGunProjectile::changeTexture, this)));

code/branches/cpp11_v2/src/modules/weapons/projectiles/Projectile.cc

@@ -57 +57 @@
             this->enableCollisionCallback();
             this->setCollisionResponse(false);
-            this->setCollisionType(Dynamic);
+            this->setCollisionType(CollisionType::Dynamic);
 
             // Create a sphere collision shape and attach it to the projectile.

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

@@ -70 +70 @@
         if (GameMode::isMaster())
         {
-            this->setCollisionType(WorldEntity::Kinematic);
+            this->setCollisionType(WorldEntity::CollisionType::Kinematic);
             this->setVelocity(0,0,-100);
 
@@ -92 +92 @@
             this->enableCollisionCallback();
             this->setCollisionResponse(false);
-            this->setCollisionType(Kinematic);
+            this->setCollisionType(CollisionType::Kinematic);
 
             // Add collision shape

code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.cc

@@ -70 +70 @@
         if (GameMode::isMaster())
         {
-            this->setCollisionType(WorldEntity::Kinematic);
+            this->setCollisionType(WorldEntity::CollisionType::Kinematic);
             this->setVelocity(0,0,-100);
 
@@ -92 +92 @@
             this->enableCollisionCallback();
             this->setCollisionResponse(false);
-            this->setCollisionType(Kinematic);
+            this->setCollisionType(CollisionType::Kinematic);
 
             // Add collision shape

code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -70 +70 @@
         if (GameMode::isMaster())
         {
-            this->setCollisionType(WorldEntity::Kinematic);
+            this->setCollisionType(WorldEntity::CollisionType::Kinematic);
             this->fuel_ = true;
 
@@ -87 +87 @@
             this->enableCollisionCallback();
             this->setCollisionResponse(false);
-            this->setCollisionType(Kinematic);
+            this->setCollisionType(CollisionType::Kinematic);
 
             // Add collision shape.