Changeset 9975 in orxonox.OLD

Timestamp:

Nov 29, 2006, 5:15:10 PM (17 years ago)

Author:

marcscha

Message:

fixes

Location:

branches/playability/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• player.cc (modified) (2 diffs)
• player.h (modified) (3 diffs)
• space_ships/playership.cc (deleted)
• space_ships/playership.h (deleted)
• space_ships/space_ship.cc (modified) (1 diff)
• space_ships/space_ship.h (modified) (2 diffs)
• weapons/heavy_blaster.cc (modified) (2 diffs)
• weapons/heavy_blaster.h (modified) (1 diff)
• weapons/light_blaster.cc (modified) (3 diffs)
• weapons/light_blaster.h (modified) (1 diff)
• weapons/medium_blaster.cc (modified) (2 diffs)
• weapons/medium_blaster.h (modified) (1 diff)

branches/playability/src/world_entities/WorldEntities.am

@@ -54 +54 @@
                 \
                 world_entities/space_ships/space_ship.cc \
-                world_entities/space_ships/playership.cc \
                 world_entities/space_ships/helicopter.cc \
                 world_entities/space_ships/hover.cc \
@@ -162 +161 @@
                 \
                 space_ships/space_ship.h \
-                space_ships/playership.h \
                 space_ships/helicopter.h \
                 space_ships/hover.h \

branches/playability/src/world_entities/player.cc

@@ -23 +23 @@
 
 #include "debug.h"
-
-#include "world_entities/space_ships/playership.h"
 
 ObjectListDefinition(Player);
@@ -130 +128 @@
 }
 
-PlayerShip* Player::getPlayerShip()
-{
-  return this->playership;
-}
 
-void Player::setPlayerShip(PlayerShip* playership)
-{
-  this->playership = playership;
-}
-
-

branches/playability/src/world_entities/player.h

@@ -10 +10 @@
 
 #include "util/hud.h"
-#include "world_entities/space_ships/playership.h"
 
 /* Forward Declaration */
@@ -32 +31 @@
     bool              setPlayable(Playable* controllalble);
     bool              eject();
-    void              setPlayerShip(PlayerShip playership);
-    PlayerShip*       getPlayerShip();
     inline Playable*  getPlayable() const  { return this->playable; };
 
@@ -50 +47 @@
     Playable*         playable;                 //!< The one we controll or NULL if none
     Hud               _hud;                     //!< The HUD to be displayed for this Player.
-    PlayerShip        playership;
 };
 

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

@@ -691 +691 @@
   
 }
+
+void SpaceShip::enterPlaymode(Playable::Playmode playmode)
+{
+}
+
+void SpaceShip::movement (float dt)
+{
+}

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

@@ -151 +151 @@
     float                 rotation;
 
-    /*
+    // FIXME until other fixme removal needed
     Quaternion            mouseDir;           //!< the direction where the player wants to fly
     Quaternion            oldMouseDir;        //!< the direction where the player wanted to fly
@@ -159 +159 @@
     Quaternion            pitchDir;
     float                 dogdeSpeed;        //!< the dogde Speed of the ship.
-    */
+    // FIXME
 
     Quaternion            direction;          //!< the direction of the ship.

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

@@ -1 +1 @@
 #include "heavy_blaster.h"
+#include "world_entities/projectiles/projectile.h"
+
+#include "world_entity.h"
+#include "static_model.h"
+#include "weapon_manager.h"
+#include "util/loading/factory.h"
+
+#include "animation3d.h"
+
+#include "loading/fast_factory.h"
+
+CREATE_FACTORY(HeavyBlaster);
+/**
+ * Standard constructor
+ */
+HeavyBlaster::HeavyBlaster ()
+ : Weapon()
+{
+    this->init();
+}
 
 HeavyBlaster::HeavyBlaster (const TiXmlElement* root = NULL)
  : Weapon()
-  {
+{
     this->init();
     if (root != NULL)
       this->loadParams(root);
-  }
+}
 
 /**
@@ -13 +33 @@
  */
 HeavyBlaster::~HeavyBlaster()
-  {
+{
       // model will be deleted from WorldEntity-destructor
-  }
+}
+
+void HeavyBlaster::loadParams(const TiXmlElement* root)
+{
+  Weapon::loadParams(root);
+}
+
+void HeavyBlaster::init()
+{
+  //this->registerObject(this, HeavyBlaster::_objectList);
+
+//  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
+
+  this->loadModel("models/guns/plasmadriver_#.obj", 1.0);
+  
+
+  this->setStateDuration(WS_SHOOTING, 0.05);
+  this->setStateDuration(WS_RELOADING, 0);
+  this->setStateDuration(WS_ACTIVATING, .5);
+  this->setStateDuration(WS_DEACTIVATING, 1);
+
+  this->setEnergyMax(5000);
+  this->increaseEnergy(5000);
+  //this->minCharge = 2;
+
+  this->setActionSound(WA_SHOOT, "sound/laser.wav");
+  this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
+  this->setActionSound(WA_RELOAD, "sound/spawn/alien_generator.wav");
+
+  this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
+  this->setProjectileTypeC("RailProjectile");   // FIXME temp project type until the blaste class exist
+  this->prepareProjectiles(100);
+
+  Animation3D* animation2 = this->getAnimation(WS_ACTIVATING, this);
+  Animation3D* animation3 = this->getAnimation(WS_DEACTIVATING, this);
+
+  animation2->setInfinity(ANIM_INF_CONSTANT);
+  animation3->setInfinity(ANIM_INF_CONSTANT);
+
+  this->setEmissionPoint(3.8, 1.2, 0);
+
+  animation2->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
+  animation2->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.5, ANIM_LINEAR, ANIM_NULL);
+
+  animation3->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.5, ANIM_LINEAR, ANIM_NULL);
+  animation3->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
+}
 
 
+void HeavyBlaster::fire()
+{
+  Projectile* pj =  this->getProjectile();
+  if (pj == NULL)
+    return;
+
+  // set the owner
+  pj->setOwner(this->getOwner());
+
+  pj->setParent(PNode::getNullParent());
+
+  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
+
+  pj->setAbsCoor(this->getEmissionPoint());
+  pj->setAbsDir(this->getAbsDir());
+  pj->activate();
+}
+
+/**
+ *  this activates the weapon
+*/
+void HeavyBlaster::activate()
+{
+}
+
+/**
+ *  this deactivates the weapon
+*/
+void HeavyBlaster::deactivate()
+{
+}
+
+void HeavyBlaster::draw() const
+{
+}

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

@@ -12 +12 @@
 class HeavyBlaster : public Weapon
 {
-  ObjectListDeclaration(HeavyBlaster);
+  //ObjectListDeclaration(HeavyBlaster);
   public:
     HeavyBlaster();

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

@@ -44 +44 @@
 void LightBlaster::init()
 {
-  this->registerObject(this, LightBlaster::_objectList);
+  //this->registerObject(this, LightBlaster::_objectList);
 
 //  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
@@ -90 +90 @@
     return;
 
+  // set the owner
+  pj->setOwner(this->getOwner());
+
   pj->setParent(PNode::getNullParent());
 
-  pj->setVelocity(this->getVelocity() + this->getAbsDir().apply(Vector(1,0,0))*15+VECTOR_RAND(5));
+  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
 
   pj->setAbsCoor(this->getEmissionPoint());
@@ -112 +115 @@
 {
 }
+
+void LightBlaster::draw() const
+{
+}

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

@@ -12 +12 @@
 class LightBlaster : public Weapon
 {
-  ObjectListDeclaration(LightBlaster);
+  //ObjectListDeclaration(LightBlaster);
   public:
     LightBlaster ();

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

@@ -1 +1 @@
 #include "medium_blaster.h"
+#include "world_entities/projectiles/projectile.h"
+
+#include "world_entity.h"
+#include "static_model.h"
+#include "weapon_manager.h"
+#include "util/loading/factory.h"
+
+#include "animation3d.h"
+
+#include "loading/fast_factory.h"
+
+CREATE_FACTORY(MediumBlaster);
+/**
+ * Standard constructor
+ */
+MediumBlaster::MediumBlaster ()
+ : Weapon()
+{
+    this->init();
+}
 
 MediumBlaster::MediumBlaster (const TiXmlElement* root = NULL)
  : Weapon()
-  {
+{
     this->init();
     if (root != NULL)
       this->loadParams(root);
-  }
+}
 
 /**
@@ -13 +33 @@
  */
 MediumBlaster::~MediumBlaster()
-  {
+{
       // model will be deleted from WorldEntity-destructor
-  }
+}
+
+void MediumBlaster::loadParams(const TiXmlElement* root)
+{
+  Weapon::loadParams(root);
+}
+
+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/plasmadriver_#.obj", 1.0);
+  
+
+  this->setStateDuration(WS_SHOOTING, 0.05);
+  this->setStateDuration(WS_RELOADING, 0);
+  this->setStateDuration(WS_ACTIVATING, .5);
+  this->setStateDuration(WS_DEACTIVATING, 1);
+
+  this->setEnergyMax(5000);
+  this->increaseEnergy(5000);
+  //this->minCharge = 2;
+
+  this->setActionSound(WA_SHOOT, "sound/laser.wav");
+  this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
+  this->setActionSound(WA_RELOAD, "sound/spawn/alien_generator.wav");
+
+  this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
+  this->setProjectileTypeC("RailProjectile");   // FIXME temp project type until the blaste class exist
+  this->prepareProjectiles(100);
+
+  Animation3D* animation2 = this->getAnimation(WS_ACTIVATING, this);
+  Animation3D* animation3 = this->getAnimation(WS_DEACTIVATING, this);
+
+  animation2->setInfinity(ANIM_INF_CONSTANT);
+  animation3->setInfinity(ANIM_INF_CONSTANT);
+
+  this->setEmissionPoint(3.8, 1.2, 0);
+
+  animation2->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
+  animation2->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.5, ANIM_LINEAR, ANIM_NULL);
+
+  animation3->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.5, ANIM_LINEAR, ANIM_NULL);
+  animation3->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
+}
 
 
+void MediumBlaster::fire()
+{
+  Projectile* pj =  this->getProjectile();
+  if (pj == NULL)
+    return;
+
+  // set the owner
+  pj->setOwner(this->getOwner());
+
+  pj->setParent(PNode::getNullParent());
+
+  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
+
+  pj->setAbsCoor(this->getEmissionPoint());
+  pj->setAbsDir(this->getAbsDir());
+  pj->activate();
+}
+
+/**
+ *  this activates the weapon
+*/
+void MediumBlaster::activate()
+{
+}
+
+/**
+ *  this deactivates the weapon
+*/
+void MediumBlaster::deactivate()
+{
+}
+
+void MediumBlaster::draw() const
+{
+}

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

@@ -12 +12 @@
 class MediumBlaster : public Weapon
 {
-  ObjectListDeclaration(MediumBlaster);
+  //ObjectListDeclaration(MediumBlaster);
   public:
     MediumBlaster();