mirror of
https://github.com/GTAmodding/re3.git
synced 2024-12-25 08:05:42 +00:00
acos
This commit is contained in:
parent
daf1fdf403
commit
81de0e0cbd
2 changed files with 5 additions and 5 deletions
|
@ -679,7 +679,7 @@ CFileLoader::LoadMLOInstance(int id, const char *line)
|
|||
&scale.x, &scale.y, &scale.z,
|
||||
&rot.x, &rot.y, &rot.z,
|
||||
&angle);
|
||||
float rad = 2.0f * (PI / 2.0f - Atan2(angle, Sqrt(1.0f - SQR(angle))));
|
||||
float rad = Acos(angle) * 2.0f;
|
||||
CInstance *inst = CModelInfo::GetMloInstanceStore().alloc();
|
||||
minfo->lastInstance++;
|
||||
|
||||
|
|
|
@ -344,11 +344,11 @@ void
|
|||
CPedIK::ExtractYawAndPitchWorld(RwMatrixTag *mat, float *yaw, float *pitch)
|
||||
{
|
||||
float f = clamp(DotProduct(mat->up, CVector(0.0f, 1.0f, 0.0f)), -1.0f, 1.0f);
|
||||
*yaw = HALFPI - Atan2(f, Sqrt(1.0f - f * f));
|
||||
*yaw = Acos(f);
|
||||
if (mat->up.x > 0.0f) *yaw = -*yaw;
|
||||
|
||||
f = clamp(DotProduct(mat->right, CVector(0.0f, 0.0f, 1.0f)), -1.0f, 1.0f);
|
||||
*pitch = HALFPI - Atan2(f, Sqrt(1.0f - f * f));
|
||||
*pitch = Acos(f);
|
||||
if (mat->up.z > 0.0f) *pitch = -*pitch;
|
||||
}
|
||||
|
||||
|
@ -356,11 +356,11 @@ void
|
|||
CPedIK::ExtractYawAndPitchLocal(RwMatrixTag *mat, float *yaw, float *pitch)
|
||||
{
|
||||
float f = clamp(DotProduct(mat->at, CVector(0.0f, 0.0f, 1.0f)), -1.0f, 1.0f);
|
||||
*yaw = HALFPI - Atan2(f, Sqrt(1.0f - f * f));
|
||||
*yaw = Acos(f);
|
||||
if (mat->at.y > 0.0f) *yaw = -*yaw;
|
||||
|
||||
f = clamp(DotProduct(mat->right, CVector(1.0f, 0.0f, 0.0f)), -1.0f, 1.0f);
|
||||
*pitch = HALFPI - Atan2(f, Sqrt(1.0f - f * f));
|
||||
*pitch = Acos(f);
|
||||
if (mat->up.x > 0.0f) *pitch = -*pitch;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue