Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-18 22:26:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Avoid rolling the camera when using Look At. Fixes #407.

Browse source
This commit is contained in:
Leonardo Zide 2019-12-25 12:25:32 -08:00
parent c0734d49ef
commit 1c5c82a609
3 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
common/camera.cpp
View file

@ -957,15 +957,46 @@ void lcCamera::Roll(float Distance, lcStep Step, bool AddKey)
UpdatePosition(Step); UpdatePosition(Step);
} }
void lcCamera::Center(lcVector3& point, lcStep Step, bool AddKey) void lcCamera::Center(const lcVector3& NewCenter, lcStep Step, bool AddKey)
{ {
lcAlign(mTargetPosition, mPosition, point); const lcMatrix44 Inverse = lcMatrix44AffineInverse(mWorldView);
const lcVector3 Direction = -lcVector3(Inverse[2]);
float Yaw, Pitch, Roll;
if (fabsf(Direction.z) < 0.9999f)
{
Yaw = atan2f(Direction.y, Direction.x);
Pitch = asinf(Direction.z);
Roll = atan2f(Inverse[0][2], Inverse[1][2]);
}
else
{
Yaw = 0.0f;
Pitch = asinf(Direction.z);
Roll = atan2f(Inverse[0][1], Inverse[1][1]);
}
mTargetPosition = NewCenter;
lcVector3 FrontVector(mPosition - mTargetPosition);
lcMatrix44 Rotation = lcMatrix44FromAxisAngle(FrontVector, Roll);
lcVector3 UpVector(0, 0, 1), SideVector;
FrontVector.Normalize();
if (fabsf(lcDot(UpVector, FrontVector)) > 0.99f)
SideVector = lcVector3(-1, 0, 0);
else
SideVector = lcCross(FrontVector, UpVector);
UpVector = lcCross(SideVector, FrontVector);
UpVector.Normalize();
mUpVector = lcMul30(UpVector, Rotation);
if (IsSimple()) if (IsSimple())
AddKey = false; AddKey = false;
ChangeKey(mPositionKeys, mPosition, Step, AddKey);
ChangeKey(mTargetPositionKeys, mTargetPosition, Step, AddKey); ChangeKey(mTargetPositionKeys, mTargetPosition, Step, AddKey);
ChangeKey(mUpVectorKeys, mUpVector, Step, AddKey);
UpdatePosition(Step); UpdatePosition(Step);
} }

2
common/camera.h
View file

@ -281,7 +281,7 @@ public:
void Pan(const lcVector3& Distance, lcStep Step, bool AddKey); void Pan(const lcVector3& Distance, lcStep Step, bool AddKey);
void Orbit(float DistanceX, float DistanceY, const lcVector3& CenterPosition, lcStep Step, bool AddKey); void Orbit(float DistanceX, float DistanceY, const lcVector3& CenterPosition, lcStep Step, bool AddKey);
void Roll(float Distance, lcStep Step, bool AddKey); void Roll(float Distance, lcStep Step, bool AddKey);
void Center(lcVector3& point, lcStep Step, bool AddKey); void Center(const lcVector3& NewCenter, lcStep Step, bool AddKey);
void MoveSelected(lcStep Step, bool AddKey, const lcVector3& Distance); void MoveSelected(lcStep Step, bool AddKey, const lcVector3& Distance);
void MoveRelative(const lcVector3& Distance, lcStep Step, bool AddKey); void MoveRelative(const lcVector3& Distance, lcStep Step, bool AddKey);
void SetViewpoint(lcViewpoint Viewpoint); void SetViewpoint(lcViewpoint Viewpoint);

8
common/lc_math.h
View file

@ -482,14 +482,6 @@ inline lcVector3 lcNormalize(const lcVector3& a)
return Ret; return Ret;
} }
inline void lcAlign(lcVector3& t, const lcVector3& a, const lcVector3& b)
{
lcVector3 Vector(b - a);
Vector.Normalize();
Vector *= (t - a).Length();
t = a + Vector;
}
inline float lcDot(const lcVector3& a, const lcVector3& b) inline float lcDot(const lcVector3& a, const lcVector3& b)
{ {
return a.x * b.x + a.y * b.y + a.z * b.z; return a.x * b.x + a.y * b.y + a.z * b.z;