Changeset 10659 in orxonox.OLD

Timestamp:

May 23, 2007, 7:31:23 PM (17 years ago)

Author:

nicolasc

Message:

initial modularisation in spaceship config

Location:

branches/vs-enhencements/src

Files:

• util/hud.cc (modified) (1 diff)
• world_entities/projectiles/plasma_pulse.cc (modified) (5 diffs)
• world_entities/projectiles/plasma_pulse.h (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (4 diffs)
• world_entities/space_ships/space_ship.h (modified) (5 diffs)

branches/vs-enhencements/src/util/hud.cc

@@ -348 +348 @@
     overlayWidth = this->resX * (overlayPercentage)/(200);
   else
-    overlayWidth = this->resX * 0.1;
+    overlayWidth = this->resX / 10; // fixed warning!
   //if (overlayWidth < 100)
     //overlayWidth = 100;

branches/vs-enhencements/src/world_entities/projectiles/plasma_pulse.cc

@@ -47 +47 @@
   this->grid->setVisibility(false);
   this->grid->setPulse();
-
   this->grid->setTexture( "textures/plasma.png");
-
-  this->grid->toList(OM_ENVIRON); 
+  this->grid->toList(OM_ENVIRON);
+/*
+  this->blink = new Blink();
+  this->grid->setParent(this);
+  this->grid->setVisibility(false);
+  this->blink->setSize(1.0 );
+  this->blink->setPeriod(.4);
+  this->blink->setColor(10, 250, 150);
+  this->blink->loadBlinkSequence( "66678998766" );
+  this->blink->toList(OM_ENVIRON);*/
 }
 
@@ -61 +68 @@
 {
   this->grid->toList(OM_DEAD);
+//   this->blink->toList(OM_DEAD);
 }
 
@@ -69 +77 @@
   this->toList(OM_ENVIRON);
   this->grid->setVisibility(true);
+//   this->blink->setVisibility(true);
 
   this->setPhysDamage(10);
@@ -81 +90 @@
 
   this->grid->setVisibility(false);
+//   this->blink->setVisibility(false);
   this->lifeCycle = 0.0;
   this->toList(OM_NULL);
@@ -131 +141 @@
     glAlphaFunc( GL_GEQUAL, .5);
     this->grid->draw();
+//     this->blink->draw();
   glPopMatrix();
 

branches/vs-enhencements/src/world_entities/projectiles/plasma_pulse.h

@@ -9 +9 @@
 #include "projectile.h"
 #include "effects/billboard.h"
+#include "effects/blink.h"
 
 class Vector;
@@ -33 +34 @@
     static FastFactory*               fastFactory;
     Billboard*                        grid;
+//     Blink*                            blink;
 };
 

branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc

@@ -218 +218 @@
 
 
-//   this->weaponMan.addWeapon( acid0, 3, 0);
-//   this->weaponMan.addWeapon( acid1, 3, 1);
-
-
   this->secWeaponMan.addWeapon( cannon, 0, 2);
-//   this->secWeaponMan.addWeapon( spike, 1, 3);
-//   this->secWeaponMan.addWeapon( acid0, 2, 2);
-//   this->secWeaponMan.addWeapon( acid1, 2, 3);
-
 
   this->weaponMan.changeWeaponConfig(3);
@@ -232 +224 @@
 
 
-//   curWeaponPrimary    = 3;
-//   curWeaponSecondary  = 0;
-
   Playable::weaponConfigChanged();
 
-  reactorOutput     = 10;
-
-  weaponEnergyRegen = 10;       // 10 einheiten pro Sekunde
-  engineSpeedBase   = 15;
-  shieldRegen       = 2;
-
+//   reactorOutput     = 10;
+  setReactor(10);
+//   weaponEnergyRegen = 10;       // 10 einheiten pro Sekunde
+  setWeapon(10);
+//   engineSpeedBase   = 15;
+  setEngine(15);
+//   shieldRegen       = 2;
+/*
   shieldEnergyShare = 0.3;
   weaponEnergyShare = 0.3;
-  engineEnergyShare = 0.4;
-
+  engineEnergyShare = 0.4;*/
+  setEnergyShare(.3,.3,.4);
+/*
   shieldCur         = 100;
   shieldMax         = 100;
-  shieldTH          = .2 * shieldMax;   // shield power must be 20% before shield kicks in again
-
+  shieldTH          = .2 * shieldMax;   // shield power must be 20% before shield kicks in again*/
+  setShield(100, 100, .2, 2);
+/*
   this->setHealth( 100);
-  this->setHealthMax( 100);
-
+  this->setHealthMax( 100);*/
+  setArmor(100, 100);
+/*
   electronicCur = 50;
   electronicMax = 50;
   electronicRegen   = 3;
-  electronicTH      = .7 * electronicMax; // 30% of eDamage can be handled by the ship
-
-
-  this->loadModel("models/spaceships/fighter_redesign9.obj");
+  electronicTH      = .7 * electronicMax; // 30% of eDamage can be handled by the ship*/
+  setElectronic(50, 50, .7, 3.0);
+
+//   this->loadModel("models/spaceships/fighter_redesign9.obj");
   //this->setVisibiliy(false);
 
   bForward = bBackward = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = bFire = bSecFire = false;
 
-  this->setHealthMax(shieldMax);
-  this->setHealth(shieldCur);
+//   this->setHealthMax(shieldMax);
+//   this->setHealth(shieldCur);
 
   this->travelNode = new PNode();
@@ -405 +399 @@
 //   this->trailL->setTexture( "textures/engine.png");
 //
-//   this->trailR = new Trail( 5, 10, .2, this);
+//   this->trailR = new ( 5, 10, .2, this);
 //   this->trailR->setTexture( "textures/engine.png");
 
@@ -437 +431 @@
 
   State::getCamera()->setViewMode(Camera::ViewTop);
+
+  LoadParam(root, "reactor", this, SpaceShip, setReactor);
+  LoadParam(root, "shield", this, SpaceShip, setShield);
+  LoadParam(root, "armor", this, SpaceShip, setArmor);
+  LoadParam(root, "electronic", this, SpaceShip, setElectronic);
+  LoadParam(root, "engine", this, SpaceShip, setEngine);
+  LoadParam(root, "energyshare", this, SpaceShip, setEnergyShare);
+  LoadParam(root, "weapon", this, SpaceShip, setWeapon);
+
 }
 

branches/vs-enhencements/src/world_entities/space_ships/space_ship.h

@@ -63 +63 @@
     inline WeaponManager& getWeaponManagerSecondary() { return this->secWeaponMan; };
 
+    inline void setReactor(float output) {this->reactorOutput = output; };
+    inline void setShield(float cur, float max, float th, float regen)
+        { this->shieldCur = cur; this->shieldMax = max; this->shieldTH = th; this->shieldRegen = regen;};
+    inline void setArmor(float cur, float max) { this->armorCur = cur; this->armorMax = max; updateHealth(); };
+    inline void setElectronic(float cur, float max, float th, float regen)
+        { this->electronicCur = cur; this->electronicMax = max; this->electronicTH = th; this->electronicRegen = regen; };
+    inline void setEngine( float speedBase) {this->engineSpeedBase = speedBase; };
+    inline void setEnergyShare(float shield, float weapon, float engine)
+        { float tmp = shield + weapon + engine; if (unlikely (tmp > 1)) { tmp = 1/tmp; }
+          // dirty safty hack, prevents total share being bigger than 1!!
+          this->shieldEnergyShare = shield * tmp;
+          this->weaponEnergyShare = weapon * tmp;
+          this->engineEnergyShare = engine * tmp; };
+    inline void setWeapon(float regen) { this->weaponEnergyRegen = regen; };
+
+    //!< Resynchonizes armor with health in WE!!
+    inline void updateHealth() { this->setHealth(this->armorCur); this->setHealthMax(this->armorMax); };
+
     //Functions for GUI
     inline float getShieldCur() { return this->shieldCur; };        //!< returns current shield value
@@ -86 +104 @@
     virtual void movement (float dt);
 
-    //
+
 
     void nextWeaponConfig();
@@ -92 +110 @@
 
     virtual void hit(float damage, WorldEntity* killer);
-    
+
     void                  setCameraDistance(float dist);
 
@@ -147 +165 @@
 
     float       reactorOutput;      //!< reactor output 
-    float       reactorCapacity;    //!< reactor capacity
+//    float       reactorCapacity;    //!< reactor capacity
 
     int         curWeaponPrimary;   //!< current primary weapon config 
@@ -208 +226 @@
 
     byte                  oldMask;            //!< used for synchronisation
-
+/*
     Trail*                trail;              //!< Burst trail
     Trail*                trailL;              //!< Burst trail
     Trail*                trailR;              //!< Burst trail
-
+*/
 
 };