Changeset 10004 in orxonox.OLD

Timestamp:

Dec 3, 2006, 10:36:50 PM (17 years ago)

Author:

marcscha

Message:

see changelog

Location:

branches/playability

Files:

• ChangeLog (modified) (1 diff)
• src/defs/class_id_DEPRECATED.h (modified) (1 diff)
• src/world_entities/WorldEntities.am (modified) (2 diffs)
• src/world_entities/projectiles/hbolt.cc (modified) (4 diffs)
• src/world_entities/projectiles/swarm_projectile.cc (added)
• src/world_entities/projectiles/swarm_projectile.h (added)
• src/world_entities/space_ships/space_ship.cc (modified) (6 diffs)
• src/world_entities/weapons/swarm_missile.cc (added)
• src/world_entities/weapons/swarm_missile.h (added)
• src/world_entities/weapons/weapon_manager.cc (modified) (2 diffs)
• src/world_entities/weapons/weapon_manager.h (modified) (1 diff)

branches/playability/ChangeLog

@@ -3 +3 @@
   Multiple weapons per ship added
   Several small tweaks needed to make the above working added
+  Addition of SwarmMissile and SwarmProjectile
 
 

branches/playability/src/defs/class_id_DEPRECATED.h

@@ -238 +238 @@
   CL_HYPERBLAST                 =    0x000003e9,
   CL_BOOMERANG_PROJECTILE       =    0x000003ea,
+  CL_SWARM_PROJECTILE           =    0x000003eb,
 
   // NPC's

branches/playability/src/world_entities/WorldEntities.am

@@ -40 +40 @@
                 world_entities/weapons/medium_blaster.cc \
                 world_entities/weapons/heavy_blaster.cc \
+                world_entities/weapons/swarm_missile.cc \
                 \
                 world_entities/projectiles/bolt.cc \
                 world_entities/projectiles/mbolt.cc \
                 world_entities/projectiles/hbolt.cc \
+                world_entities/projectiles/swarm_projectile.cc \
                 world_entities/projectiles/bomb.cc \
                 world_entities/projectiles/laser.cc \
@@ -150 +152 @@
                 weapons/medium_blaster.h \
                 weapons/heavy_blaster.h \
+                weapons/swarm_missile.h \
                 \
                 projectiles/bolt.h \
                 projectiles/mbolt.h \
                 projectiles/hbolt.h \
+                projectiles/swarm_projectile.h \
                 projectiles/bomb.h \
                 projectiles/laser.h \

branches/playability/src/world_entities/projectiles/hbolt.cc

@@ -47 +47 @@
   this->angle = 0;
   this->rotationSpeed = 1000;
+
 
   this->emitter = new DotEmitter(100, 5, M_2_PI);
@@ -118 +119 @@
 void HBolt::updateAngle (float time)
 {
+<<<<<<< .mine
+  this->angle += this->rotationSpeed * time;
+=======
   this->angle = this->angle + this->rotationSpeed * time;
+>>>>>>> .r10003
 }
 
@@ -173 +178 @@
   //this->updateAngle();
 
+<<<<<<< .mine
+  //glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+  //glRotatef(this->angle, 0.0, 0.0, -1.0);
+  glTranslatef (this->getAbsCoor ().x,
+                  this->getAbsCoor ().y,
+                  this->getAbsCoor ().z);
+  Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+  glRotatef(this->angle, 0.0, 0.0, -1.0);
+=======
   //glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
   //glRotatef(this->angle, 0.0, 0.0, -1.0);
@@ -181 +196 @@
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
   glRotatef(this->angle, 0.0, 0.0, 1.0);
+>>>>>>> .r10003
   this->getModel()->draw();
   glPopMatrix();

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -26 +26 @@
 #include "weapons/medium_blaster.h"
 #include "weapons/heavy_blaster.h"
+#include "weapons/swarm_missile.h"
 #include "weapons/boomerang_gun.h"
 #include "weapons/turret.h"
@@ -152 +153 @@
   wpLeft3->setName("Heavy Blaster Left");
 
-  Weapon* cannon = new BoomerangGun();//Cannon();
-  cannon->setName("End of World");
+  Weapon* cannon = new SwarmMissile();
+  cannon->setName("Swarm Missile");
+  
 
 
@@ -273 +275 @@
   this->secWeaponMan.setSlotCount(6);
 
-  this->secWeaponMan.setSlotPosition(0, Vector(2.6, -2.5, 0));
+  this->secWeaponMan.setSlotPosition(0, Vector(1.5, -1, 0));
   this->secWeaponMan.setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
@@ -300 +302 @@
   this->weaponMan.getFixedTarget()->setParent(this);
   this->weaponMan.getFixedTarget()->setRelCoor(100000,0,0);
+
   
   this->secWeaponMan.getFixedTarget()->setParent(this);
   this->secWeaponMan.getFixedTarget()->setRelCoor(100000,0,0);
+  this->secWeaponMan.setRotationSpeed(0);
 
   dynamic_cast<Element2D*>(this->weaponMan.getFixedTarget())->setVisibility( false);
@@ -367 +371 @@
 void SpaceShip::enter()
 {
-  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( true);
+  this->secWeaponMan.showCrosshair();
+  //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( true);
   this->attachCamera();
 }
@@ -373 +378 @@
 void SpaceShip::leave()
 {
-  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
+  this->secWeaponMan.hideCrosshair();
+  //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( false);
   this->detachCamera();
 }

branches/playability/src/world_entities/weapons/weapon_manager.cc

@@ -126 +126 @@
 {
   this->crosshair->setVisibility( false);
+}
+
+void WeaponManager::setRotationSpeed(float speed)
+{
+  this->crosshair->setRotationSpeed(speed);
 }
 
@@ -431 +436 @@
 
   /*
-  if( this->crosshair != NULL)
-  {
         this->crosshair->setRotationSpeed(500);
         this->crossHairSizeAnim->replay();
-  } */
+  */
 }
 

branches/playability/src/world_entities/weapons/weapon_manager.h

@@ -62 +62 @@
     void showCrosshair();
     void hideCrosshair();
+    void setRotationSpeed(float speed);
 
     void setSlotCount(unsigned int slotCount);