Changeset 6255 in orxonox.OLD

Timestamp:

Dec 21, 2005, 5:31:17 PM (18 years ago)

Author:

snellen

Message:

guiding_misslie.cc updated, targeting_turret added

Location:

branches/spaceshipcontrol/src

Files:

• Makefile.am (modified) (2 diffs)
• defs/class_id.h (modified) (1 diff)
• lib/coord/p_node.cc (modified) (1 diff)
• world_entities/creatures/md2_creature.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)
• world_entities/weapons/aiming_turret.cc (modified) (2 diffs)
• world_entities/weapons/guided_missile.cc (modified) (2 diffs)
• world_entities/weapons/targeting_turret.cc (added)
• world_entities/weapons/targeting_turret.h (added)

branches/spaceshipcontrol/src/Makefile.am

@@ -71 +71 @@
                   world_entities/weapons/ground_turret.cc \
                   world_entities/weapons/aiming_turret.cc \
+                  world_entities/weapons/targeting_turret.cc \
                   world_entities/weapons/cannon.cc \
                   world_entities/weapons/test_bullet.cc \
@@ -120 +121 @@
                  world_entities/weapons/turret.h \
                  world_entities/weapons/aiming_turret.h \
+                 world_entities/weapons/targeting_turret.h \
                  world_entities/weapons/test_bullet.h \
                  world_entities/weapons/rocket.h \

branches/spaceshipcontrol/src/defs/class_id.h

@@ -161 +161 @@
   CL_AIMING_TURRET              =    0x00000232,
   CL_CANNON                     =    0x00000233,
+  CL_TARGETING_TURRET           =    0x00000234,
 
   CL_TEST_BULLET                =    0x00000240,

branches/spaceshipcontrol/src/lib/coord/p_node.cc

@@ -745 +745 @@
           /* update the current absDirection - remember * means rotation around sth.*/
           this->prevRelCoordinate = this->relCoordinate;
-          this->absDirection = this->relDirection * parent->getAbsDir();;
+          this->absDirection = parent->getAbsDir() * this->relDirection;
         }
 

branches/spaceshipcontrol/src/world_entities/creatures/md2_creature.cc

@@ -303 +303 @@
   //orient the MD2Creature in direction of the mouse
   this->setAbsDir(mouseDirX);
-  this->cameraConnNode.setAbsDirSoft(mouseDirX*mouseDirY, 10);
+  this->cameraConnNode.setRelDir(mouseDirY);
 
   this->getWeaponManager()->tick(time);

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

@@ -286 +286 @@
 
   //orient the spaceship in direction of the mouse
-   rotQuat = Quaternion::quatSlerp( this->getAbsDir(), mouseDir, fabsf(time)*3.0);
+   rotQuat = Quaternion::quatSlerp( this->getAbsDir(), mouseDir, 1);
    if (this->getAbsDir().distance(rotQuat) > 0.00000000000001)
     this->setAbsDir( rotQuat);
@@ -466 +466 @@
     //if (this->getWeaponManager()->hasFreeSlot(3))
     {
-      turret = new AimingTurret();
+      turret = dynamic_cast<Weapon*>(Factory::fabricate(CL_TARGETING_TURRET));
+      if (turret != NULL)
       this->getWeaponManager()->addWeapon(turret, 3);
 

branches/spaceshipcontrol/src/world_entities/weapons/aiming_turret.cc

@@ -90 +90 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET);
-  this->setProjectileType(CL_GUIDED_MISSILE);
+  this->setProjectileType(CL_ROCKET);
 
 
@@ -142 +142 @@
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
 
-  pj->setTarget(this->target->getParent());
   pj->setParent(PNode::getNullParent());
   pj->setAbsCoor(this->getEmissionPoint());

branches/spaceshipcontrol/src/world_entities/weapons/guided_missile.cc

@@ -44 +44 @@
   this->energyMax = 10;
   this->lifeSpan = 10.0;
-  this->agility = 4;
+  this->agility = 500;
   this->maxVelocity = 75;
 
@@ -156 +156 @@
      correctionVector = (( ( diffVector *  (speed * speed/( velocity.dot(diffVector ) ) )) - velocity).getNormalized()) * agility;
 
-      if(velocity.dot(diffVector) > 0)
+      if( (diffVector *  (speed * speed/( velocity.dot(diffVector ) ) ) -velocity).len() < agility )
+       velocity = ((diffVector *  (speed * speed/( velocity.dot(diffVector ) ) )).getNormalized())*agility;
+      else if(velocity.dot(diffVector) > 0)
         velocity += correctionVector;
       else if (velocity.dot(diffVector) < 0)