Changeset 10289 in orxonox.OLD for branches

Timestamp:

Jan 17, 2007, 10:39:50 PM (18 years ago)

Author:

nicolasc

Message:

clenup

Location:

branches/playability/src/world_entities

Files:

• projectiles/spike.cc (modified) (1 diff)
• projectiles/spike.h (modified) (1 diff)
• projectiles/spike_ball.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (2 diffs)
• weapons/medium_blaster.cc (modified) (5 diffs)
• weapons/spike_thrower.cc (modified) (1 diff)

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

@@ -57 +57 @@
   this->angle = 0;
   this->rotationSpeed = 130;
-/*
-  this->halo = new Billboard();
-  this->halo->setSize(.35, .35);
-  this->halo->setTexture("hbolt_halo.png");*/
 }
 

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

@@ -45 +45 @@
     float                             rotationSpeed;
 
-//     Billboard*                        halo;
-
     WorldEntity* hitEntity; // FIXME TEMPORARY
 

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

@@ -41 +41 @@
     inline void setVelocity(Vector velocity) { this->velocity = velocity; }
 
-//     inline Vector getRotationVector() { return this->rotationVector; }
-//     inline float getAngle() { return this->angle; }
 
   private:

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

@@ -823 +823 @@
         this->travelNode->setAbsCoor(this->getAbsCoor());
         this->travelNode->updateNode(0.01f);
-        
+
         this->setParent(this->travelNode);
-        
-        // If track exists put travelNode on trackNode of track
-        if (this->entityTrack)
-           this->travelNode->setParent(this->entityTrack->getTrackNode());
-           
-        
-        
         this->setRelCoor(0,0,0);
 
         State::getCameraNode()->setParentSoft(this->travelNode);
-        //State::getCameraNode()->setParentSoft(this->entityTrack->getTrackNode());
+        //State::getCameraNode()->setParentSoft(this);
         //State::getCameraNode()->setRelCoorSoft(-0.01, 40, 0);
         State::getCameraTargetNode()->setParentSoft(this->travelNode);
-        //State::getCameraTargetNode()->setParentSoft(this->entityTrack->getTrackNode());
+        //State::getCameraTargetNode()->setParentSoft(this);
         //State::getCameraTargetNode()->setRelCoorSoft(0,0,0);
         this->setCameraMode(Camera::ViewTop);
@@ -1011 +1004 @@
 
     //this moves camera and ship along the travel path.
-    if (!this->entityTrack)
-       this->travelNode->shiftCoor(Vector(this->cameraSpeed * dt, 0, 0));
+    this->travelNode->shiftCoor(Vector(this->cameraSpeed * dt, 0, 0));
 
     break;

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

@@ -40 +40 @@
   {
    delete [] this->shootAnim[i];
-//    delete [] this->objComp[i];
   }
   delete [] this->shootAnim;
-//   delete [] this->objComp;
 }
 
@@ -53 +51 @@
 void MediumBlaster::init()
 {
-  //this->registerObject(this, MediumBlaster::_objectList);
-
-//  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
-
   this->loadModel("models/guns/blaster.obj", .33);
-  
 
   this->setStateDuration(WS_SHOOTING, 0.2);   // 5 Schuss pro Sekunde
@@ -84 +77 @@
 
   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++)
@@ -168 +156 @@
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
+  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
 
   static_cast<StaticModel*>(this->getModel())->draw(2);
@@ -180 +166 @@
 
   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();
-
+    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();
 

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

@@ -161 +161 @@
   pj->setAbsDir(this->getAbsDir());
   pj->activate();
+
+//   this->increaseEnergy( - this->getProjectile()->getMinEnergy());
+
 }