diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-16 00:50:45 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-16 00:50:45 +0200 |
commit | 21329b8440ef87bbb34e02bffacacbe35b0f632d (patch) | |
tree | 6fc11fcadb5b04ba7309f32cc64eba6d14611287 /src/peds/PedIK.h | |
parent | ped attractors done (diff) | |
parent | Merge pull request #550 from erorcun/miami (diff) | |
download | re3-21329b8440ef87bbb34e02bffacacbe35b0f632d.tar re3-21329b8440ef87bbb34e02bffacacbe35b0f632d.tar.gz re3-21329b8440ef87bbb34e02bffacacbe35b0f632d.tar.bz2 re3-21329b8440ef87bbb34e02bffacacbe35b0f632d.tar.lz re3-21329b8440ef87bbb34e02bffacacbe35b0f632d.tar.xz re3-21329b8440ef87bbb34e02bffacacbe35b0f632d.tar.zst re3-21329b8440ef87bbb34e02bffacacbe35b0f632d.zip |
Diffstat (limited to 'src/peds/PedIK.h')
-rw-r--r-- | src/peds/PedIK.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/peds/PedIK.h b/src/peds/PedIK.h index a1cb5d13..b5f895cd 100644 --- a/src/peds/PedIK.h +++ b/src/peds/PedIK.h @@ -4,8 +4,8 @@ struct LimbOrientation { - float phi; - float theta; + float yaw; + float pitch; }; struct LimbMovementInfo { @@ -48,19 +48,17 @@ public: static LimbMovementInfo ms_lowerArmInfo; CPedIK(CPed *ped); - bool PointGunInDirection(float phi, float theta); - bool PointGunInDirectionUsingArm(float phi, float theta); + bool PointGunInDirection(float targetYaw, float targetPitch); + bool PointGunInDirectionUsingArm(float targetYaw, float targetPitch); bool PointGunAtPosition(CVector const& position); void GetComponentPosition(RwV3d *pos, uint32 node); - static RwMatrix *GetWorldMatrix(RwFrame *source, RwMatrix *destination); void RotateTorso(AnimBlendFrameData* animBlend, LimbOrientation* limb, bool changeRoll); void ExtractYawAndPitchLocal(RwMatrix *mat, float *yaw, float *pitch); void ExtractYawAndPitchLocalSkinned(AnimBlendFrameData *node, float *yaw, float *pitch); void ExtractYawAndPitchWorld(RwMatrix *mat, float *yaw, float *pitch); - LimbMoveStatus MoveLimb(LimbOrientation &limb, float approxPhi, float approxTheta, LimbMovementInfo &moveInfo); + LimbMoveStatus MoveLimb(LimbOrientation &limb, float targetYaw, float targetPitch, LimbMovementInfo &moveInfo); bool RestoreGunPosn(void); - void RotateHead(void); - bool LookInDirection(float phi, float theta); + bool LookInDirection(float targetYaw, float targetPitch); bool LookAtPosition(CVector const& pos); bool RestoreLookAt(void); }; |