diff --git a/common/lc_view.cpp b/common/lc_view.cpp index f5964b89..6990a7cb 100644 --- a/common/lc_view.cpp +++ b/common/lc_view.cpp @@ -1941,7 +1941,6 @@ lcCursor lcView::GetCursor() const lcCursor::Rotate, // lcTrackTool::RotateX lcCursor::Rotate, // lcTrackTool::RotateY lcCursor::Rotate, // lcTrackTool::RotateZ - lcCursor::Rotate, // lcTrackTool::RotateXY lcCursor::Default, // lcTrackTool::RotateXYZ lcCursor::Rotate, // lcTrackTool::RotateCamera lcCursor::Select, // lcTrackTool::RotateTrainTrackRight @@ -2060,7 +2059,6 @@ lcTool lcView::GetCurrentTool() const lcTool::Rotate, // lcTrackTool::RotateX lcTool::Rotate, // lcTrackTool::RotateY lcTool::Rotate, // lcTrackTool::RotateZ - lcTool::Rotate, // lcTrackTool::RotateXY lcTool::Rotate, // lcTrackTool::RotateXYZ lcTool::Rotate, // lcTrackTool::RotateCamera lcTool::Rotate, // lcTrackTool::RotateTrainTrackRight @@ -2601,7 +2599,6 @@ void lcView::OnButtonDown(lcTrackButton TrackButton) case lcTrackTool::RotateX: case lcTrackTool::RotateY: case lcTrackTool::RotateZ: - case lcTrackTool::RotateXY: case lcTrackTool::RotateXYZ: case lcTrackTool::RotateCamera: if (ActiveModel->CanRotateSelection()) @@ -3085,18 +3082,6 @@ void lcView::OnMouseMove() } break; - case lcTrackTool::RotateXY: - { - lcVector3 ScreenZ = lcNormalize(mCamera->mTargetPosition - mCamera->mPosition); - lcVector3 ScreenX = lcCross(ScreenZ, mCamera->mUpVector); - lcVector3 ScreenY = mCamera->mUpVector; - - lcVector3 MoveX = 36.0f * (float)(mMouseX - mMouseDownX) * MouseSensitivity * ScreenX; - lcVector3 MoveY = 36.0f * (float)(mMouseY - mMouseDownY) * MouseSensitivity * ScreenY; - ActiveModel->UpdateRotateTool(MoveX + MoveY, mTrackButton != lcTrackButton::Left); - } - break; - case lcTrackTool::RotateXYZ: { lcVector3 ScreenZ = lcNormalize(mCamera->mTargetPosition - mCamera->mPosition); diff --git a/common/lc_view.h b/common/lc_view.h index f468d9e7..ff9e7b54 100644 --- a/common/lc_view.h +++ b/common/lc_view.h @@ -71,7 +71,6 @@ enum class lcTrackTool RotateX, RotateY, RotateZ, - RotateXY, RotateXYZ, RotateCamera, RotateTrainTrackRight, diff --git a/common/lc_viewmanipulator.cpp b/common/lc_viewmanipulator.cpp index 46bb1baf..eaac6620 100644 --- a/common/lc_viewmanipulator.cpp +++ b/common/lc_viewmanipulator.cpp @@ -1009,9 +1009,6 @@ bool lcViewManipulator::IsTrackToolAllowed(lcTrackTool TrackTool, quint32 Allowe case lcTrackTool::RotateZ: return AllowedTransforms & LC_OBJECT_TRANSFORM_ROTATE_Z; - case lcTrackTool::RotateXY: - return (AllowedTransforms & (LC_OBJECT_TRANSFORM_ROTATE_X | LC_OBJECT_TRANSFORM_ROTATE_Y)) == (LC_OBJECT_TRANSFORM_ROTATE_X | LC_OBJECT_TRANSFORM_ROTATE_Y); - case lcTrackTool::RotateXYZ: return (AllowedTransforms & (LC_OBJECT_TRANSFORM_ROTATE_X | LC_OBJECT_TRANSFORM_ROTATE_Y | LC_OBJECT_TRANSFORM_ROTATE_Z)) == (LC_OBJECT_TRANSFORM_ROTATE_X | LC_OBJECT_TRANSFORM_ROTATE_Y | LC_OBJECT_TRANSFORM_ROTATE_Z);