summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleo2006-03-02 18:01:58 +0000
committerleo2006-03-02 18:01:58 +0000
commitb7c522acf840dd211e54141f1dbda5b5c268971e (patch)
treee24841c5f62546304131253eecf8926ffa21cf7d
parent2f33802dafc6cab757e5b639982da3521af9b400 (diff)
Fixed rotation bug.
git-svn-id: http://svn.leocad.org/trunk@503 c7d43263-9d01-0410-8a33-9dba5d9f93d6
-rw-r--r--common/project.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/common/project.cpp b/common/project.cpp
index a13acad..b5ae75c 100644
--- a/common/project.cpp
+++ b/common/project.cpp
@@ -7434,7 +7434,7 @@ void Project::RotateSelectedObjects(const Vector3& Delta)
if (pFocus != NULL)
{
Quaternion LocalToFocus = Mul(WorldToFocus, LocalToWorld);
- NewLocalToWorld = Mul(LocalToFocus, Rotation);
+ NewLocalToWorld = Mul(Rotation, LocalToFocus);
Quaternion WorldToLocal;
WorldToLocal.FromAxisAngle(Vector4(rot[0], rot[1], rot[2], -rot[3] * LC_DTOR));
@@ -7455,8 +7455,7 @@ void Project::RotateSelectedObjects(const Vector3& Delta)
pos[1] = Center[1] + Distance[1];
pos[2] = Center[2] + Distance[2];
- if (Distance.LengthSquared() > 0.00001f)
- pPiece->ChangeKey(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, pos, LC_PK_POSITION);
+ pPiece->ChangeKey(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, pos, LC_PK_POSITION);
}
rot[0] = NewRotation[0];