Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10834


Ignore:
Timestamp:
Nov 23, 2015, 1:24:51 PM (9 years ago)
Author:
maxima
Message:

AI_HS15 merged into campaignHS15

Location:
code/branches/campaignHS15
Files:
9 edited
13 copied

Legend:

Unmodified
Added
Removed

  • code/branches/campaignHS15

  • code/branches/campaignHS15/src/libraries/util/Math.cc

    r10630 r10834  
    161161         - If the other object is exactly above me, the function returns <tt>Vector2(0, 0.5)</tt>.
    162162    */
    163     orxonox::Vector2 get2DViewcoordinates(const orxonox::Vector3& myposition, const orxonox::Vector3& mydirection, const orxonox::Vector3& myorthonormal, const orxonox::Vector3& otherposition)
     163    orxonox::Vector2 get2DViewCoordinates(const orxonox::Vector3& myposition, const orxonox::Vector3& mydirection, const orxonox::Vector3& myorthonormal, const orxonox::Vector3& otherposition)
    164164    {
    165165        orxonox::Vector3 distance = otherposition - myposition;

  • code/branches/campaignHS15/src/libraries/util/Math.h

    r9939 r10834  
    9191    _UtilExport float getAngle(const orxonox::Vector3& myposition, const orxonox::Vector3& mydirection, const orxonox::Vector3& otherposition);
    9292    _UtilExport orxonox::Vector2 get2DViewdirection(const orxonox::Vector3& myposition, const orxonox::Vector3& mydirection, const orxonox::Vector3& myorthonormal, const orxonox::Vector3& otherposition);
    93     _UtilExport orxonox::Vector2 get2DViewcoordinates(const orxonox::Vector3& myposition, const orxonox::Vector3& mydirection, const orxonox::Vector3& myorthonormal, const orxonox::Vector3& otherposition);
     93    _UtilExport orxonox::Vector2 get2DViewCoordinates(const orxonox::Vector3& myposition, const orxonox::Vector3& mydirection, const orxonox::Vector3& myorthonormal, const orxonox::Vector3& otherposition);
    9494    _UtilExport orxonox::Vector2 get3DProjection(const orxonox::Vector3& myposition, const orxonox::Vector3& mydirection, const orxonox::Vector3& myorthonormal, const orxonox::Vector3& otherposition, const float mapangle, const float detectionlimit);
    9595    _UtilExport bool isObjectHigherThanShipOnMap(const orxonox::Vector3& myposition, const orxonox::Vector3& mydirection, const orxonox::Vector3& myorthonormal, const orxonox::Vector3& otherposition, const float mapangle);

  • code/branches/campaignHS15/src/modules/docking/DockingController.cc

    r9667 r10834  
    6161
    6262        float distance = (this->dock_->getWorldPosition() - entity->getPosition()).length();
    63         Vector2 coord = get2DViewcoordinates(     // I don't understand this too
     63        Vector2 coord = get2DViewCoordinates(     // I don't understand this too
    6464            entity->getPosition(),
    6565            entity->getOrientation() * WorldEntity::FRONT,

  • code/branches/campaignHS15/src/modules/overlays/hud/HUDRadar.cc

    r9945 r10834  
    240240            }
    241241            else
    242                 coord = get2DViewcoordinates(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition());
     242                coord = get2DViewCoordinates(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition());
    243243
    244244            coord *= math::pi / 3.5f; // small adjustment to make it fit the texture

  • code/branches/campaignHS15/src/orxonox/controllers/CMakeLists.txt

    r10216 r10834  
    1111  FormationController.cc
    1212  ControllerDirector.cc
     13  DivisionController.cc
     14  LeaderController.cc
     15  WingmanController.cc
     16  SectionController.cc
     17  CommonController.cc
    1318)

  • code/branches/campaignHS15/src/orxonox/controllers/FormationController.cc

    r10631 r10834  
    277277        }
    278278
    279         Vector2 coord = get2DViewcoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
     279        Vector2 coord = get2DViewCoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
    280280        float distance = (target - this->getControllableEntity()->getPosition()).length();
    281281        float rotateX = clamp(coord.x * 10, -1.0f, 1.0f);
    … …  
    10691069            return;
    10701070
    1071         Vector2 coord = get2DViewcoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
     1071        Vector2 coord = get2DViewCoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
    10721072        float distance = (target - this->getControllableEntity()->getPosition()).length();
    10731073

  • code/branches/campaignHS15/src/orxonox/worldentities/pawns/Pawn.cc

    r10624 r10834  
    299299    }
    300300
    301 
    302301    void Pawn::kill()
    303302    {
    … …  
    319318        }
    320319    }
    321 
    322320
    323321    void Pawn::death()
    … …  
    472470    }
    473471
     472    /**
     473    @brief
     474        Check whether the Pawn has a @ref Orxonox::WeaponSystem and fire it with the specified firemode if it has one.
     475    */
    474476    void Pawn::fired(unsigned int firemode)
    475477    {

  • code/branches/campaignHS15/test/util/MathTest.cc

    r9114 r10834  
    337337    getAngle
    338338    get2DViewdirection
    339     get2DViewcoordinates
     339    get2DViewCoordinates
    340340    getPredictedPosition
    341341*/
Note: See TracChangeset for help on using the changeset viewer.