Changeset 6760 in orxonox.OLD

Timestamp:

Jan 26, 2006, 2:44:57 AM (18 years ago)

Author:

bensch

Message:

merged the SpaceShipControl branche back here.

Location:

trunk/src/world_entities

Files:

• projectiles/guided_missile.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (2 diffs)
• weapons/aim.cc (modified) (4 diffs)
• weapons/aiming_turret.cc (modified) (2 diffs)
• weapons/targeting_turret.cc (modified) (1 diff)

trunk/src/world_entities/projectiles/guided_missile.cc

@@ -43 +43 @@
   this->setHealthMax(10);
   this->lifeSpan = 10.0;
-  this->agility = 5;
+  this->agility = 10;
   this->maxVelocity = 75;
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -143 +143 @@
   controlVelocityX = 25;
   controlVelocityY = 150;
-  shipInertia = 0.5             ;
+  shipInertia = 1.5             ;
 //  cycle = 0.0;
 
@@ -340 +340 @@
 
   //orient the spaceship in direction of the mouse
-   rotQuat = Quaternion::quatSlerp( this->getAbsDir(), mouseDir, fabsf(time)*shipInertia);
+   rotQuat = Quaternion::quatSlerp( this->getAbsDir(), mouseDir, 0.5);//fabsf(time)*shipInertia);
    if (this->getAbsDir().distance(rotQuat) > 0.00000000000001)
     this->setAbsDir( rotQuat);

trunk/src/world_entities/weapons/aim.cc

@@ -82 +82 @@
   this->anim->addKeyFrame(50, .01, ANIM_LINEAR);
 
+
 /*  this->text = new Text();
   this->text->setLayer(this->getLayer());
@@ -114 +115 @@
     diffVec = ( (*entity)->getAbsCoor() - this->source->getAbsCoor() );
 
-    if ( diffVec.len() < range  &&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) < angle)
+    if ( diffVec.len() < range &&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) )  < angle)
     {
       //if (this->getParent() != (*entity))
@@ -168 +169 @@
   diffVec = ( this->getAbsCoor() - this->source->getAbsCoor() );
 //only look for target if the aim hasn`t locked a target yet or if the actual target is out of range
-   if(this->getParent() == PNode::getNullParent() || 
-      diffVec.len() > range  || 
-      ( acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) > angle))
+   if(this->getParent() == PNode::getNullParent() ||
+      diffVec.len() > range  ||
+     ( acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) > angle))
     {
+     this->setParentSoft(PNode::getNullParent(),5);
      this->searchTarget();
     }
@@ -195 +197 @@
 //                &objY,
 //                &objZ );
-//
+//aa
 //   this->setAbsCoor(objX, objY, objZ);
 }

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -81 +81 @@
   animation2->setInfinity(ANIM_INF_CONSTANT);
 
-  this->setStateDuration(WS_SHOOTING, .1);
+  this->setStateDuration(WS_SHOOTING, .9);
   this->setStateDuration(WS_RELOADING, .1);
   this->setStateDuration(WS_ACTIVATING, .4);
@@ -98 +98 @@
   this->target = new Aim(this);
   this->target->setVisibility(false);
-  this->target->setRange(1000);
-  this->target->setAngle(M_PI_4);
+  this->target->setRange(400);
+  this->target->setAngle(M_PI_2);
 }
 

trunk/src/world_entities/weapons/targeting_turret.cc

@@ -93 +93 @@
   this->target = new Aim(this);
   this->target->setVisibility(false);
-  this->target->setRange(100);
-  this->target->setAngle(M_PI_4/16);
+  this->target->setRange(1000);
+  this->target->setAngle(M_PI_4);
   this->lockedTime = 0;
   this->neededLockTime = 2;