Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6760 in orxonox.OLD for trunk/src/world_entities/weapons


Ignore:
Timestamp:
Jan 26, 2006, 2:44:57 AM (19 years ago)
Author:
bensch
Message:

merged the SpaceShipControl branche back here.

Location:
trunk/src/world_entities/weapons
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/weapons/aim.cc

    r6724 r6760  
    8282  this->anim->addKeyFrame(50, .01, ANIM_LINEAR);
    8383
     84
    8485/*  this->text = new Text();
    8586  this->text->setLayer(this->getLayer());
     
    114115    diffVec = ( (*entity)->getAbsCoor() - this->source->getAbsCoor() );
    115116
    116     if ( diffVec.len() < range  &&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) < angle)
     117    if ( diffVec.len() < range &&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) < angle)
    117118    {
    118119      //if (this->getParent() != (*entity))
     
    168169  diffVec = ( this->getAbsCoor() - this->source->getAbsCoor() );
    169170//only look for target if the aim hasn`t locked a target yet or if the actual target is out of range
    170    if(this->getParent() == PNode::getNullParent() || 
    171       diffVec.len() > range  || 
    172       ( acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) > angle))
     171   if(this->getParent() == PNode::getNullParent() ||
     172      diffVec.len() > range  ||
     173     ( acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) > angle))
    173174    {
     175     this->setParentSoft(PNode::getNullParent(),5);
    174176     this->searchTarget();
    175177    }
     
    195197//                &objY,
    196198//                &objZ );
    197 //
     199//aa
    198200//   this->setAbsCoor(objX, objY, objZ);
    199201}
  • trunk/src/world_entities/weapons/aiming_turret.cc

    r6738 r6760  
    8181  animation2->setInfinity(ANIM_INF_CONSTANT);
    8282
    83   this->setStateDuration(WS_SHOOTING, .1);
     83  this->setStateDuration(WS_SHOOTING, .9);
    8484  this->setStateDuration(WS_RELOADING, .1);
    8585  this->setStateDuration(WS_ACTIVATING, .4);
     
    9898  this->target = new Aim(this);
    9999  this->target->setVisibility(false);
    100   this->target->setRange(1000);
    101   this->target->setAngle(M_PI_4);
     100  this->target->setRange(400);
     101  this->target->setAngle(M_PI_2);
    102102}
    103103
  • trunk/src/world_entities/weapons/targeting_turret.cc

    r6738 r6760  
    9393  this->target = new Aim(this);
    9494  this->target->setVisibility(false);
    95   this->target->setRange(100);
    96   this->target->setAngle(M_PI_4/16);
     95  this->target->setRange(1000);
     96  this->target->setAngle(M_PI_4);
    9797  this->lockedTime = 0;
    9898  this->neededLockTime = 2;
Note: See TracChangeset for help on using the changeset viewer.