Changeset 10286 in orxonox.OLD

Timestamp:

Jan 17, 2007, 9:23:49 PM (17 years ago)

Author:

nicolasc

Message:

code cleanup, rebuilt spikeball

Location:

branches/playability/src

Files:

• story_entities/game_world_data.cc (modified) (1 diff)
• world_entities/projectiles/spike.h (modified) (1 diff)
• world_entities/projectiles/spike_ball.cc (modified) (12 diffs)
• world_entities/projectiles/spike_ball.h (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)
• world_entities/weapons/heavy_blaster.cc (modified) (1 diff)
• world_entities/weapons/medium_blaster.cc (modified) (6 diffs)
• world_entities/weapons/medium_blaster.h (modified) (1 diff)

branches/playability/src/story_entities/game_world_data.cc

@@ -232 +232 @@
   State::setPlayer(this->localPlayer);
 
-  Playable* playable;
+//   Playable* playable;
   if (!Playable::objectList().empty())
   {

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

@@ -48 +48 @@
 
     WorldEntity* hitEntity; // FIXME TEMPORARY
+
+    Vector                            velocity;
 };
 

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

@@ -55 +55 @@
   this->emitter->setEmissionVelocity(50.0);
 
-//   this->speed = 150;
-/*
-  this->angle = 0;
-  this->rotationSpeed = 130;*/
   this->setRotationSpeed(130);
 
@@ -70 +66 @@
 
   this->launcher = new Vector [this->getFragments()];
-
-//   this->fastFactory = tFastFactory<Spike>::getFastFactory(CL_SPIKE, "Spike");
-
-/*
-  this->weaponMan = new WeaponManager(dynamic_cast<WorldEntity*>(this));
-  this->weaponMan->setParentEntity(this);
-  this->weaponMan->setSlotCount(1);
-  this->weaponMan->setSlotPosition(0, Vector(0, 0, 0));
-  this->weaponMan->setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  Weapon* cannon = new SpikeLauncher();
-  cannon->setName( "SpikeLauncher");
-  this->weaponMan->addWeapon(cannon, 0, 0);
-  this->weaponMan->changeWeaponConfig(0);
-
-  this->weaponMan->getWeapon(0)->increaseEnergy(50);*/
 }
 
@@ -172 +152 @@
   this->hitEntity = entity;
   dynamic_cast<SpaceShip*>(entity)->damage(this->getDamage(),0);
-//   this->deactivate();
 }
 
@@ -178 +157 @@
 void SpikeBall::blow()
 {
+  updateFireDir();
+
   Spike* pj = NULL;
-/*  printf( "KA-" );*/
   for ( int i = 0; i < this->getFragments(); i++)
   {
     pj  = new Spike();
     assert( pj );
-/*    printf(" %i", i);*/
     pj->setParent(PNode::getNullParent());
 
@@ -191 +170 @@
     pj->setParent(PNode::getNullParent());
     pj->setAbsCoor(this->getAbsCoor() + this->launcher[i] * this->size);
-    Quaternion q;
-    pj->setAbsDir(q.lookAt(Vector(), this->launcher[i], VECTOR_RAND(1)));
+//     Quaternion q;
+    pj->setAbsDir(Quaternion(this->launcher[i], 0));
 
     pj->toList(this->getOMListNumber());
 
-/*
-    pj->setAbsCoor(this->getAbsCoor() + VECTOR_RAND(3));
-    pj->setAbsDir(this->getAbsDir());*/
     pj->activate();
   }
-/*  printf( "BOOM\n" );*/
 }
 
@@ -219 +194 @@
   ca = cos (this->getAngle());
   sa = sin (this->getAngle());
-// final version below... easier to to cheat with the one above.
 
   m[0][0] = nx * nx * (1 - ca) + ca;
@@ -233 +207 @@
   float x, y, z;
   for (int i = 0; i < this->getFragments(); i++){
-//     printf("%i ", i);
     x = m[0][0] * this->launcher[i].x + m[0][1] * this->launcher[i].y + m[0][2] * this->launcher[i].z;
     y = m[1][0] * this->launcher[i].x + m[1][1] * this->launcher[i].y + m[1][2] * this->launcher[i].z;
@@ -240 +213 @@
     this->launcher[i] = Vector (x, y, z);
   }
-//   printf("\n");
 
   for( int i = 0; i < 3 ; i++)
@@ -254 +226 @@
 void SpikeBall::tick (float dt)
 {
-  //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
-  Vector v = this->getVelocity() * dt;
+  Vector v = this->velocity * dt;
   this->shiftCoor(v);
-
-//   if(this->lifeCycle > .9){
-// /*    printf("time to blow:  ");*/
-// //     this->weaponMan->fire();
-// /*    this->blow();*/
-//   }
 
   if (this->tickLifeCycle(dt)){
@@ -270 +235 @@
 
   this->updateAngle( dt );
-//   angle += rotationSpeed * dt;
 }
 
@@ -289 +253 @@
 {
   glPushAttrib(GL_ENABLE_BIT);
-  //glDisable(GL_LIGHTING);
-
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
@@ -305 +267 @@
 
   glPopMatrix();
-
   glPopAttrib();
 }

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

@@ -10 +10 @@
 #include "spike.h"
 #include "effects/billboard.h"
-
-// #include "../weapons/spike_launcher.h"
 
 

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

@@ -204 +204 @@
 
   curWeaponPrimary    = 3;
-  curWeaponSecondary  = 1;
+  curWeaponSecondary  = 0;
 
   Playable::weaponConfigChanged();
@@ -295 +295 @@
   this->weaponMan.setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
-  this->weaponMan.setSlotPosition(2, Vector(-1.5, 0, -.5));
+  this->weaponMan.setSlotPosition(2, Vector(1.0, 0, -1.5));
   this->weaponMan.setSlotDirection(2, Quaternion(-M_PI_4*.5, Vector(1,0,0)));
 
-  this->weaponMan.setSlotPosition(3, Vector(-1.5, 0, .5));
+  this->weaponMan.setSlotPosition(3, Vector(1.0, 0, 1.5));
   this->weaponMan.setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0)));
 

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

@@ -235 +235 @@
 
   glPushMatrix();
-  glTranslatef (this->objComp[1][0]->getAbsCoor().x, this->objComp[1][0]->getAbsCoor().y, this->objComp[1][0]->getAbsCoor().z);
-  static_cast<StaticModel*>(this->getModel())->draw(2);
-  glPopMatrix();
-
-  glPushMatrix();
-  glTranslatef (this->objComp[2][0]->getAbsCoor().x, this->objComp[2][0]->getAbsCoor().y, this->objComp[2][0]->getAbsCoor().z);
-  static_cast<StaticModel*>(this->getModel())->draw(0);
-  glPopMatrix();
-
-  glPushMatrix();
-  glTranslatef (this->objComp[0][1]->getAbsCoor().x, this->objComp[0][1]->getAbsCoor().y, this->objComp[0][1]->getAbsCoor().z);
+    glTranslatef (this->objComp[1][0]->getAbsCoor().x, this->objComp[1][0]->getAbsCoor().y, this->objComp[1][0]->getAbsCoor().z);
+    static_cast<StaticModel*>(this->getModel())->draw(2);
+  glPopMatrix();
+
+  glPushMatrix();
+    glTranslatef (this->objComp[2][0]->getAbsCoor().x, this->objComp[2][0]->getAbsCoor().y, this->objComp[2][0]->getAbsCoor().z);
+    static_cast<StaticModel*>(this->getModel())->draw(0);
+  glPopMatrix();
+
+  glPushMatrix();
+    glTranslatef (this->objComp[0][1]->getAbsCoor().x, this->objComp[0][1]->getAbsCoor().y, this->objComp[0][1]->getAbsCoor().z);
     static_cast<StaticModel*>(this->getModel())->draw(4);
   glPopMatrix();
 
   glPushMatrix();
-  glTranslatef (this->objComp[1][1]->getAbsCoor().x, this->objComp[1][1]->getAbsCoor().y, this->objComp[1][1]->getAbsCoor().z);
-  static_cast<StaticModel*>(this->getModel())->draw(5);
-  glPopMatrix();
-
-  glPushMatrix();
-  glTranslatef (this->objComp[2][1]->getAbsCoor().x, this->objComp[2][1]->getAbsCoor().y, this->objComp[2][1]->getAbsCoor().z);
-  static_cast<StaticModel*>(this->getModel())->draw(3);
-  glPopMatrix();
-
-  glPopMatrix();
-}
+    glTranslatef (this->objComp[1][1]->getAbsCoor().x, this->objComp[1][1]->getAbsCoor().y, this->objComp[1][1]->getAbsCoor().z);
+    static_cast<StaticModel*>(this->getModel())->draw(5);
+  glPopMatrix();
+
+  glPushMatrix();
+    glTranslatef (this->objComp[2][1]->getAbsCoor().x, this->objComp[2][1]->getAbsCoor().y, this->objComp[2][1]->getAbsCoor().z);
+    static_cast<StaticModel*>(this->getModel())->draw(3);
+  glPopMatrix();
+
+  glPopMatrix();
+}

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

@@ -37 +37 @@
 {
       // model will be deleted from WorldEntity-destructor
+  for (int i = 0; i < this->getBarrels(); i++)
+  {
+   delete [] this->shootAnim[i];
+//    delete [] this->objComp[i];
+  }
+  delete [] this->shootAnim;
+//   delete [] this->objComp;
 }
 
@@ -50 +57 @@
 //  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
-  this->loadModel("models/guns/plasmadriver_#.obj", 1.0);
+  this->loadModel("models/guns/blaster.obj", .33);
   
 
@@ -71 +78 @@
   this->prepareProjectiles(100);
 
+
+  this->setBarrels(1);
+  this->setSegs(2);
+  this->activeBarrel = 0;
+
+  this->objComp = new PNode**[this->getBarrels()];
+//   this->emissionPoint = new PNode*[this->getBarrels()];
+  this->shootAnim = new Animation3D**[this->getBarrels()];
+  for (int i = 0; i < this->getBarrels(); i++)
+  {
+    this->objComp[i] = new PNode* [this->getSegs()];
+//     this->emissionPoint[i] = new PNode;
+//     this->emissionPoint[i]->setParent(this);             //< One EmissionPoint, that is a PNode connected to the weapon. You can set this to the exitting point of the Projectiles
+//     this->emissionPoint[i]->setName("EmissionPoint");
+//     this->emissionPoint[i]->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
+    this->shootAnim[i] = new Animation3D* [this->getSegs()];
+    for(int j = 0; j < this->getSegs(); j++)
+    {
+      this->objComp[i][j] = new PNode;
+      this->shootAnim[i][j] = new Animation3D(this->objComp[i][j]);
+      this->shootAnim[i][j]->setInfinity(ANIM_INF_CONSTANT);
+    }
+  }
+
+  for (int i = 0; i < this->getBarrels(); i++){
+    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.04, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][0]->addKeyFrame(Vector(-0.333, 0.0, 0.0), Quaternion(), 0.15, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.01, ANIM_LINEAR, ANIM_NULL);
+
+    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.04, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][1]->addKeyFrame(Vector(.166, 0.0, 0.0), Quaternion(), 0.15, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.01, ANIM_LINEAR, ANIM_NULL);
+  }
+
   Animation3D* animation2 = this->getAnimation(WS_ACTIVATING, this);
   Animation3D* animation3 = this->getAnimation(WS_DEACTIVATING, this);
@@ -77 +118 @@
   animation3->setInfinity(ANIM_INF_CONSTANT);
 
-  this->setEmissionPoint(3.8, 1.2, 0);
+
+  this->setEmissionPoint(1.3, 0, 0);
 
   animation2->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
@@ -103 +145 @@
   pj->setAbsDir(this->getAbsDir());
   pj->activate();
+
+  for (int i = 0; i < this->getSegs(); i++)
+    this->shootAnim[this->activeBarrel][i]->replay();
 }
 
@@ -121 +166 @@
 void MediumBlaster::draw() const
 {
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+  glTranslatef (this->getAbsCoor ().x,
+                this->getAbsCoor ().y,
+                this->getAbsCoor ().z);
+
+  static_cast<StaticModel*>(this->getModel())->draw(2);
+
+  glPushMatrix();
+    glTranslatef (this->objComp[0][0]->getAbsCoor().x, this->objComp[0][0]->getAbsCoor().y, this->objComp[0][0]->getAbsCoor().z);
+    static_cast<StaticModel*>(this->getModel())->draw(1);
+  glPopMatrix();
+
+  glPushMatrix();
+  glTranslatef (this->objComp[0][1]->getAbsCoor().x, this->objComp[0][1]->getAbsCoor().y, this->objComp[0][1]->getAbsCoor().z);
+  static_cast<StaticModel*>(this->getModel())->draw(0);
+  glPopMatrix();
+
+  glPopMatrix();
+
+  glPopMatrix();
 }

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

@@ -28 +28 @@
     virtual void draw() const;
 
+  private:
+    PNode*** objComp;
+    Animation3D*** shootAnim;
+
+    int activeBarrel;
+
 };