Changeset 9987 in orxonox.OLD for branches/playability

Timestamp:

Dec 3, 2006, 3:26:08 PM (18 years ago)

Author:

nicolasc

Message:

update regen(); add new model for hbolt

Location:

branches/playability/src/world_entities

Files:

• projectiles/hbolt.cc (modified) (3 diffs)
• space_ships/space_ship.cc (modified) (5 diffs)
• test_entity2.cc (modified) (2 diffs)

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

@@ -124 +124 @@
   if (this->tickLifeCycle(dt))
     this->deactivate();
+
+
 }
 
@@ -144 +146 @@
   glDisable(GL_LIGHTING);
 
+  //glPushMatrix();
+  //glRotatef(30, 0.0f, 1.0f, 0.0f);
+
   WorldEntity::draw();
 /*  glMatrixMode(GL_MODELVIEW);
@@ -156 +161 @@
   glPopMatrix();*/
 
+/*
+
+  float matrix[4][4];
+  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+  this->getAbsDir().matrix (matrix);
+  glMultMatrixf((float*)matrix);
+  glRotatef(30, 0.0, 1.0, 0.0);
+  //glMultMatrixf((float*)matrix);
+  this->getModel()->draw();*/
+  //glPopMatrix();
   glPopAttrib();
 }

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

@@ -626 +626 @@
     }
     else { // shield <= pDamage
-      this->shieldCur = 0;
-      this->shieldActive = false; //shield collaptses
+      this->shieldCur -=pDamage;
+      this->shieldActive = false; //shield collapses
       pDamage = pDamage - this->shieldCur;
       if( !this->shieldActive) {
@@ -641 +641 @@
   if( this->armorCur <= 0) { /* FIXME implement shipcrash*/ }
 }
+
 
 void SpaceShip::regen(float time){
@@ -671 +672 @@
 }
 
+
 /**
  * Weapon regeneration
@@ -679 +681 @@
   float energy  = ( this->reactorOutput * this->weaponEnergyShare + this->weaponEnergyRegen) * time;
   Weapon* weapon;
-  for( int i=0; i < this->weaponMan.getSlotCount(); i++)
+  for( unsigned int i=0; i < this->weaponMan.getSlotCount(); i++)
   {
     weapon = this->weaponMan.getWeapon(i);
@@ -692 +694 @@
 }
 
+
 void SpaceShip::enterPlaymode(Playable::Playmode playmode)
 {
 }
 
+
 void SpaceShip::movement (float dt)
 {

branches/playability/src/world_entities/test_entity2.cc

@@ -117 +117 @@
 
 
-    glDisable(GL_TEXTURE_2D);
+    glEnable(GL_TEXTURE_2D);
     this->material->select();
 
@@ -244 +244 @@
 
   this->setParent(pl);
-}
-
-
-
-
-
-
+
+}
+
+
+
+
+
+