From 0e8d92ba0e35b7b5884a1c4db2a660244b4a8a08 Mon Sep 17 00:00:00 2001 From: leo Date: Fri, 3 Mar 2006 03:38:38 +0000 Subject: Removed old functions. git-svn-id: http://svn.leocad.org/trunk@506 c7d43263-9d01-0410-8a33-9dba5d9f93d6 --- common/project.cpp | 11 +++++------ common/project.h | 14 -------------- 2 files changed, 5 insertions(+), 20 deletions(-) (limited to 'common') diff --git a/common/project.cpp b/common/project.cpp index 7b61352..ab683af 100644 --- a/common/project.cpp +++ b/common/project.cpp @@ -7815,7 +7815,7 @@ bool Project::OnKeyDown(char nKey, bool bControl, bool bShift) } if (bShift) - RotateSelectedObjects(axis[0], axis[1], axis[2]); + RotateSelectedObjects(Vector3(axis[0], axis[1], axis[2])); else MoveSelectedObjects(Vector3(axis[0], axis[1], axis[2]), Vector3()); UpdateOverlayScale(); @@ -8043,7 +8043,6 @@ void Project::OnLeftButtonDown(int x, int y, bool bControl, bool bShift) if (count == max) break; - SnapPoint (m_fTrack, NULL); pLight = new Light (m_fTrack[0], m_fTrack[1], m_fTrack[2]); SelectAndFocusNone (false); @@ -8802,7 +8801,7 @@ void Project::OnMouseMove(int x, int y, bool bControl, bool bShift) m_fTrack[i] = (float)(result.rem); } - RotateSelectedObjects (delta[0], delta[1], delta[2]); + RotateSelectedObjects(Vector3(delta[0], delta[1], delta[2])); m_nDownX = x; m_nDownY = y; @@ -8837,13 +8836,13 @@ void Project::OnMouseMove(int x, int y, bool bControl, bool bShift) m_fTrack[2] = ptz + (delta[2]-d[2])/mouse; if ((m_nSnap & LC_DRAW_3DMOUSE) || (m_OverlayActive && (m_OverlayMode != LC_OVERLAY_XYZ))) - RotateSelectedObjects (delta[0], delta[1], delta[2]); + RotateSelectedObjects(Vector3(delta[0], delta[1], delta[2])); else { if (m_nTracking == LC_TRACK_LEFT) - RotateSelectedObjects (delta[0], delta[1], 0); + RotateSelectedObjects(Vector3(delta[0], delta[1], 0)); else - RotateSelectedObjects (0, 0, delta[2]); + RotateSelectedObjects(Vector3(0, 0, delta[2])); } } } diff --git a/common/project.h b/common/project.h index 96d762c..94e5d8d 100644 --- a/common/project.h +++ b/common/project.h @@ -177,20 +177,6 @@ protected: void SnapVector(Vector3& Delta, Vector3& Leftover) const; void SnapRotationVector(Vector3& Delta, Vector3& Leftover) const; - // Deprecated compatibility functions. - // TODO: Update function calls to use the math library. - void RotateSelectedObjects(float x, float y, float z) - { RotateSelectedObjects(Vector3(x, y, z)); }; - void SnapPoint(float *point, float *reminder) const - { - Vector3 Pt(point[0], point[1], point[2]); - Vector3 Rem; - if (reminder) Rem = Vector3(reminder[0], reminder[1], reminder[2]); - SnapVector(Pt, Rem); - point[0] = Pt[0]; point[1] = Pt[1]; point[2] = Pt[2]; - if (reminder) { reminder[0] = Rem[0]; reminder[1] = Rem[1]; reminder[2] = Rem[2]; } - }; - // Rendering void RenderScene(bool bShaded, bool bDrawViewports); void RenderViewports(bool bBackground, bool bLines); -- cgit v1.2.3