1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-13 08:24:27 +00:00
Commit Graph

941 Commits

Author SHA1 Message Date
Enrico Turri 5693545d15 Fixed conflicts after merge with master 2020-03-09 16:03:15 +01:00
Enrico Turri 6c36577e8e #3782 - World Z axis always vertical for non-free camera 2020-03-09 15:23:29 +01:00
Enrico Turri de7a09f833 Fixed conflicts after merge with master 2020-03-05 10:41:11 +01:00
Enrico Turri dc3df3aec7 Removed temporary debug output and clean up 2020-03-05 10:14:12 +01:00
Enrico Turri 1bff1f7460 Added temporary debug output to investigate crash on MAC when closing using Command+Q 2020-03-04 14:19:15 +01:00
bubnikv c9df6e5cf8 Disabled the 3DConnexion mouse scroll wheel spurious events filtering
on other platforms than Windows.
2020-03-04 11:55:47 +01:00
bubnikv 0b96855c2e Reworked the 3DConnexion interfacing code to run the device
enumeration / connect / disconnect and read out at the background
thread only.
2020-03-04 11:36:36 +01:00
Enrico Turri d12cc6cb77 Removed temporary debug output 2020-03-03 08:34:03 +01:00
Enrico Turri 8b5a08a64a Added temporary debug output 2020-03-02 15:22:41 +01:00
Enrico Turri 595128a90d View toolbar's initialization of icon size moved from GLCanvas3D::GLCanvas3D() to Plater::priv::priv() for OSX build 2020-03-02 12:45:04 +01:00
Enrico Turri 10d2193645 Fixed build on MAC 2020-03-02 11:40:35 +01:00
Enrico Turri 2f8970de86 Fixed conflicts after merge with master 2020-03-02 11:35:03 +01:00
Enrico Turri 0b629eb905 GLCanvas3DManager moved from being a static member of _3DScene to be a normal member of GUI_App 2020-03-02 10:58:46 +01:00
bubnikv 0a0219961b Free rotating camera reworked to rotate around the free rotation
axis in a single step.
2020-02-28 14:59:59 +01:00
bubnikv 7c55674220 Disabled implicit conversion of wxString to std::string or const char*
and vice versa. Fixed one last implicit wxString conversion.
2020-02-27 17:02:08 +01:00
Lukas Matena f60c117761 One more encoding problem
Uncovered after rebasing onto current master
2020-02-21 12:53:51 +01:00
Benjamin Greiner a877147afd fix #3402
Amended by lukasmatena: changed mb_str() to ToUTF8()
2020-02-21 12:53:51 +01:00
YuSanka 487ac0423e Implemented time estimation for PausePrint (#3544)
DoubleSlider: fixed get_color_for_color_change_tick()
2020-02-20 17:33:43 +01:00
Enrico Turri 4a59a45d51 ENABLE_SHOW_SCENE_LABELS set as default 2020-02-13 13:24:52 +01:00
Enrico Turri 847efec2ed ENABLE_6DOF_CAMERA set as default 2020-02-13 12:13:54 +01:00
Enrico Turri 0f5f2bc519 Reintroduce rotation limits for camera for FDM printers 2020-02-10 12:36:52 +01:00
bubnikv b8c898bf40 Fixed a bug in validation of the FDM Print to check for extruder
collisions against already printed objects: Rotation of an object
was not being taken into account.
Fixes #2450 PrusaSlicer 2.0 Sequential printing vs rotate object
Fixes #3585 Always Sequential Printing Error (Regardless of setting, placement or object size)

Fixed some collisions in sequential print just after arrangement by
making the validation using a slightly lower extruder radius value
than the arrangement.

Refactored PrintObject coordinate system so that the PrintObject's
coordinate system is always centered in respect to its ModelObject's
geometries. This refactoring may improve path planning a bit and
it may lower the requirements on bits representing Clipper coordinates
by 1 bit.
2020-02-07 14:10:27 +01:00
Enrico Turri ef32cd6059 Fixed conflicts after merge with master 2020-02-06 15:28:50 +01:00
Enrico Turri c6ca180142 Use frontend data to update labels 2020-02-06 15:19:53 +01:00
bubnikv fb235cb675 Color change - handling Color Change data stored for different
printer configuration:

ss -> sm : Just apply the color changes of the original ss project at the active extruder.
ss -> mm : There are no tool changes stored. Ignore color changes, they are invalid because they are extruder non-specific.

sm -> ss : Apply tool changes as color changes (tool changes remember the target color), apply original color changes.
sm -> mm : Ignore both color changes and tool changes.

mm -> ss/sm : Ignore both color changes and tool changes.
2020-02-06 14:03:27 +01:00
Enrico Turri 3981e25f75 Fixed labels auto-sizing 2020-02-06 12:06:39 +01:00
Enrico Turri bfea105c2e Fixed mmissing #if ENABLE_SHOW_SCENE_LABELS 2020-02-06 10:39:42 +01:00
Enrico Turri 5c4b481e35 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-05 15:27:20 +01:00
Enrico Turri a04c72b0c9 Fixed unneded auto-extra frame render 2020-02-05 15:27:11 +01:00
Enrico Turri fce9f77472 Translations with arrow keys with modifiers:
Shift -> slower translations

Ctrl -> translations in camera space
2020-02-05 13:14:50 +01:00
Lukas Matena 617912ecc1 Fixed a crash on deleting object with SLA gizmo active
Rephrased text informing about hidden objects in both SLA gizmos
2020-02-04 15:03:10 +01:00
Lukas Matena 0e3ebb3e07 Hollowing gizmo: Invalidate drilled mesh in case a hole is manipulated
This way the holes cannot be placed on its own walls
Downside is that AABB trees have to be recalculated
2020-02-04 15:03:10 +01:00
Enrico Turri 3ec4b77dcd Added item menu 'Edit/Show labels' and removed labels activation from preferences dialog 2020-02-04 14:42:26 +01:00
Enrico Turri dc393e2f0a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-04 12:28:06 +01:00
Enrico Turri 87daba9288 Movements and rotations by keyboard indipendent from gizmos:
Left arrow = Decrease X by 1mm

Right arrow = Increase X by 1mm

Up arrow = Decrease Y by 1mm

Down arrow = Increase Y by 1mm

PgUp = Rotate 45 degrees CCW

PgDown = Rotate 45 degrees CW
2020-02-04 11:42:58 +01:00
Lukas Matena 227cc4dc33 Fixed conflicts after merge
slaposHollowing was divided into slaposHollowing and slaposDrillHoles on master
This commit takes this into account on the code that was merged from lm_drilling_backend_rebased
2020-02-03 15:42:54 +01:00
Lukas Matena a1d4dab999 Merge branch 'master' into lm_drilling_backend_rebased 2020-02-03 15:20:16 +01:00
bubnikv f28d0ebc18 Implemented reload of original mesh volume in case the SLA hollowing
step is no more valid.
2020-02-03 15:17:18 +01:00
Enrico Turri 1ee2f16a71 3D scene labels transparent to mouse click 2020-02-03 13:24:11 +01:00
Enrico Turri 6fa49f5931 Added sequential print order id to 3D scene labels 2020-02-03 11:44:26 +01:00
Enrico Turri 251a7d1329 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-03 08:23:55 +01:00
Lukas Matena 378321231f Fix of tripping glAssert after switching to Preview on Linux/GTK2
(fix suggested and thus approved by @enricoturri1966)
2020-01-31 14:50:37 +01:00
Enrico Turri 3a99b23ec7 #3580 - Added menu item 'Edit/Reload from disk' and F5 key acceleration to reload the entire plater 2020-01-31 12:15:04 +01:00
bubnikv 9ef65b23d8 Implemented loading of hollowed SLA mesh into the scene
in place of the normal mesh.

WIP: The code is inefficient (it does not store the timestamp
of the hollowed mesh, therefore it refreshes the hollowed mesh on each
scene update) and if the hollowing gets invalidated, the original mesh
is currently not being reloaded and the hollowed mesh is still visible.
2020-01-30 17:58:49 +01:00
Lukas Matena 08dcbd0271 Hollowing gizmo - most of updating now assumes that common data struct is updated properly 2020-01-30 14:31:39 +01:00
Enrico Turri 0407634824 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 15:46:48 +01:00
Enrico Turri e679bcced6 Follow-up of 17a6b696e7 -> Fixed missing imgui window size initialization 2020-01-29 15:40:56 +01:00
Enrico Turri 504413cc91 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 12:31:50 +01:00
Enrico Turri 17a6b696e7 Workaround to fix SPE-1082 + refactoring of 6 dof camera 2020-01-29 12:08:38 +01:00
Lukas Matena 76927ce399 REVERT LATER: TEMPORARILY MANGLED reload_scene FUNCTION
This commit horribly cripples reload_scene function just to update volumes in scene so that Hollowing and SLASupport gizmos can be updated to the new logic
    It should be later reverted and the same be achieved in a better way
2020-01-29 10:07:59 +01:00