Changeset 10772 in orxonox.OLD

Timestamp:

Jul 2, 2007, 3:57:53 PM (17 years ago)

Author:

nicolasc

Message:

some minor cleanup

Location:

branches/presentation/src

Files:

• lib/lang/base_object.cc (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)
• world_entities/weapons/disruptor.cc (modified) (1 diff)
• world_entities/weapons/light_blaster.cc (modified) (1 diff)
• world_entities/weapons/nadion_laser.cc (modified) (1 diff)
• world_entities/weapons/rf_cannon.cc (modified) (1 diff)
• world_entities/weapons/weapon.cc (modified) (4 diffs)
• world_entities/weapons/weapon.h (modified) (5 diffs)

branches/presentation/src/lib/lang/base_object.cc

@@ -33 +33 @@
   this->xmlElem = NULL;
   this->registerObject(this, BaseObject::_objectList);
-
-  srand(time(0));   //initialize Random Nomber Generator
 }
 
@@ -47 +45 @@
   this->xmlElem = (bo.xmlElem)? bo.xmlElem->Clone() : NULL;
   this->registerObject( this, BaseObject::_objectList);
-
-//   srand(time(0));   //initialize Random Nomber Generator
 }
 

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

@@ -24 +24 @@
 #include "world_entities/weapons/weapon_manager.h"
 
-#include "weapons/test_gun.h"
 #include "weapons/light_blaster.h"
 #include "weapons/medium_blaster.h"
@@ -34 +33 @@
 #include "weapons/spike_thrower.h"
 #include "weapons/acid_launcher.h"
-#include "weapons/boomerang_gun.h"
-#include "weapons/turret.h"
-#include "weapons/cannon.h"
 
 #include "elements/glgui_energywidgetvertical.h"

branches/presentation/src/world_entities/weapons/disruptor.cc

@@ -92 +92 @@
   this->setEmissionPoint(Vector(1.672, 0.0, 0.0) * this->getScaling());
 
-  this->getShootAnim(0, 0)->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
-  this->getShootAnim(0, 0)->addKeyFrame(Vector(-0.5, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
+  this->getShootAnim(0, 0)->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.033, ANIM_LINEAR, ANIM_NULL);
+  this->getShootAnim(0, 0)->addKeyFrame(Vector(-0.5, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
 //   this->shootAnim[0][0]->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
 

branches/presentation/src/world_entities/weapons/light_blaster.cc

@@ -84 +84 @@
 
   this->setBarrels(3);
-  this->setSegs(1); //could be left out
+//   this->setSegs(1); //could be left out
 
   this->setEmissionPoint(Vector(2.2, 0.0, 0.1), 0);

branches/presentation/src/world_entities/weapons/nadion_laser.cc

@@ -86 +86 @@
 
 
-  this->setBarrels(1); // could be left out
-  this->setSegs(1);    // could be left out
+//   this->setBarrels(1); // could be left out
+//   this->setSegs(1);    // could be left out
 
   this->setEmissionPoint(Vector(1.680, 0.0, 0.0) * this->getScaling());

branches/presentation/src/world_entities/weapons/rf_cannon.cc

@@ -85 +85 @@
 
   this->setBarrels(4);
-  this->setSegs(1);
+//   this->setSegs(1);
   this->setActiveBarrel(rand() % 4);
 

branches/presentation/src/world_entities/weapons/weapon.cc

@@ -12 +12 @@
 ### File Specific
    main-programmer: Patrick Boenzli
-   co-programmer: Benjamin Grauer
+   co-programmer: Benjamin Grauer, Nicolas Schlumberger
 
    2005-07-15: Benjamin Grauer: restructurating the entire Class
@@ -63 +63 @@
     delete this->soundSource;
 
+//!< PNode must not be deleted, gc takes care of.
 //   for (int i = 0; i < MAX_BARRELS; i++)
 //   {
@@ -132 +133 @@
 
   this->barrels = 1;  // just to have an initial value
-  this->segs = 1;
-  this->activeBarrel = 0;
+  this->segs = 0;     // by default there are no movable parts
+  this->activeBarrel = 0; //array wize, 0 means first barrel
 
   this->preferedSide = -1;
@@ -163 +164 @@
   this->maxCharge = 1.0;                           //< The maximum charge is also one unit.
 
-  this->energy = 10.0;                               //< The secondary Buffer (before we have to reload)
+  this->energy = 10.0;                             //< The secondary Buffer (before we have to reload)
   this->energyMax = 10.0;                          //< How much energy can be carried
   this->capability = WTYPE_ALL;                    //< The Weapon has all capabilities @see W_Capability.
 
   this->energyWidget = NULL;
-  isEnergyWidgetInitialized = false;
+  isEnergyWidgetInitialized = false;               // FIXME, needs to be cleaned
 
   // set this object to be synchronized over network

branches/presentation/src/world_entities/weapons/weapon.h

@@ -193 +193 @@
 
     Animation3D* getShootAnim(int barrel, int seg) { return this->shootAnim[barrel][seg]; };
-//     void setShootAnim(int barrel, int seg, PNode* component) { this->shootAnim[barrel][seg] = this->getAnimation(barrel, seg, component); };
-
-//     void init2();
-//     void deconstr();
 
     inline int getPreferedSide() { return this->preferedSide; }
@@ -203 +199 @@
     inline void setEnergyWidgetInitialized(bool b) {this->isEnergyWidgetInitialized = b;};
 
+    //some functions for conveneance
     inline const Vector& getObjComp(int barrel, int seg) const { return this->objComp[barrel][seg]->getAbsCoor(); };
     inline const float getObjCompx(int barrel, int seg) const { return this->objComp[barrel][seg]->getAbsCoor().x; };
@@ -259 +256 @@
     float                maxCharge;                        //!< The maximal energy to be loaded onto one projectile (this is only availible if chargeable is enabled)
 
-    //OrxGui::GLGuiEnergyWidgetVertical* energyWidget;
-
     PNode*               defaultTarget;                    //!< A target for targeting Weapons.
 
@@ -277 +272 @@
     OrxSound::SoundBuffer  soundBuffers[WA_ACTION_COUNT];   //!< SoundBuffers for all actions @see WeaponAction.
 
-    PNode*                 emissionPoint[MAX_BARRELS];                   //!< The point, where the projectiles are emitted. (this is coppled with the Weapon by default)
+    PNode*                 emissionPoint[MAX_BARRELS];      //!< The point, where the projectiles are emitted.
 
     bool                   hideInactive;                    //!< Hides the Weapon if it is inactive
@@ -287 +282 @@
     int                    barrels;                         //!< # of barrels (max 4)
     int                    segs;                            //!< # of segments, one barrel has (max 3)
-    int                    activeBarrel;
+    int                    activeBarrel;                    //!< set # of active barrel, count array wise (aka. 0 is the first)
     Animation3D*           shootAnim[MAX_BARRELS][MAX_SEGMENTS];
     PNode*                 objComp[MAX_BARRELS][MAX_SEGMENTS];