Changeset 10113 in orxonox.OLD

Timestamp:

Dec 19, 2006, 11:39:59 PM (17 years ago)

Author:

marcscha

Message:

Collision fixes, further additions

Location:

branches/playability/src/world_entities

Files:

• projectiles/mbolt.cc (modified) (9 diffs)
• space_ships/space_ship.cc (modified) (12 diffs)
• space_ships/space_ship.h (modified) (1 diff)
• weapons/swarm_launcher.cc (modified) (1 diff)
• world_entity.cc (modified) (1 diff)

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

@@ -24 +24 @@
 
 #include "particles/dot_emitter.h"
-#include "particles/box_emitter.h"
 #include "particles/sprite_particles.h"
 
@@ -47 +46 @@
 {
   this->registerObject(this, MBolt::_objectList);
-  this->loadModel("models/projectiles/mbolt.obj");
+  this->loadModel("models/projectiles/mbolt.obj",4);
 
   
@@ -59 +58 @@
 
   //this->emitter = new DotEmitter(1000, 0, 0);
-  this->emitter = new DotEmitter(200, 0, 0);
+  this->emitter = new DotEmitter(50, 0, 0);
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI,M_PI);
@@ -76 +75 @@
   dynamic_cast<StaticModel*>(this->getModel())->finalize();
 
+  dynamic_cast<StaticModel*>(this->getModel())->rebuild();
+  this->buildObbTree(4);
   
   this->trail = new Trail(6,4,.1, this);
   //this->trail->setParent( this);
   this->trail->setTexture( "maps/laser.png");
-  this->trail->setAbsCoor(this->getAbsCoor() - Vector(1,0,0));
+  this->trail->setAbsCoor(this->getAbsCoor() - Vector(.7,0,0));
 }
 
@@ -110 +111 @@
     MBolt::explosionParticles = new SpriteParticles(1000);
     MBolt::explosionParticles->setName("MBoltExplosionParticles");
-    MBolt::explosionParticles->setLifeSpan(.5, .3);
+    MBolt::explosionParticles->setLifeSpan(.2, .1);
     MBolt::explosionParticles->setRadius(0.0, 10.0);
     MBolt::explosionParticles->setRadius(.5, 6.0);
@@ -126 +127 @@
   this->emitter->setSpread(0);
   this->emitter->setEmissionRate(10.0);
-  this->emitter->setEmissionVelocity(0);
+  this->emitter->setEmissionVelocity(50);
 }
 
@@ -136 +137 @@
   this->lifeCycle = 0.0;
 
-  this->toList(OM_NULL);
-  this->removeNode();
+  //this->toList(OM_NULL);
+  this->toList(OM_DEAD);
+  //this->removeNode();
   MBolt::fastFactory->kill(this);
 }
@@ -145 +147 @@
 {
   PRINTF(0)("MBolt collides pretest\n");
+
   if( entity == NULL)
     return;
@@ -196 +199 @@
   glMultMatrixf((float*)matrix);
 
-  glScalef(0.75, 0.7/4, 0.7/4);  // no double rescale
+  glScalef(0.75/4, 0.7/16, 0.7/16);  // no double rescale
 
   this->mat->select();
   dynamic_cast<StaticModel*>(this->getModel())->draw();
   this->mat->unselect();
-  glScalef(1/.75,4/.7,4/.7);
-  glTranslatef(-4,0,0);
+  glScalef(4/.75,16/.7,16/.7);
+  glTranslatef(-3,0,0);
   this->trail->draw();
   glPopMatrix();
   glPopAttrib();
 
-
-}
-
+}
+

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

@@ -34 +34 @@
 #include "particles/emitter_node.h"
 #include "particles/sprite_particles.h"
-#include "effects/explosion.h"
 #include "effects/trail.h"
 
@@ -52 +51 @@
 #include "state.h"
 #include "player.h"
+
 
 #include "util/loading/load_param.h"
@@ -173 +173 @@
   this->weaponMan.addWeapon( wpLeft1, 0, 0);
   this->weaponMan.addWeapon( wpRight1, 0, 1);
-  this->weaponMan.addWeapon( wpLeft2, 0, 2);
-  this->weaponMan.addWeapon( wpRight2, 0, 3);
-  this->weaponMan.addWeapon( wpLeft3, 0, 4);
-  this->weaponMan.addWeapon( wpRight3, 0, 5);
-
-  this->secWeaponMan.addWeapon( cannon, 1, 0);
-
-  this->weaponMan.changeWeaponConfig(0);
-  this->secWeaponMan.changeWeaponConfig(1);
+  this->weaponMan.addWeapon( wpLeft2, 1, 0);
+  this->weaponMan.addWeapon( wpRight2, 1, 1);
+  this->weaponMan.addWeapon( wpLeft3, 2, 0);
+  this->weaponMan.addWeapon( wpRight3, 2, 1);
+
+  this->secWeaponMan.addWeapon( cannon, 0, 0);
+
 
   wpRight1->requestAction(WA_ACTIVATE);
   wpLeft1->requestAction(WA_ACTIVATE);
+
   wpRight2->requestAction(WA_ACTIVATE);
   wpLeft2->requestAction(WA_ACTIVATE);
@@ -192 +191 @@
   cannon->requestAction(WA_ACTIVATE);
 
-  curWeaponPrimary    = 0;
+  
+  this->weaponMan.changeWeaponConfig(1);
+  this->secWeaponMan.changeWeaponConfig(0);
+
+  curWeaponPrimary    = 1;
   curWeaponSecondary  = 0;
 
@@ -339 +342 @@
   this->trailR->setTexture( "maps/engine.png");
 
-  
+
   this->toList(OM_GROUP_00);
 }
@@ -376 +379 @@
   this->secWeaponMan.showCrosshair();
   this->toList( OM_GROUP_01 );
-  
-  for(ObjectList<PNode>::const_iterator it = this->getNodesChildren().begin(); it != this->getNodesChildren().end(); it++)
-  {
-    if( likely( dynamic_cast<Weapon*>(*it) != NULL))
-      dynamic_cast<WorldEntity*>(*it)->toList( OM_GROUP_01);
-  }
   //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( true);
   //this->attachCamera();
@@ -391 +388 @@
   this->secWeaponMan.hideCrosshair();
   this->toList( OM_GROUP_00);
-  
-  for(ObjectList<PNode>::const_iterator it = this->getNodesChildren().begin(); it != this->getNodesChildren().end(); it++)
-  {
-    if( likely( dynamic_cast<Weapon*>(*it) != NULL))
-      dynamic_cast<WorldEntity*>(*it)->toList( OM_GROUP_00);
-  }
   //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( false);
   //this->detachCamera();
@@ -516 +507 @@
   this->trailR->tick(time);
 
+  this->weaponMan.setParentEntity( this);
+  this->secWeaponMan.setParentEntity( this);
+
   //orient the spaceship in direction of the mouse
   /*
@@ -558 +552 @@
 {
   //Playable::process(event);
-
+  
   if( event.type == KeyMapper::PEV_LEFT)
     this->bLeft = event.bPressed;
@@ -571 +565 @@
   else if( event.type == KeyMapper::PEV_FIRE1)
     this->bFire = event.bPressed;
+  else if( event.type == KeyMapper::PEV_NEXT_WEAPON && event.bPressed)
+  {
+    this->nextWeaponConfig();
+  }
+  else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
+    this->previousWeaponConfig();
 
 
@@ -632 +632 @@
   else
   {
-    this->setAbsCoor( this->getAbsCoor() + Vector(150,0,0) + Vector(1,0,0) * VECTOR_RAND(50).dot(Vector(1,0,0)));
+    this->setAbsCoor( this->getAbsCoor() + Vector(100,0,0) + Vector(1,0,0) * VECTOR_RAND(150).dot(Vector(1,0,0)));
   }
 
@@ -963 +963 @@
 }
 
+/**
+ * @brief jumps to the next WeaponConfiguration
+ */
+void SpaceShip::nextWeaponConfig()
+{
+  
+  this->curWeaponPrimary    = (curWeaponPrimary + 1) % 3;
+  this->weaponMan.changeWeaponConfig(this->curWeaponPrimary);
+  Playable::weaponConfigChanged();
+}
+
+/**
+ * @brief moves to the last WeaponConfiguration
+ */
+void SpaceShip::previousWeaponConfig()
+{
+  this->curWeaponPrimary    = (curWeaponPrimary + 1) % 3;
+  this->weaponMan.changeWeaponConfig(this->curWeaponPrimary);
+  Playable::weaponConfigChanged();
+}

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

@@ -78 +78 @@
     void setPlaymodeXML(const std::string& playmode);
     virtual void movement (float dt);
+
+    void nextWeaponConfig();
+    void previousWeaponConfig();
+
+    inline void hit(float damage, WorldEntity* killer) { this->collidesWith(killer, this->getAbsCoor()); killer->collidesWith(this, this->getAbsCoor()); } ;
 
   private:

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

@@ -150 +150 @@
   for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
   {
-    if( ((*eIterator)->getOMListNumber() == OM_GROUP_00) && ((*eIterator)->getClassCName() != "Weapon") && ((*eIterator)->getClassCName() != "Projectile") && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 200)
+    if( ((*eIterator)->getOMListNumber() == OM_GROUP_00) && ((*eIterator)->getClassCName() != "Weapon") && ((*eIterator)->getClassCName() != "Projectile") && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 300)
     {
       pj  = this->getProjectile();

branches/playability/src/world_entities/world_entity.cc

@@ -803 +803 @@
 void WorldEntity::hit(float damage, WorldEntity* killer)
 {
+
   this->decreaseHealth(damage);