Changeset 9235 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jul 5, 2006, 4:39:02 PM (18 years ago)

Author:

bensch

Message:

merged the presentation back

Location:

trunk/src/world_entities

Files:

• WorldEntities.am (modified) (6 diffs)
• camera.cc (modified) (1 diff)
• creatures/fps_player.cc (modified) (15 diffs)
• creatures/fps_player.h (modified) (4 diffs)
• effects/explosion.cc (modified) (3 diffs)
• environments/mapped_water.cc (modified) (6 diffs)
• environments/model_entity.cc (modified) (3 diffs)
• npcs/attractor_mine.cc (copied) (copied from branches/presentation/src/world_entities/npcs/attractor_mine.cc)
• npcs/attractor_mine.h (copied) (copied from branches/presentation/src/world_entities/npcs/attractor_mine.h)
• npcs/gate.cc (copied) (copied from branches/presentation/src/world_entities/npcs/gate.cc)
• npcs/gate.h (copied) (copied from branches/presentation/src/world_entities/npcs/gate.h)
• npcs/generic_npc.cc (modified) (3 diffs)
• npcs/generic_npc.h (modified) (1 diff)
• npcs/ground_turret.cc (modified) (1 diff)
• npcs/ground_turret.h (modified) (1 diff)
• npcs/npc.cc (modified) (2 diffs)
• npcs/npc_test.cc (modified) (6 diffs)
• npcs/npc_test.h (modified) (2 diffs)
• npcs/npc_test1.cc (modified) (1 diff)
• npcs/space_turret.cc (copied) (copied from branches/presentation/src/world_entities/npcs/space_turret.cc)
• npcs/space_turret.h (copied) (copied from branches/presentation/src/world_entities/npcs/space_turret.h)
• playable.cc (modified) (4 diffs)
• playable.h (modified) (2 diffs)
• projectiles/boomerang_projectile.cc (copied) (copied from branches/presentation/src/world_entities/projectiles/boomerang_projectile.cc)
• projectiles/boomerang_projectile.h (copied) (copied from branches/presentation/src/world_entities/projectiles/boomerang_projectile.h)
• projectiles/guided_missile.cc (modified) (4 diffs)
• projectiles/guided_missile.h (modified) (1 diff)
• projectiles/hyperblast.cc (modified) (1 diff)
• projectiles/hyperblast.h (modified) (1 diff)
• projectiles/laser.cc (modified) (4 diffs)
• projectiles/laser.h (modified) (1 diff)
• projectiles/projectile.cc (modified) (3 diffs)
• projectiles/projectile.h (modified) (1 diff)
• projectiles/rail_projectile.cc (copied) (copied from branches/presentation/src/world_entities/projectiles/rail_projectile.cc)
• projectiles/rail_projectile.h (copied) (copied from branches/presentation/src/world_entities/projectiles/rail_projectile.h)
• projectiles/rocket.cc (modified) (2 diffs)
• projectiles/rocket.h (modified) (1 diff)
• projectiles/test_bullet.cc (modified) (2 diffs)
• projectiles/test_bullet.h (modified) (1 diff)
• script_trigger.cc (modified) (4 diffs)
• skydome.cc (modified) (6 diffs)
• space_ships/cruizer.cc (modified) (1 diff)
• space_ships/helicopter.cc (modified) (2 diffs)
• space_ships/helicopter.h (modified) (2 diffs)
• space_ships/hover.cc (modified) (7 diffs)
• space_ships/hover.h (modified) (2 diffs)
• space_ships/space_ship.cc (modified) (4 diffs)
• space_ships/space_ship.h (modified) (1 diff)
• space_ships/spacecraft_2d.cc (modified) (12 diffs)
• space_ships/spacecraft_2d.h (modified) (1 diff)
• spawning_point.cc (modified) (7 diffs)
• test_entity.cc (modified) (2 diffs)
• test_entity.h (modified) (1 diff)
• weapons/aiming_system.cc (copied) (copied from branches/presentation/src/world_entities/weapons/aiming_system.cc)
• weapons/aiming_system.h (copied) (copied from branches/presentation/src/world_entities/weapons/aiming_system.h)
• weapons/boomerang_gun.cc (copied) (copied from branches/presentation/src/world_entities/weapons/boomerang_gun.cc)
• weapons/boomerang_gun.h (copied) (copied from branches/presentation/src/world_entities/weapons/boomerang_gun.h)
• weapons/fps_sniper_rifle.cc (modified) (2 diffs)
• weapons/laser_cannon.cc (copied) (copied from branches/presentation/src/world_entities/weapons/laser_cannon.cc)
• weapons/laser_cannon.h (copied) (copied from branches/presentation/src/world_entities/weapons/laser_cannon.h)
• world_entity.cc (modified) (8 diffs)
• world_entity.h (modified) (4 diffs)

trunk/src/world_entities/WorldEntities.am

@@ -4 +4 @@
                 world_entities/npcs/npc_test.cc \
                 world_entities/npcs/ground_turret.cc \
+                world_entities/npcs/space_turret.cc \
                 world_entities/npcs/generic_npc.cc \
                 world_entities/npcs/door.cc \
+                world_entities/npcs/gate.cc \
                 world_entities/npcs/repair_station.cc \
+                world_entities/npcs/attractor_mine.cc \
                 \
                 world_entities/environment.cc \
@@ -22 +25 @@
                 \
                 world_entities/weapons/test_gun.cc \
+                world_entities/weapons/laser_cannon.cc \
                 world_entities/weapons/turret.cc \
                 world_entities/weapons/aiming_turret.cc \
@@ -28 +32 @@
                 world_entities/weapons/hyperblaster.cc \
                 world_entities/weapons/aim.cc \
+                world_entities/weapons/aiming_system.cc \
                 world_entities/weapons/fps_sniper_rifle.cc \
+                world_entities/weapons/boomerang_gun.cc \
                 \
                 world_entities/projectiles/bomb.cc \
                 world_entities/projectiles/laser.cc \
+                world_entities/projectiles/rail_projectile.cc \
                 world_entities/projectiles/test_bullet.cc \
                 world_entities/projectiles/rocket.cc \
                 world_entities/projectiles/guided_missile.cc \
+                world_entities/projectiles/boomerang_projectile.cc \
                 world_entities/projectiles/hyperblast.cc \
                 \
@@ -70 +78 @@
                 npcs/npc_test1.h \
                 npcs/ground_turret.h \
+                npcs/space_turret.h \
                 npcs/door.cc \
-                npcs/repair_station.cc \
+                npcs/repair_station.h \
+                npcs/attractor_mine.h \
                 \
                 environment.h \
@@ -87 +97 @@
                 \
                 weapons/test_gun.h \
+                weapons/laser_cannon.cc \
                 weapons/cannon.h \
                 weapons/hyperblaster.h \
@@ -92 +103 @@
                 weapons/aiming_turret.h \
                 weapons/targeting_turret.h \
+                weapons/boomerang_gun.h \
                 weapons/aim.h \
+                weapons/aiming_system.h \
                 weapons/fps_sniper_rifle.h \
                 \
                 projectiles/bomb.h \
                 projectiles/laser.h \
+                projectiles/rail_projectile.h \
                 projectiles/test_bullet.h \
                 projectiles/rocket.h \
                 projectiles/guided_missile.h \
+                projectiles/boomerang_projectile.h \
                 projectiles/hyperblast.h \
                 \

trunk/src/world_entities/camera.cc

@@ -36 +36 @@
   this->setFovy(90);
   this->setAspectRatio(1.2f);
-  this->setClipRegion(.1, 2000);
+  this->setClipRegion(.1, 10000);
 
   this->setViewMode(Camera::ViewNormal);

trunk/src/world_entities/creatures/fps_player.cc

@@ -29 +29 @@
 #include "weapons/cannon.h"
 #include "weapons/fps_sniper_rifle.h"
+#include "weapons/aiming_system.h"
 
 #include "aabb.h"
+
 
 #include "key_mapper.h"
@@ -57 +59 @@
 {
   this->setPlayer(NULL);
+
+  if( this->aimingSystem)
+    delete this->aimingSystem;
 }
 
@@ -81 +86 @@
 {
   this->setClassID(CL_FPS_PLAYER, "FPSPlayer");
-
 
   this->bLeft = false;
@@ -89 +93 @@
   this->bJump = false;
   this->bPosBut = false;
+  this->bFire = false;
 
   this->xMouse = 0.0f;
@@ -125 +130 @@
 
 //   this->addWeapon(wpLeft, 1, 0);
-  this->addWeapon(wpRight,1, 0);
+  if( State::isOnline())
+    this->addWeapon(wpRight,1, 0);
   this->getWeaponManager().changeWeaponConfig(1);
 
   this->getWeaponManager().setSlotCount(2);
-//   this->getWeaponManager().setSlotDirection(0, Quaternion(M_PI_2, Vector(0,1,0)));
+  this->getWeaponManager().setSlotDirection(0, Quaternion(M_PI_4*-0.55f, Vector(0,0,1)));
   this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
   this->getWeaponManager().setSlotDirection(1, Quaternion(M_PI_4*.5, Vector(1,0,0)));
@@ -135 +141 @@
   this->getWeaponManager().setSlotPosition(1, Vector(5.0, 0.0, 0.0));
 
+//   this->getWeaponManager().getFixedTarget()->setRelDir(Quaternion(M_PI_4*-0.6f, Vector(0,0,1)));
+
 
   this->getWeaponManager().setParentNode(&this->cameraNode);
@@ -141 +149 @@
   this->getWeaponManager().getFixedTarget()->setParent(&this->cameraNode);
   this->getWeaponManager().getFixedTarget()->setRelCoor(1000,0,0);
+
+  this->aimingSystem = new AimingSystem(this);
+  //this->addChild(this->aimingSystem);
+  wpRight->addChild(this->aimingSystem);
+//   this->getWeaponManager().sl
 
 
@@ -148 +161 @@
   registerVar( new SynchronizeableBool( &bForward, &bForward, "bForward", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableBool( &bBackward, &bBackward, "bBackward", PERMISSION_OWNER ) );
+  registerVar( new SynchronizeableBool( &bJump, &bJump, "bJump", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &heading, &heading, "heading", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &attitude, &attitude, "attitude", PERMISSION_OWNER ) );
+
+    //subscribe to collision reaction
+  this->subscribeReaction(CREngine::CR_PHYSICS_FULL_WALK, CL_BSP_ENTITY);
+
+  this->initWeapon = false;
+  this->damageTicker = 0.0f;
+
+  if( State::isOnline())
+    toList( OM_PLAYERS );
 }
 
@@ -192 +215 @@
   this->getWeaponManager().getFixedTarget()->setRelCoor(0,0,0);
 
-
-  AABB* box = this->getModelAABB();
-  if( box != NULL)
-  {
-    State::getCameraNode()->setRelCoor(0, box->halfLength[1] * 2.0f, 0);
-    State::getCameraTargetNode()->setRelCoor(10, box->halfLength[1] * 2.0f, 0);
-
-    this->getWeaponManager().setSlotPosition(0, Vector(1.5, box->halfLength[1] * 2.0f - 0.7, 1.1));
-    this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * 2.0f, 0.0));
+  if ( !State::isOnline() )
+  {
+    this->respawn();
   }
 }
@@ -219 +236 @@
 {
 
-  if( this->bPosBut)
-  {
-    this->bPosBut = false;
-    printf("mechanic2:walkTo( %f, mtheight, %f)\n",this->getAbsCoorX(),this->getAbsCoorZ());
-  }
-
-  Playable::tick( time );
+  if ( !this->initWeapon )
+  {
+    this->initWeapon = true;
+
+    this->cameraNode.setParentMode(PNODE_ROTATE_AND_MOVE);
+
+    this->getWeaponManager().getParentNode()->setParentMode(PNODE_ROTATE_AND_MOVE);
+    this->getWeaponManager().getFixedTarget()->setParent(&this->cameraNode);
+    this->getWeaponManager().getFixedTarget()->setParentMode(PNODE_ROTATE_AND_MOVE);
+
+
+    this->aimingSystem->toList(OM_GROUP_01);
+    this->aimingSystem->setParent(&this->cameraNode);
+//     this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
+    this->aimingSystem->setRelDir(Quaternion(M_PI_4*-0.58f, Vector(0,0,1)));
+    this->aimingSystem->setRelCoor(0, -1, -1);
+
+
+    AABB* box = this->getModelAABB();
+    if( box != NULL)
+    {
+      float f = 1.0;
+      this->cameraNode.setRelCoor(0, box->halfLength[1] * f, 0);
+//       this->cameraNode.setRelCoor(10, box->halfLength[1] * f, 0);
+
+      float v = 0.1f;
+      this->getWeaponManager().setSlotPosition(0, Vector(-8.0, box->halfLength[1] * v, 1.1));
+      this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * v, 0.0));
+    }
+  }
+
+
+  this->getWeaponManager().tick(time);
+  if( this->bFire)
+  {
+    this->getWeaponManager().fire();
+
+//     WorldEntity* target = this->aimingSystem->getNearestTarget();
+//     if( target != NULL)
+//     {
+//       PRINTF(0)("hit hit hit, got: %s\n", target->getClassName());
+//     }
+//     else
+//     {
+//       PRINTF(0)("nothing hit\n");
+//     }
+  }
+
+
+  //dealing damage
+
+  if ( State::isOnline() && SharedNetworkData::getInstance()->isGameServer() )
+  {
+    this->damageTicker -= time;
+
+    if ( this->damageTicker <= 0.0f && this->beFire() )
+    {
+      this->damageTicker = 0.25;
+
+      WorldEntity * victim = aimingSystem->getNearestTarget();
+
+      if ( victim )
+      {
+        PRINTF(0)("FIRE: hit %s\n", victim->getClassName());
+        victim->hit( 20, this );
+      }
+      else
+      {
+        PRINTF(0)("FIRE: nothing hit\n");
+      }
+    }
+  }
+
 
   if( ( xMouse != 0 || yMouse != 0 ) && (this->getOwner() == SharedNetworkData::getInstance()->getHostID() || !State::isOnline() ) )
@@ -235 +318 @@
     attitude-= yMouse;
 
-    if ( attitude > 2.05 )
-      attitude = 2.05;
-
-    else if ( attitude < -1.15 )
-      attitude = -1.15;
+
+    if ( attitude > 1.95 )
+      attitude = 1.95;
+    else if ( attitude < -1.07 )
+      attitude = -1.07;
 
     xMouse = yMouse = 0;
@@ -304 +387 @@
     this->fallVelocity += 300.0f * time;
     velocity -= Vector(0.0, 1.0, 0.0) * this->fallVelocity;
+
+//     PRINTF(0)("vel %f\n", this->fallVelocity);
   }
   else
@@ -309 +394 @@
     this->fallVelocity = 0.0f;
   }
-
 
   this->shiftCoor( velocity*time );
@@ -346 +430 @@
   }
 
+  this->setOnGround(false);
+  this->aimingSystem->flushList();
 }
 
@@ -383 +469 @@
   }
   else if( event.type == KeyMapper::PEV_JUMP)
+  {
     this->bJump = event.bPressed;
-    this->bPosBut = event.bPressed;
-}
-
-
-
-
+  }
+  else if( event.type == KeyMapper::PEV_FIRE1)
+  {
+    this->bFire = event.bPressed;
+  }
+}
+
+
+void FPSPlayer::respawn( )
+{
+  if( State::isOnline())
+    toList( OM_PLAYERS );
+
+  this->damageTicker = 0.0f;
+
+  Playable::respawn();
+}
+
+
+void FPSPlayer::destroy( WorldEntity* killer )
+{
+  Playable::destroy( killer );
+
+  toList( OM_DEAD );
+}
+

trunk/src/world_entities/creatures/fps_player.h

@@ -9 +9 @@
 
 #include "playable.h"
+
+
+class AimingSystem;
 
 
@@ -27 +30 @@
     virtual void reset();
 
+    virtual void destroy(WorldEntity* killer);
+    virtual void respawn();
 
     virtual void tick(float time);
@@ -43 +48 @@
     bool                  bJump;              //!< jumping
     bool                  bPosBut;             //!< position button
+    bool                  bFire;              //!< fire button
 
     float                 xMouse;             //!< mouse moved in x-Direction
@@ -55 +61 @@
     float                 fallVelocity;        //!< velocity for falling down
     float                 jumpForce;           //!< the jump force
+
+    bool                  initWeapon;
+
+    AimingSystem*         aimingSystem;        //!< aiming system of the player
+
+    float                 damageTicker;        //!< ticker for dealing damage
 };
 

trunk/src/world_entities/effects/explosion.cc

@@ -40 +40 @@
   this->toList(OM_DEAD_TICK);
 
-  this->emitter = new BoxEmitter(Vector(10,10,10), 500, 45, M_2_PI);
+  this->emitter = new BoxEmitter(Vector(10,10,10), 200, 45, M_2_PI);
   this->emitter->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
   this->emitter->setParent(this);
@@ -83 +83 @@
     Explosion::explosionParticles->setLifeSpan(1.5, .3);
     Explosion::explosionParticles->setRadius(0.0, 10);
-    Explosion::explosionParticles->setRadius(.5, 15.0);
+    Explosion::explosionParticles->setRadius(.5, 30.0);
     Explosion::explosionParticles->setRadius(1.0, 10.0);
     Explosion::explosionParticles->setColor(0.0, 1,0,0,1);
@@ -113 +113 @@
 void Explosion::tick (float dt)
 {
-  printf("%f %f\n", this->lifeCycle, this->lifeTime);
   this->lifeCycle += dt;
   if(this->lifeTime < this->lifeCycle)

trunk/src/world_entities/environments/mapped_water.cc

@@ -337 +337 @@
 {
   // it's not too nice, but it works fine
-  PRINTF(0)("\nMappedWater XML Code:\n<MappedWater>\n  <waterpos>%f, %f, %f</waterpos>\n  <watersize>%f, %f</watersize>\n  <wateruv>%f</wateruv>\n  <waterflow>%f</waterflow>\n  <lightpos>%f, %f, %f</lightpos>\n  <waterangle>%f</waterangle>\n  <normalmapscale>%f</normalmapscale>\n  <shinesize>%f</waterpos>\n  <shinestrength>%f</shinestrength>\n  <reflstrength>%f</reflstrength>\n  <refraction>%f</refraction>\n  <watercolor>%f, %f, %f</watercolor>\n</MappedWater>\n", this->waterVerts[0], this->waterHeight, this->waterVerts[1], this->xWidth, this->zWidth, this->waterUV, this->waterFlow, this->lightPos.x, this->lightPos.y, this->lightPos.z, this->waterAngle, this->kNormalMapScale, this->shineSize, this->shineStrength, this->reflStrength, this->refraction, this->waterColor.x, this->waterColor.y, this->waterColor.z);
+  PRINT(0)("\nMappedWater XML Code:\n<MappedWater>\n");
+
+  PRINT(0)("  <waterpos>%f, %f, %f</waterpos>\n", this->waterVerts[0], this->waterHeight, this->waterVerts[1]);
+  PRINT(0)("  <watersize>%f, %f</watersize>\n", this->xWidth, this->zWidth);
+  PRINT(0)("  <wateruv>%f</wateruv>\n", this->waterUV);
+  PRINT(0)("  <waterflow>%f</waterflow>\n", this->waterFlow);
+  PRINT(0)("  <lightpos>%f, %f, %f</lightpos>\n", this->lightPos.x, this->lightPos.y, this->lightPos.z);
+  PRINT(0)("  <waterangle>%f</waterangle>\n", this->waterAngle);
+  PRINT(0)("  <normalmapscale>%f</normalmapscale>\n", this->kNormalMapScale);
+  PRINT(0)("  <shinesize>%f</shinesize>\n", this->shineSize);
+  PRINT(0)("  <shinestrength>%f</shinestrength>\n", this->shineStrength);
+  PRINT(0)("  <reflstrength>%f</reflstrength>\n", this->reflStrength);
+  PRINT(0)("  <refraction>%f</refraction>\n", this->refraction);
+  PRINT(0)("  <watercolor>%f, %f, %f</watercolor>\n", this->waterColor.x, this->waterColor.y, this->waterColor.z);
+
+  PRINT(0)("</MappedWater>\n");
 }
 
@@ -475 +490 @@
 
         OrxGui::GLGuiSlider* lightPosX = new OrxGui::GLGuiSlider();
-        lightPosX->setRange(-600, 600);
+        lightPosX->setRange(-4000, 4000);
         lightPosX->setValue(this->lightPos.x);
         lightPosX->setStep(15);
@@ -482 +497 @@
 
         OrxGui::GLGuiSlider* lightPosY = new OrxGui::GLGuiSlider();
-        lightPosY->setRange(-600, 600);
+        lightPosY->setRange(-4000, 4000);
         lightPosY->setStep(15);
         lightPosY->setValue(this->lightPos.y);
@@ -489 +504 @@
 
         OrxGui::GLGuiSlider* lightPosZ = new OrxGui::GLGuiSlider();
-        lightPosZ->setRange(-600, 600);
+        lightPosZ->setRange(-4000, 4000);
         lightPosZ->setStep(15);
         lightPosZ->setValue(this->lightPos.z);
@@ -504 +519 @@
 
         OrxGui::GLGuiSlider* waterHeight = new OrxGui::GLGuiSlider();
-        waterHeight->setRange(-500, 500);
+        waterHeight->setRange(100, 370);
         waterHeight->setValue(this->waterHeight);
-        waterHeight->setStep(10);
+        waterHeight->setStep(4);
         waterHeight->connect(SIGNAL(waterHeight, valueChanged), this, SLOT(MappedWater, setWaterHeight));
         waterHeightBox->pack(waterHeight);
@@ -547 +562 @@
   glDisable(GL_BLEND);
 
+  // TODO change texture coords, so water doesnt look distorted when xWidth != zWidth
   glBegin(GL_QUADS);
   // The back left vertice for the water

trunk/src/world_entities/environments/model_entity.cc

@@ -32 +32 @@
 {
   this->setClassID(CL_MODEL_ENTITY, "ModelEntity");
-  this->toList(OM_ENVIRON_NOTICK);
+  this->toList(OM_ENVIRON);
 
   this->speed = NULL;
@@ -71 +71 @@
 void ModelEntity::setMomentum (float angle, float x, float y, float z)
 {
+  Vector v(x,y,z);
+  v.debug();
+  v.normalize();
+  v.debug();
+
   if (this->momentum == NULL)
     this->momentum = new Quaternion;
-  *this->momentum = Quaternion(angle, Vector(x, y, z));
+  *this->momentum = Quaternion(angle, v);
+
+  this->momentum->debug();
 }
 
@@ -82 +89 @@
 
   if (this->momentum != NULL)
-    this->shiftDir(*this->momentum * dt);
+  {
+    this->shiftDir((*this->momentum * dt ).getNormalized());
+    //this->getAbsDir().debug();
+  }
 }

trunk/src/world_entities/npcs/generic_npc.cc

@@ -82 +82 @@
 {
   this->setClassID(CL_GENERIC_NPC, "GenericNPC");
+
   this->toList(OM_GROUP_00);
 
@@ -206 +207 @@
 /**
  * each animation has to be initialized here
+ */
+/**
+ *
  */
 void GenericNPC::initNPC()
@@ -578 +582 @@
 
 
-void GenericNPC::destroy()
+void GenericNPC::destroy(WorldEntity* killer)
 {
   int randi = (int)(5.0f * (float)rand()/(float)RAND_MAX);

trunk/src/world_entities/npcs/generic_npc.h

@@ -77 +77 @@
 
 
-  void destroy();
+  virtual void destroy(WorldEntity* killer);
 
   private:

trunk/src/world_entities/npcs/ground_turret.cc

@@ -176 +176 @@
 }
 
-void GroundTurret::destroy()
+void GroundTurret::destroy(WorldEntity* killer)
 {
   this->setAbsDirSoft(Quaternion(-90, Vector(0,0,1)), 90);

trunk/src/world_entities/npcs/ground_turret.h

@@ -25 +25 @@
   virtual void leftWorld ();
 
-  virtual void destroy();
+  virtual void destroy(WorldEntity* killer);
 
   virtual void draw() const;

trunk/src/world_entities/npcs/npc.cc

@@ -19 +19 @@
 
 #include "npc.h"
-
-
-using namespace std;
 
 
@@ -51 +48 @@
 void NPC::loadParams(const TiXmlElement* root)
 {
-  if(root != NULL)
    WorldEntity::loadParams(root);
 }

trunk/src/world_entities/npcs/npc_test.cc

@@ -23 +23 @@
 #include "shader.h"
 #include "state.h"
-#include "stdlibincl.h"
 #include "debug.h"
 
+#include "loading/factory.h"
+#include "loading/load_param.h"
 
-using namespace std;
+#include "effects/explosion.h"
+
+CREATE_FACTORY(NPC2, CL_NPC_TEST2);
 
 
-NPC2::NPC2()
+NPC2::NPC2(const TiXmlElement* root)
   : NPC(NULL)
 {
@@ -36 +39 @@
 
   if ((float)rand()/RAND_MAX > .5f)
-    this->loadModel("models/ships/bolido.obj", 3);
+    this->loadModel("models/ships/bolido.obj", 6);
   else
-    this->loadModel("models/ships/gobblin.obj", 3);
+    this->loadModel("models/ships/gobblin.obj", 6);
+
+
+
 
   this->shader = NULL;
@@ -44 +50 @@
     this->shader = Shader::getShader("shaders/toon.vert", "shaders/toon.frag");
 
-  this->obj = gluNewQuadric();
+  this->randomRotAxis = VECTOR_RAND(1);
 
-  this->randomRotAxis = VECTOR_RAND(1);
+  if (root != NULL)
+    this->loadParams(root);
 }
 
@@ -54 +61 @@
   if (this->shader)
     Shader::unload(this->shader);
-  gluDeleteQuadric(this->obj);
+}
+
+
+void NPC2::loadParams(const TiXmlElement* root)
+{
+  NPC::loadParams(root);
+
+}
+
+
+void NPC2::destroy(WorldEntity* killer)
+{
+  Explosion::explode(this, Vector(10,10,10));
+  this->toList(OM_DEAD);
+
 }
 
@@ -67 +88 @@
 void NPC2::draw() const
 {
-//   glMatrixMode(GL_MODELVIEW);
-//   glPushMatrix();
-//   float matrix[4][4];
-//
-//   /* translate */
-//   glTranslatef (this->getAbsCoor ().x,
-//                 this->getAbsCoor ().y,
-//                 this->getAbsCoor ().z);
-//   /* rotate */
-//   this->getAbsDir ().matrix (matrix);
-//   glMultMatrixf((float*)matrix);
-//
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+  float matrix[4][4];
+
+  /* translate */
+  glTranslatef (this->getAbsCoor ().x,
+                this->getAbsCoor ().y,
+                this->getAbsCoor ().z);
+  /* rotate */
+  this->getAbsDir ().matrix (matrix);
+  glMultMatrixf((float*)matrix);
+
 //   if (this->shader != NULL && this->shader != Shader::getActiveShader())
 //     shader->activateShader();
-//   gluSphere(this->obj, 3, 10, 10);
+
+  this->getModel()->draw();
 //   shader->deactivateShader();
-//
-//
-// /*  if (this->model)
-//     this->model->draw();*/
-//   glPopMatrix();
+
+
+/*  if (this->model)
+    this->model->draw();*/
+  glPopMatrix();
 }
 
@@ -97 +119 @@
   //if (directin.len() < 100)
 //  this->shiftCoor(direction *dt * 5 * exp(-direction.len() / 30.0));
-  this->shiftDir(Quaternion(dt, this->randomRotAxis));
+//  this->shiftDir(Quaternion(dt, this->randomRotAxis));
 
 }

trunk/src/world_entities/npcs/npc_test.h

@@ -11 +11 @@
 
  public:
-  NPC2 ();
+  NPC2 (const TiXmlElement* root);
   virtual ~NPC2 ();
 
+  virtual void loadParams(const TiXmlElement* root);
 
   void addAI(AI* ai);
+
+  virtual void destroy(WorldEntity* killer);
 
   virtual void tick(float dt);
@@ -23 +26 @@
    Vector   randomRotAxis;
    Shader*  shader;
-   GLUquadricObj* obj;
-
 };
 

trunk/src/world_entities/npcs/npc_test1.cc

@@ -24 +24 @@
 #include "power_ups/turret_power_up.h"
 #include "power_ups/laser_power_up.h"
-
-using namespace std;
 
 

trunk/src/world_entities/playable.cc

@@ -67 +67 @@
   this->bDead = false;
 
-  //subscribe to collision reaction
-  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
 
   registerVar( new SynchronizeableInt( &score, &score, "score" ) );
@@ -393 +391 @@
   PRINTF(0)("Playable respawn\n");
   // only if this is the spaceship of the player
-  if( this == State::getPlayer()->getPlayable())
+  if( State::getGameRules() && State::getPlayer() && this == State::getPlayer()->getPlayable())
     State::getGameRules()->onPlayerSpawn();
 
@@ -403 +401 @@
 
 
-void Playable::destroy()
-{
-  Explosion::explode(dynamic_cast<PNode*>(this), Vector(1.0f, 1.0f, 1.0f));
-
-
+void Playable::destroy(WorldEntity* killer)
+{
   if( !this->bDead)
   {
@@ -416 +411 @@
       if( this == State::getPlayer()->getPlayable())
         State::getGameRules()->onPlayerDeath();
-
-      //     this->toList(OM_GROUP_05);
-      //HACK: moves the entity to an unknown place far far away: in the future, GameRules will look for that
-      this->setAbsCoor(-2000.0, -2000.0, -2000.0);
-
-      //explosion hack
-
     }
     this->bDead = true;
+    
+    if( State::getGameRules() != NULL)
+      State::getGameRules()->registerKill(Kill(killer, this));
   }
 }

trunk/src/world_entities/playable.h

@@ -80 +80 @@
 
   // WorldEntity Extensions
-  virtual void destroy();
+  virtual void destroy(WorldEntity* killer);
   virtual void respawn();
   virtual void collidesWith(WorldEntity* entity, const Vector& location);
@@ -90 +90 @@
   static const std::string& playmodeToString(Playable::Playmode playmode);
   static const std::string playmodeNames[];
+  
+  inline bool beFire(){ return this->bFire; }
+  inline void fire(bool bF){ this->bFire = bF;}
 
 protected:

trunk/src/world_entities/projectiles/guided_missile.cc

@@ -35 +35 @@
   this->setClassID(CL_GUIDED_MISSILE, "GuidedMissile");
 
-  this->loadModel("models/projectiles/orx-rocket.obj", .3);
+  this->loadModel("models/projectiles/orx-rocket.obj", 2.0);
   this->loadExplosionSound("sound/explosions/explosion_4.wav");
 
@@ -88 +88 @@
     GuidedMissile::trailParticles->setLifeSpan(1.0, .3);
     GuidedMissile::trailParticles->setRadius(0.0, .5);
-    GuidedMissile::trailParticles->setRadius(0.2, 2.0);
-    GuidedMissile::trailParticles->setRadius(.5, .8);
-    GuidedMissile::trailParticles->setRadius(1.0, .8);
+    GuidedMissile::trailParticles->setRadius(0.2, 4.0);
+    GuidedMissile::trailParticles->setRadius(.5, 1.5);
+    GuidedMissile::trailParticles->setRadius(1.0, 1.5);
     GuidedMissile::trailParticles->setColor(0.0, 1,0,0,.7);
     GuidedMissile::trailParticles->setColor(0.2, .8,.8,0,.5);
@@ -135 +135 @@
 {
   if (this->hitEntity != entity)
-    this->destroy();
+    this->destroy( entity );
   this->hitEntity = entity;
 }
@@ -180 +180 @@
  *  the function gets called, when the projectile is destroyed
  */
-void GuidedMissile::destroy ()
-{
-  Projectile::destroy();
+void GuidedMissile::destroy (WorldEntity* killer)
+{
+
+  printf("THIS SHOULD WORLk\n");
+
+  Projectile::destroy( killer );
   PRINTF(5)("DESTROY GuidedMissile\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.

trunk/src/world_entities/projectiles/guided_missile.h

@@ -26 +26 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float time);

trunk/src/world_entities/projectiles/hyperblast.cc

@@ -126 +126 @@
  *  the function gets called, when the projectile is destroyed
 */
-void Hyperblast::destroy ()
+void Hyperblast::destroy (WorldEntity* killer)
 {
-  Projectile::destroy();
+  Projectile::destroy( killer );
 
   PRINTF(5)("DESTROY Hyperblast\n");

trunk/src/world_entities/projectiles/hyperblast.h

@@ -27 +27 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float time);

trunk/src/world_entities/projectiles/laser.cc

@@ -42 +42 @@
 
   this->setMinEnergy(10);
-  this->setHealthMax(10);
+  this->setHealthMax(0);
   this->lifeSpan = 5.0;
 
@@ -88 +88 @@
   }
 
-  this->setHealth(10);
+  this->setDamage(0);
+  this->setHealth(0);
 }
 
@@ -107 +108 @@
 {
   if (this->hitEntity != entity && entity->isA(CL_NPC))
-    this->destroy();
+    this->destroy( entity );
   this->hitEntity = entity;
 }
@@ -128 +129 @@
  *  the function gets called, when the projectile is destroyed
 */
-void Laser::destroy ()
+void Laser::destroy (WorldEntity* killer)
 {
-  Projectile::destroy();
+  Projectile::destroy( killer );
   PRINTF(5)("DESTROY Laser\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.

trunk/src/world_entities/projectiles/laser.h

@@ -27 +27 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float dt);

trunk/src/world_entities/projectiles/projectile.cc

@@ -41 +41 @@
   /* character attributes */
   this->setHealth(1.0f);
-  this->setDamage(100.0f); // default damage of a projectile set to 100.0 damage points
+  this->setDamage(1.0f); // default damage of a projectile set to 100.0 damage points
 
   this->explosionBuffer = NULL;
@@ -162 +162 @@
 
   if (this->tickLifeCycle(dt))
-    this->destroy();
+    this->destroy( NULL );
 }
 
@@ -169 +169 @@
  *  the function gets called, when the projectile is destroyed
 */
-void Projectile::destroy ()
+void Projectile::destroy (WorldEntity* killer)
 {
   if (this->explosionBuffer != NULL)

trunk/src/world_entities/projectiles/projectile.h

@@ -41 +41 @@
     virtual void deactivate() = 0;
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float dt);

trunk/src/world_entities/projectiles/rocket.cc

@@ -128 +128 @@
 {
   if (this->hitEntity != entity)
-    this->destroy();
+    this->destroy( entity );
   this->hitEntity = entity;
 }
@@ -149 +149 @@
  *  the function gets called, when the projectile is destroyed
 */
-void Rocket::destroy ()
+void Rocket::destroy (WorldEntity* killer)
 {
-  Projectile::destroy();
+  Projectile::destroy( killer );
 
   PRINTF(5)("DESTROY Rocket\n");

trunk/src/world_entities/projectiles/rocket.h

@@ -27 +27 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float time);

trunk/src/world_entities/projectiles/test_bullet.cc

@@ -119 +119 @@
 {
   if (this->hitEntity != entity && entity->isA(CL_NPC))
-    this->destroy();
+    this->destroy( entity );
   this->hitEntity = entity;
 }
@@ -147 +147 @@
  *  the function gets called, when the projectile is destroyed
 */
-void TestBullet::destroy ()
+void TestBullet::destroy (WorldEntity* killer)
 {
   PRINTF(5)("DESTROY TestBullet\n");

trunk/src/world_entities/projectiles/test_bullet.h

@@ -27 +27 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float time);

trunk/src/world_entities/script_trigger.cc

@@ -29 +29 @@
              ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
             //Properties
+             ->addMethod("setName", ExecutorLua1<BaseObject, const std::string&>(&BaseObject::setName))
              ->addMethod("setTarget", ExecutorLua1<ScriptTrigger, const std::string&>(&ScriptTrigger::setTarget))
              ->addMethod("setTriggerParent", ExecutorLua1<ScriptTrigger, const std::string&>(&ScriptTrigger::setTriggerParent))
@@ -51 +52 @@
   this->toList(OM_COMMON);
 
+  radius = 10;
   returnCount = 1;
   scriptFinished = false;
@@ -71 +73 @@
   
   }
+  
 }
 
@@ -215 +218 @@
 void ScriptTrigger::setScript(const std::string& file)
 {
-
   ScriptManager* scriptManager = State::getScriptManager();
   if (scriptManager != NULL)

trunk/src/world_entities/skydome.cc

@@ -1 +1 @@
 /*
    orxonox - the future of 3D-vertical-scrollers
- 
+
    Copyright (C) 2006 orx
- 
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
- 
+
 ### File Specific:
    main-programmer: hdavid, amaechler
@@ -47 +47 @@
   this->toList(OM_BACKGROUND);
   this->toReflectionList();
-  
+  this->indices = NULL;
+  this->vertices = NULL;
+  this->planeVertices = NULL;
+  this->shader = NULL;
   activateDome = false;
 
@@ -91 +94 @@
   if(!activateDome)
     return;
-  
+
   glPushAttrib(GL_ENABLE_BIT);
 
   glDisable(GL_LIGHTING);
   glDisable(GL_BLEND);
+  glDisable(GL_FOG);
 
   glEnable(GL_TEXTURE_3D);
@@ -105 +109 @@
   glTranslatef(0.0f,pRadius,0.0f);
 
-
   glBegin(GL_TRIANGLES);
-
   for (int i=0; i < numIndices; i++)
   {
@@ -115 +117 @@
     glVertex3f(planeVertices[indices[i]].x, planeVertices[indices[i]].y, planeVertices[indices[i]].z);
   }
-
   glEnd();
 
+  WorldEntity::draw(); 
+
   glPopMatrix();
 
@@ -128 +131 @@
 void Skydome::generateSkyPlane(int divisions, float planetRadius, float atmosphereRadius, float hTile, float vTile)
 {
-  PRINTF(0)("Generating a sky plane");
+  PRINTF(0)("Generating a sky plane\n");
 
   // Make sure our vertex array is clear

trunk/src/world_entities/space_ships/cruizer.cc

@@ -78 +78 @@
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
-  this->loadModel("models/ships/human_cruizer.obj", 0.05);
+ // this->loadModel("models/ships/human_cruizer.obj", 0.05);
 
 }

trunk/src/world_entities/space_ships/helicopter.cc

@@ -43 +43 @@
                             ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
                             ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
-                            
+
                        );
 
@@ -124 +124 @@
 void Helicopter::init()
 {
+  this->chopperBuffer = NULL;
+
   this->setClassID(CL_HELICOPTER, "Helicopter");
-
   PRINTF(4)("HELICOPTER INIT\n");
 

trunk/src/world_entities/space_ships/helicopter.h

@@ -39 +39 @@
 
     virtual void process(const Event &event);
-    
+
     virtual void moveUp(bool move){bAscend = move;};
     virtual void moveDown(bool move){bDescend = move;};
@@ -78 +78 @@
     float                 airViscosity;
 
-    OrxSound::SoundSource soundSource;
-    OrxSound::SoundBuffer*chopperBuffer;
+    OrxSound::SoundSource  soundSource;
+    OrxSound::SoundBuffer* chopperBuffer;
 
 };

trunk/src/world_entities/space_ships/hover.cc

@@ -25 +25 @@
 
 #include "util/loading/factory.h"
+//#include "util/loading/resource_manager.h"
+
 #include "key_mapper.h"
 #include "state.h"
@@ -34 +36 @@
 CREATE_FACTORY(Hover, CL_HOVER);
 
+#include "script_class.h"
+CREATE_SCRIPTABLE_CLASS(Hover, CL_HOVER,
+                        addMethod("hasPlayer", ExecutorLua0ret<Playable,bool>(&Playable::hasPlayer))
+                        //Coordinates
+                        ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
+                        ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
+                        ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
+                        ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
+                       );
+
 /**
  *  destructs the hover, deletes alocated memory
@@ -40 +52 @@
 {
   this->setPlayer(NULL);
+
+  //if (this->hoverBuffer != NULL)
+  //  ResourceManager::getInstance()->unload(this->hoverBuffer);
 }
 
@@ -58 +73 @@
 
   this->loadParams(doc.RootElement());
+
+  //load sound
+  //if (this->hoverBuffer != NULL)
+  //  ResourceManager::getInstance()->unload(this->hoverBuffer);
+  //this->hoverBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/engine/hover.wav", WAV);
+
 }
 
@@ -97 +118 @@
 void Hover::init()
 {
+
+  //this->hitEntity = NULL;
+  //this->hoverBuffer = NULL;
+
   //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
   this->setClassID(CL_HOVER, "Hover");
@@ -112 +137 @@
   this->cameraLook = 0.0f;
   this->rotation = 0.0f;
-  this->acceleration = 25.0f;
+  this->acceleration = 15.0f;
   this->airFriction = 3.0f;
 
@@ -206 +231 @@
   State::getCameraNode()->setRelCoorSoft(-10, 0,0);
   State::getCameraTargetNode()->setParentSoft(&this->cameraNode);
+
+  //this->soundSource.play(this->hoverBuffer, 0.3f, true);
+
 }
 

trunk/src/world_entities/space_ships/hover.h

@@ -7 +7 @@
 #ifndef _HOVER_H
 #define _HOVER_H
+
+//#include "sound_buffer.h"
+//#include "sound_source.h"
 
 #include "playable.h"
@@ -68 +71 @@
     float                 airViscosity;
 
-    WorldEntity* hitEntity;
+    WorldEntity*          hitEntity;
+
+    //OrxSound::SoundSource  soundSource;
+    //OrxSound::SoundBuffer* hoverBuffer;
 };
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -58 +58 @@
 CREATE_SCRIPTABLE_CLASS(SpaceShip, CL_SPACE_SHIP,
                         addMethod("hasPlayer", ExecutorLua0ret<Playable,bool>(&Playable::hasPlayer))
+                        ->addMethod("fire", ExecutorLua1<Playable, bool>(&Playable::fire))
+                        ->addMethod("loadModel", ExecutorLua2<WorldEntity,const std::string& ,float>(&WorldEntity::loadModel2))
+                        ->addMethod("setName", ExecutorLua1<BaseObject,const std::string&>(&BaseObject::setName))
+                        ->addMethod("hide", ExecutorLua0<WorldEntity>(&WorldEntity::hide))
+                        ->addMethod("unhide", ExecutorLua0<WorldEntity>(&WorldEntity::unhide))
                        //Coordinates
                         ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
@@ -352 +357 @@
 //     return;
 
-  // spaceship controlled movement
+  // spaceship controlled movement fire(bool bF){ this->bFire = bF;}
   //if (this->getOwner() == this->getHostID())
     this->calculateVelocity(time);
@@ -404 +409 @@
   Vector accel(0.0, 0.0, 0.0);
   /*
-  Vector rot(0.0, 0.0, 0.0); // wird benötigt für Helicopter
+  Vector rot(0.0, 0.0, 0.0); // wird ben�igt fr Helicopter
   */
   //float rotVal = 0.0;
@@ -513 +518 @@
 }
 
-void SpaceShip::destroy( )
+void SpaceShip::destroy( WorldEntity* killer )
 {
   PRINTF(0)("spaceship destroy\n");

trunk/src/world_entities/space_ships/space_ship.h

@@ -37 +37 @@
     virtual void leftWorld();
     
-    virtual void destroy();
+    virtual void destroy(WorldEntity* killer);
     virtual void respawn();
 

trunk/src/world_entities/space_ships/spacecraft_2d.cc

@@ -35 +35 @@
 #include "debug.h"
 
+#include "script_class.h"
+
+
 CREATE_FACTORY(Spacecraft2D, CL_SPACECRAFT_2D);
 
-/**
- *  destructs the spacecraft_2d, deletes alocated memory
- */
-Spacecraft2D::~Spacecraft2D ()
-{
-  this->setPlayer(NULL);
-  delete this->toTravelHeight;
-}
+
+CREATE_SCRIPTABLE_CLASS(Spacecraft2D, CL_SPACECRAFT_2D,
+                        addMethod("hasPlayer", ExecutorLua0ret<Playable,bool>(&Playable::hasPlayer))
+                        //Coordinates
+                        ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
+                        ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
+                        ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
+                        ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
+                        ->addMethod("setAirFriction", ExecutorLua1<Spacecraft2D, float>(&Spacecraft2D::setAirFriction))
+                       );
+
 
 /**
@@ -76 +82 @@
     this->loadParams(root);
 
+
+
   //weapons:
-  Weapon* wpRight = new TestGun(0);
-  wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(1);
-  wpLeft->setName("testGun Left");
-  //Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
+  Weapon* wpRight = dynamic_cast<Weapon*>(Factory::fabricate(CL_LASER_CANNON));
+  wpRight->setName("Cannon_Right");
+  Weapon* wpLeft = dynamic_cast<Weapon*>(Factory::fabricate(CL_LASER_CANNON));
+  wpLeft->setName("Cannon_Left");
+
+  Weapon* turretLeft = dynamic_cast<Weapon*>(Factory::fabricate(CL_BOOMERANG_GUN));
+  wpRight->setName("Turret_Left");
+  Weapon* turretRight = dynamic_cast<Weapon*>(Factory::fabricate(CL_BOOMERANG_GUN));
+  wpLeft->setName("Turret_Right");
 
   //  cannon->setName("BFG");
@@ -87 +99 @@
   this->addWeapon(wpLeft, 1, 0);
   this->addWeapon(wpRight,1 ,1);
+  this->addWeapon(turretLeft, 1, 2);
+  this->addWeapon(turretRight, 1, 3);
+
   //this->addWeapon(cannon, 0, 2);
 
   this->getWeaponManager().changeWeaponConfig(1);
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
+}
+
+
+/**
+ * @brief destructs the spacecraft_2d, deletes alocated memory
+ */
+Spacecraft2D::~Spacecraft2D ()
+{
+  this->setPlayer(NULL);
+  delete this->toTravelHeight;
 }
 
@@ -109 +134 @@
   this->cameraLook = 0.0f;
   this->rotation = 0.0f;
-  this->acceleration = 10.0f;
-  this->airFriction = 2.0f;
-
-
-  this->setHealthMax(100);
-  this->setHealth(100);
+  this->acceleration = 20.0f;
+  this->airFriction = 0.0f;
+
+
+  this->setHealthMax(1000);
+  this->setHealth(1000);
+  this->setDamage(100.0f);
+
 
 
@@ -122 +149 @@
   this->travelNode = new PNode();
 
+  this->loadModel("models/ships/mantawing.obj", 5.0f);
 
   // camera - issue
@@ -166 +194 @@
   this->getWeaponManager().setSlotCount(5);
 
-  this->getWeaponManager().setSlotPosition(0, Vector(-0.28, 1.186, -2.750));
+  this->getWeaponManager().setSlotPosition(0, Vector(1.843, -0.335, 2.029) * 5.0);
   this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
-  this->getWeaponManager().setSlotPosition(1, Vector(-0.28, 1.186, 2.750));
+  this->getWeaponManager().setSlotPosition(1, Vector(1.843, -0.335, -2.029) * 5.0);
   this->getWeaponManager().setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
-  this->getWeaponManager().setSlotPosition(2, Vector(-1.63, .809, -.003));
-  this->getWeaponManager().setSlotCapability(2, WTYPE_HEAVY);
-
   /// TODO: THESE ARE TOO MUCH
-  this->getWeaponManager().setSlotPosition(3, Vector(-1.63, .678, -.652));
-  this->getWeaponManager().setSlotDirection(3, Quaternion(-24/180 * M_PI, Vector(1,0,0)));
-
-  this->getWeaponManager().setSlotPosition(4, Vector(-1.63, .678, .652));
-  this->getWeaponManager().setSlotDirection(4, Quaternion(24/180 * M_PI, Vector(1,0,0)));
+  this->getWeaponManager().setSlotPosition(2, Vector(-0.351, -.238, 1.406) * 5.0);
+  this->getWeaponManager().setSlotDirection(2, Quaternion(-1.7, Vector(0,1,0)));
+
+  this->getWeaponManager().setSlotPosition(3, Vector(-0.351, -.238, -1.406) * 5.0);
+  this->getWeaponManager().setSlotDirection(3, Quaternion(1.7, Vector(0,1,0)));
 
   this->cameraNode.setRelCoor(1,5,0);
@@ -193 +218 @@
   registerVar( new SynchronizeableFloat( &cameraLook, &cameraLook, "cameraLook", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &rotation, &rotation, "rotation", PERMISSION_OWNER ) );
+
+
+
 }
 
@@ -285 +313 @@
 
         State::getCameraNode()->setParentSoft(this->travelNode);
-        State::getCameraNode()->setRelCoorSoft(-3, 50,0);
+        State::getCameraNode()->setRelCoorSoft(-3, 100,0);
         State::getCameraTargetNode()->setParentSoft(this->travelNode);
-        State::getCameraTargetNode()->setRelCoorSoft(0,0,0);
+        State::getCameraTargetNode()->setRelCoorSoft(5,0,1);
 
 
@@ -406 +434 @@
         if (this->toTravelHeight != NULL)
         {
-          this->travelNode->shiftCoor(Vector(0, (*toTravelHeight - this->travelNode->getAbsCoor().y) * dt, 0));
+          this->travelNode->shiftCoor(Vector(0, (*toTravelHeight - this->travelNode->getAbsCoor().y) * dt * 10.0, 0));
           if (fabsf(this->travelNode->getAbsCoor().y - *this->toTravelHeight) < .1)
           {
@@ -416 +444 @@
 
         accel.y = 0.0;
+
         Vector accelerationDir = this->getAbsDir().apply(accel * this->acceleration);
         accelerationDir.y = 0.0;
@@ -424 +453 @@
 
         this->velocity += (accelerationDir - damping)* dt;
+
+        if (this->getRelCoor().z > this->travelDistance.y && velocity.z > 0.0)
+          this->velocity.z = 0.0f;
+        if (this->getRelCoor().z < -this->travelDistance.y && velocity.z < 0.0)
+          this->velocity.z = 0.0f;
+
+        if (this->getRelCoor().x > this->travelDistance.x && velocity.x > 0.0)
+          this->velocity.x = 0.0f;
+        if (this->getRelCoor().x < -this->travelDistance.x && velocity.x < 0.0)
+          this->velocity.x = 0.0f;
+
+
         this->shiftCoor (this->velocity * dt);
-        this->setRelDirSoft(Quaternion(0, Vector(0,0,0)), 1.0f);
+        if (accel.z == 0)
+          this->setRelDirSoft(Quaternion(0, Vector(0,0,0)), 5.0f);
+        else
+          this->setRelDirSoft(Quaternion(this->velocity.z * .004, Vector(1,0,0)), 4.5f);
       }
       break;
@@ -475 +519 @@
       else if (cameraLook < -M_PI_4)
         cameraLook = -M_PI_4;
-      //this->cameraNode.setRelDirSoft(this->direction,10);
     }
   }

trunk/src/world_entities/space_ships/spacecraft_2d.h

@@ -27 +27 @@
     void setTravelDistance(const Vector2D& distance);
     void setTravelDistance(float x, float y);
+
+    void setAirFriction(float friction) { this->airFriction = friction; };
 
 

trunk/src/world_entities/spawning_point.cc

@@ -57 +57 @@
   
   MessageManager::getInstance()->registerMessageHandler( MSGID_RESPAWN, respawnMessageHandler, NULL );
+  
+  this->setSynchronized( true );
 }
 
@@ -102 +104 @@
 void SpawningPoint::spawn(Playable* entity)
 {
+  const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYABLE );
+  
+  bool found = false;
+  
+  if ( !list )
+    return;
+    
+  for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
+  {
+    if ( *it == entity )
+    {
+      found = true;
+      break;
+    }
+  }
+  
+  if ( !found )
+    return;
+
   PRINTF(0)("Spawningpoint spawns Entity (%s)\n", entity->getClassName());
 
@@ -137 +158 @@
       this->spawn(it->entity);
       
-      if ( SharedNetworkData::getInstance()->isGameServer() )
+      const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYABLE );
+  
+      bool found = false;
+  
+      if ( !list )
+        return;
+    
+      for ( std::list<BaseObject*>::const_iterator it2 = list->begin(); it2 != list->end(); it2++ )
+      {
+        if ( *it2 == it->entity )
+        {
+          found = true;
+          break;
+        }
+      }
+  
+      if ( found && SharedNetworkData::getInstance()->isGameServer() )
         this->sendRespawnMessage( it->entity->getUniqueID() );
 
@@ -194 +231 @@
   assert( Converter::byteArrayToInt( data+INTSIZE, &uniqueId ) == INTSIZE );
   
+  PRINTF(0)("SPAWNMESSAGE %d\n", uniqueId);
+  
   SpawningPoint * sp = NULL;
   Playable      * playable = NULL;
@@ -203 +242 @@
     for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
     {
-      if ( dynamic_cast<SpawningPoint*>(*it)->getUniqueID() == uniqueId )
+      PRINTF(0)("%d:%d\n", dynamic_cast<SpawningPoint*>(*it)->getUniqueID(), spUniqueId);
+      if ( dynamic_cast<SpawningPoint*>(*it)->getUniqueID() == spUniqueId )
       {
         sp = dynamic_cast<SpawningPoint*>(*it);
@@ -213 +253 @@
   if ( !sp )
   {
-    PRINTF(2)("could not find spawning point\n");
+    PRINTF(0)("could not find spawning point\n");
     return false;
   }
@@ -233 +273 @@
   if ( !playable )
   {
-    PRINTF(2)("could not find playable\n");
+    PRINTF(0)("could not find playable\n");
     return false;
   }

trunk/src/world_entities/test_entity.cc

@@ -116 +116 @@
   if( this->lastCollided != entity)
   {
-    this->destroy();
+    this->destroy( entity );
     this->lastCollided = entity;
 
@@ -126 +126 @@
 
 
-void TestEntity::destroy()
+void TestEntity::destroy(WorldEntity* killer)
 {
   if( this->bDeath)

trunk/src/world_entities/test_entity.h

@@ -25 +25 @@
   void setAnim(int animationIndex, int animPlaybackMode);
 
-  virtual void destroy();
+  virtual void destroy(WorldEntity* killer);
 
   virtual void tick (float time);

trunk/src/world_entities/weapons/fps_sniper_rifle.cc

@@ -33 +33 @@
 #include "fps_sniper_rifle.h"
 
+
+#include "effects/explosion.h"
 
 using namespace std;
@@ -145 +147 @@
     return;
 
-  pj->setParent(PNode::getNullParent());
+//   Explosion::explode(this, Vector(0.1,0.1,0.1));
 
-  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
+  pj->setParent(this);
+  pj->setParentMode(PNODE_ROTATE_AND_MOVE);
 
-  pj->setAbsCoor(this->getEmissionPoint());
+  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*550 + VECTOR_RAND(5) );
+
+  pj->setAbsCoor(this->getEmissionPoint() + this->getAbsDirX() * 25.0f);
   pj->setAbsDir(this->getAbsDir());
   pj->activate();

trunk/src/world_entities/world_entity.cc

@@ -85 +85 @@
 
   this->toList(OM_NULL);
-  
+
   registerVar( new SynchronizeableString( &this->md2TextureFileName, &this->md2TextureFileName, "md2TextureFileName" ) );
   modelFileName_handle = registerVarId( new SynchronizeableString( &modelFileName, &modelFileName, "modelFileName" ) );
   scaling_handle = registerVarId( new SynchronizeableFloat( &scaling, &scaling, "scaling" ) );
   list_handle = registerVarId( new SynchronizeableInt( (int*)&objectListNumber, &list_write, "list" ) );
-  
+
   health_handle = registerVarId( new SynchronizeableFloat( &this->health, &this->health_write, "health" ) );
   healthMax_handle = registerVarId( new SynchronizeableFloat( &this->healthMax, &this->healthMax_write, "maxHealth" ) );
@@ -209 +209 @@
         this->buildObbTree(obbTreeDepth);
     }
-    else /*if(fileName.find(".md3") != std::string::npos)*/
+    else if(fileName.find(".md3") != std::string::npos)
     {
       PRINTF(4)("fetching MD3 file: %s\n", fileName.c_str());
@@ -414 +414 @@
 bool WorldEntity::registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
 {
+  PRINTF(5)("registering collision of type: %s vs %s\n", entityA->getClassName(), entityB->getClassName());
   // is there any handler listening?
   if( !this->bReactive)
@@ -571 +572 @@
  */
 void WorldEntity::reset()
-{}
+{
+  this->setHealth( this->getHealthMax() );
+}
 
 /**
@@ -742 +745 @@
   this->decreaseHealth(damage);
 
-  PRINTF(0)("Hit me: %s now only %f/%f health\n", this->getClassName(), this->getHealth(), this->getHealthMax());
+  PRINTF(5)("Hit me: %s now only %f/%f health\n", this->getClassName(), this->getHealth(), this->getHealthMax());
 
   if( this->getHealth() > 0)
@@ -750 +753 @@
   else
   {
-    this->destroy();
-
-    if( State::getGameRules() != NULL)
-      State::getGameRules()->registerKill(Kill(killer, this));
+    this->destroy( killer );
   }
 }
@@ -761 +761 @@
  * destoys the world entity
  */
-void WorldEntity::destroy()
+void WorldEntity::destroy(WorldEntity* killer)
 {
   this->toList(OM_DEAD);
@@ -841 +841 @@
     this->toList( (OM_LIST)list_write );
   }
-  
+
   if ( std::find( id.begin(), id.end(), health_handle ) != id.end() )
   {
     this->setHealth( health_write );
   }
-  
+
   if ( std::find( id.begin(), id.end(), healthMax_handle ) != id.end() )
   {

trunk/src/world_entities/world_entity.h

@@ -47 +47 @@
 
   void loadModel(const std::string& fileName, float scaling = 1.0f, unsigned int modelNumber = 0, unsigned int obbTreeDepth = 4);
+  void loadModel2(const std::string& fileN, float scal = 1.0f){this->loadModel(fileN,scal,0,4);}
   void setModel(Model* model, unsigned int modelNumber = 0);
   Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
@@ -74 +75 @@
 /** @returns a reference to the obb tree of this worldentity */
   inline BVTree* getOBBTree() const { return this->obbTree; };
+  inline void setOBBTree(OBBTree* tree) { /*if( this->obbTree != NULL) delete this->obbTree;*/ this->obbTree = (BVTree*)tree; }
   void drawBVTree(int depth, int drawMode) const;
-  inline AABB* getModelAABB() { return (this->aabbNode)?this->aabbNode->getAABB():NULL;}
+  inline AABB* getModelAABB() const { return (this->aabbNode)?this->aabbNode->getAABB():NULL;}
 
   /* --- Collision Reaction Block --- */
@@ -101 +103 @@
   virtual void hit(float damage, WorldEntity* killer);
 
-  virtual void destroy();
+  virtual void destroy( WorldEntity* killer );
 
 
@@ -198 +200 @@
   int                     list_write;                      //!< entity's list
   int                     list_handle;                     //!< handle for list changes
-  
+
   float                   health_write;
   int                     health_handle;
-  
+
   float                   healthMax_write;
   int                     healthMax_handle;