Changeset 10256 in orxonox.OLD for branches/playability

Timestamp:

Jan 17, 2007, 2:20:17 PM (18 years ago)

Author:

nicolasc

Message:

bump

Location:

branches/playability/src/world_entities

Files:

• projectiles/projectile_weapon.cc (modified) (2 diffs)
• projectiles/projectile_weapon.h (modified) (2 diffs)
• projectiles/spike_ball.cc (modified) (3 diffs)
• projectiles/spike_ball.h (modified) (1 diff)
• weapons/spike_thrower.cc (modified) (3 diffs)

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

@@ -33 +33 @@
  *  standard constructor
 */
-ProjectileWeapon::ProjectileWeapon () : WorldEntity()
+ProjectileWeapon::ProjectileWeapon () : Projectile()
 {
   this->registerObject(this, ProjectileWeapon::_objectList);
@@ -57 +57 @@
 ProjectileWeapon::~ProjectileWeapon ()
 {
-  /*
-     do not delete the test projectModel, since it is pnode
-     and will be cleaned out by world
-  */
-  //delete this->projectile_weaponModel;
 }
 
-ProjectileWeapon::ProjectileWeapon (float pDamage, float eDamage, PNode* target) : WorldEntity()
+ProjectileWeapon::ProjectileWeapon (float pDamage, float eDamage, PNode* target) : Projectile()
 {
   this->registerObject(this, ProjectileWeapon::_objectList);

branches/playability/src/world_entities/projectiles/projectile_weapon.h

@@ -25 +25 @@
 
 
-class ProjectileWeapon : public WorldEntity
+class ProjectileWeapon : public Projectile
 {
   ObjectListDeclaration(ProjectileWeapon);
@@ -75 +75 @@
     inline void setRotationAxis ( Vector axis ) { this->rotationAxis = axis; };
     inline void setRotationSpeed ( float speed ) { this->rotationSpeed = speed; };
-    inline Vector getRotationAxis () { return this->rotationAxis; };
+    inline const Vector & getRotationAxis () const { return this->rotationAxis; };
     inline float getRotationSpeed () { return this->rotationSpeed; };     //!< Added for completeness
 

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

@@ -55 +55 @@
   this->emitter->setEmissionVelocity(50.0);
 
-  this->speed = 150;
-
+//   this->speed = 150;
+/*
   this->angle = 0;
-  this->rotationSpeed = 130;
+  this->rotationSpeed = 130;*/
+  this->setRotationSpeed(130);
 
   this->halo = new Billboard();
@@ -255 +256 @@
 //     printf("called by spikeball  ");
 //     this->weaponMan->fire();
-//     this->blow();
+    this->blow();
   }
 
@@ -289 +290 @@
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
 
-  glRotatef(angle, this->rotationVector.x, this->rotationVector.y, this->rotationVector.z);
+  glRotatef(angle, this->getRotationAxis().x, this->getRotationAxis().y, this->getRotationAxis().z);
   this->getAbsDir().matrix (matrix);
   glMultMatrixf((float*)matrix);

branches/playability/src/world_entities/projectiles/spike_ball.h

@@ -51 +51 @@
     ParticleEmitter*                  emitter;
 
-    float                             speed;
+//     float                             speed;
 
-    float                             angle;
-    float                             rotationSpeed;
-    Vector                            rotationVector;
+//     float                             angle;
+//     float                             rotationSpeed;
+//     Vector                            rotationVector;
 
     Billboard*                        halo;

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

@@ -75 +75 @@
 {
   this->registerObject(this, SpikeThrower::_objectList);
-
+/*
   Animation3D* animation1 = this->getAnimation(WS_ACTIVATING, this);
   Animation3D* animation2 = this->getAnimation(WS_DEACTIVATING, this);
@@ -82 +82 @@
   animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
   animation2->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
-  animation2->addKeyFrame(Vector(0, -.5, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
-
+  animation2->addKeyFrame(Vector(0, -.5, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);*/
+/*
   animation1->setInfinity(ANIM_INF_CONSTANT);
-  animation2->setInfinity(ANIM_INF_CONSTANT);
+  animation2->setInfinity(ANIM_INF_CONSTANT);*/
 
   this->setStateDuration(WS_SHOOTING, .6);
@@ -97 +97 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  this->setProjectileTypeC("Spike");
+  this->setProjectileTypeC("SpikeBall");
 
 //   this->loadModel("models/guns/turret1.obj", 1.0);
 
-  this->setEmissionPoint(1.684, 0.472, 0);
+  this->setEmissionPoint(2, 0, 0);
   this->getProjectileFactory()->prepare(50);
 
-  this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
-  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
+//   this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
+//   this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
+//   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
 
 }