diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2020-02-13 14:13:54 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2020-02-13 14:13:54 +0300 |
| commit | 847efec2ed71896cdb84e70cac17add166a36154 (patch) | |
| tree | 9297d0dff10ac66bae898c84393191afbfff21f8 /src/slic3r/GUI/Mouse3DController.cpp | |
| parent | 904263d231e20e97ca8f2f62b5ea420a6fa65b26 (diff) | |
ENABLE_6DOF_CAMERA set as default
Diffstat (limited to 'src/slic3r/GUI/Mouse3DController.cpp')
| -rw-r--r-- | src/slic3r/GUI/Mouse3DController.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/slic3r/GUI/Mouse3DController.cpp b/src/slic3r/GUI/Mouse3DController.cpp index a6d7cbef4..2be017e54 100644 --- a/src/slic3r/GUI/Mouse3DController.cpp +++ b/src/slic3r/GUI/Mouse3DController.cpp @@ -162,17 +162,8 @@ bool Mouse3DController::State::apply(Camera& camera) if (has_rotation()) { -#if ENABLE_6DOF_CAMERA Vec3d rotation = (m_rotation_params.scale * m_rotation.queue.front()).cast<double>(); camera.rotate_local_around_target(Vec3d(Geometry::deg2rad(rotation(0)), Geometry::deg2rad(-rotation(2)), Geometry::deg2rad(-rotation(1)))); -#else - const Vec3f& rotation = m_rotation.queue.front(); - float theta = m_rotation_params.scale * rotation(0); - float phi = m_rotation_params.scale * rotation(2); - float sign = camera.inverted_phi ? -1.0f : 1.0f; - camera.phi += sign * phi; - camera.set_theta(camera.get_theta() + theta, wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() != ptSLA); -#endif // ENABLE_6DOF_CAMERA m_rotation.queue.pop(); ret = true; } @@ -887,15 +878,9 @@ bool Mouse3DController::handle_packet_translation(const DataPacketRaw& packet) bool Mouse3DController::handle_packet_rotation(const DataPacketRaw& packet, unsigned int first_byte) { double deadzone = (double)m_state.get_rotation_deadzone(); -#if ENABLE_6DOF_CAMERA Vec3f rotation((float)convert_input(packet[first_byte + 0], packet[first_byte + 1], deadzone), (float)convert_input(packet[first_byte + 2], packet[first_byte + 3], deadzone), (float)convert_input(packet[first_byte + 4], packet[first_byte + 5], deadzone)); -#else - Vec3f rotation(-(float)convert_input(packet[first_byte + 0], packet[first_byte + 1], deadzone), - (float)convert_input(packet[first_byte + 2], packet[first_byte + 3], deadzone), - -(float)convert_input(packet[first_byte + 4], packet[first_byte + 5], deadzone)); -#endif // ENABLE_6DOF_CAMERA if (!rotation.isApprox(Vec3f::Zero())) { |