YuSanka
dd1fb286c3
Merge remote-tracking branch 'origin/master' into ys_new_features
2019-06-27 14:01:50 +02:00
Enrico Turri
1058721dba
Added visual hints in 3D scene for layers editing
2019-06-27 13:42:50 +02:00
Enrico Turri
90d1ac2c8f
Tech ENABLE_RENDER_PICKING_PASS extended so that user can switch between picking pass texture rendering and regular rendering by pressing [T] key
2019-06-27 11:25:04 +02:00
bubnikv
27ee68d2f9
WIP Undo / Redo: ModelID / ModelBase renamed to ObjectID / ObjectBase
2019-06-27 11:02:45 +02:00
enricoturri1966
d16c670ed1
Merge pull request #2569 from BeldrothTheGold/master
...
Add debug preprocessor directive in Technologies.hpp to render picking pass to window.
2019-06-27 09:44:48 +02:00
Enrico Turri
070c9f03fe
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-06-26 14:25:26 +02:00
Enrico Turri
a07088a8d9
#2561 - Fixed freezing of perspective camera when zooming-in
2019-06-26 14:25:05 +02:00
YuSanka
1525a864c5
Merge remote-tracking branch 'origin/master' into ys_new_features
2019-06-26 13:33:05 +02:00
YuSanka
104a289cfe
Implemented interface for updating 3DScene after set a focus to some editor
2019-06-26 13:30:20 +02:00
bubnikv
a710e7e7e4
WIP: Undo / Redo stack.
...
Integration of the "cereal" serialization library.
Serialization / deserialization of the DynamicConfig / DynamicPrintConfig.
DynamicPrintConfig serializes ordinal identifiers instead
of the option key strings to conserve space.
2019-06-26 13:26:49 +02:00
Lukas Matena
d2136ab625
ObjectList no longer caps number of extruders to 9 (fixes https://github.com/prusa3d/PrusaSlicer/issues/2558 )
2019-06-26 13:12:25 +02:00
Lukas Matena
d845332de1
Fixed a crash when using place to bed function with the layer editing active
...
This was caused by trying to render a deleted layer height profile. Other gizmos were
not affected because they are not dragging at the time of their action, so the profile
was correctly recalculated for them.
2019-06-26 11:51:18 +02:00
YuSanka
1de06a9461
Merge remote-tracking branch 'origin/master' into ys_bugfixing
2019-06-26 09:49:33 +02:00
YuSanka
ac82cbe0cc
Fix of #2548
2019-06-26 09:48:52 +02:00
BeldrothTheGold
d818d1b429
Add debug option to display picking pass to screen
2019-06-25 19:25:03 -06:00
Vojtech Kral
4fb904357f
Warnings cleanup in BonjourDialog, ConfigWizard, FirmwareDialog,
...
GLGizmoCut, ImGuiWrapper
2019-06-25 18:16:53 +02:00
Enrico Turri
2f806dedc7
Fixed rendering of selection rectangle with perspective camera
2019-06-25 09:51:43 +02:00
Enrico Turri
3d755e1bbe
Removed 'Use legacy OpenGL 1.1 rendering' option
2019-06-25 09:20:58 +02:00
bubnikv
27cc66eb54
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-06-25 08:57:03 +02:00
bubnikv
d689195bda
Fix of the previous commit on color change fix.
2019-06-25 08:56:53 +02:00
Enrico Turri
992170c5f6
1) Perspective camera set as default camera type
...
2) Camera type selection added to Preferences dialog
2019-06-24 15:55:14 +02:00
YuSanka
c198d826af
Setting min_z bigger than max_z cause an increase of the max_z
2019-06-24 15:43:16 +02:00
bubnikv
5320ed9374
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-06-24 15:27:43 +02:00
bubnikv
198600543d
Fix of incorrect color print preview due to the tbb::parallel_for
...
not respecting the grain size exactly.
Also the tool path generation has been optimized to launch less
threads and to produce larger vertex buffers.
2019-06-24 15:27:32 +02:00
YuSanka
daac165a44
Merge remote-tracking branch 'origin/master' into ys_new_features
2019-06-24 13:56:35 +02:00
YuSanka
e737f15bfa
Fix of OSX build
2019-06-24 13:47:03 +02:00
Enrico Turri
53d1ff879c
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-06-24 13:21:14 +02:00
Enrico Turri
7aaba25520
Do not allow to copy/paste volumes when using sla printer
2019-06-24 13:21:05 +02:00
YuSanka
0f35a95d75
Merge remote-tracking branch 'origin/master' into ys_bugfixing
2019-06-24 13:13:34 +02:00
YuSanka
14d8621ffe
Color_print issues :
...
- fixed #1933
- implemented thumb moving to the mouse click position
- implemented "discard color changes" button
2019-06-24 13:11:18 +02:00
Enrico Turri
6b0d75127b
#2428
...
1) Reworked logic for pasting volumes
2) Fixed paste of volumes into different objects
3) Do not apply offset when pasting into the copied object
4) Keep source transformation matrix and relative positions when copy/pasting volumes into another object
2019-06-24 12:26:11 +02:00
Vojtech Kral
1eb7634af7
Merge branch 'updating': Index installation
2019-06-24 11:09:55 +02:00
Vojtech Kral
767dcb9607
Merge branch 'bugfixes': Fixes in fw updater UI
2019-06-24 11:09:07 +02:00
Enrico Turri
5766e9e915
Fixed conflicts after merge with branch et_perpsective_camera
2019-06-24 11:08:42 +02:00
Enrico Turri
00b9a3ad32
ENABLE_COMPRESSED_TEXTURES set as default
2019-06-24 09:54:58 +02:00
Enrico Turri
8b3d88bc0a
Adaptive perspective camera frustrum
2019-06-24 09:38:46 +02:00
Enrico Turri
301eda7369
ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION set as default
2019-06-24 09:27:19 +02:00
Enrico Turri
96276394d1
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments
2019-06-24 08:15:41 +02:00
bubnikv
27459a9072
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-06-20 16:15:26 +02:00
bubnikv
35b3fd3176
Integrated the new layer height spans with configs into the backend.
...
Fixed some compiler warnings.
2019-06-20 16:15:09 +02:00
Vojtech Kral
503212181c
Updating: Index installation
...
Prevents cancelled updates from popping up repeatedly
on each application startup
2019-06-20 14:26:29 +02:00
YuSanka
fe395546f0
Added "info" tooltip for a LockButton on Manipulation panel ( #2539 )
2019-06-20 12:56:23 +02:00
Vojtech Kral
8208da0a7b
Firmware updater: Fix MMU flashing in GUI
2019-06-20 11:17:35 +02:00
Vojtech Kral
09da7a84b5
Firmware updater: Prevent empty flashing jobs
2019-06-20 11:17:35 +02:00
Enrico Turri
e5be8adadf
Fixed build on MacOS
2019-06-20 11:05:05 +02:00
Enrico Turri
b7f67369c9
Serialized camera type and fixed Mac build
2019-06-20 10:02:52 +02:00
Enrico Turri
6af69667a3
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera
2019-06-20 08:51:08 +02:00
YuSanka
09f4831f4e
Merge remote-tracking branch 'origin/master' into ys_bugfixing
2019-06-19 16:32:40 +02:00
YuSanka
7f8bb94a55
Fixed wxEVT_CHAR handling for DoubleSlider
2019-06-19 16:28:56 +02:00
Enrico Turri
5dcc6c7f36
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera
2019-06-19 14:33:31 +02:00
Enrico Turri
b91b94ad3c
Key K set as camera type toggle and updated keyboard shortcuts dialog
2019-06-19 14:33:09 +02:00
Enrico Turri
da8179d9c7
More camera related functionalities moved from GLCanvas3D to Camera
2019-06-19 14:18:51 +02:00
tamasmeszaros
1e7b5c5a81
Merge branch 'tm_rotcalipers'
2019-06-19 13:11:18 +02:00
Enrico Turri
a3e6412113
Enabled perspective camera
2019-06-19 13:01:18 +02:00
tamasmeszaros
4a71c42f9b
Merge branch 'master' into tm_rotcalipers
2019-06-19 11:07:21 +02:00
Enrico Turri
b0b54ed0e6
Fixed flickering of 3D view when moving objects on NVIDIA graphic cards
2019-06-19 11:05:34 +02:00
Enrico Turri
a15cb597ab
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera
2019-06-19 10:35:27 +02:00
tamasmeszaros
78610de473
Fix build on vs2013
...
Fix 2 for vs2013
2019-06-19 10:18:51 +02:00
Enrico Turri
28dd52d88b
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera
2019-06-19 08:17:58 +02:00
tamasmeszaros
b4ef812d32
Merge branch 'master' into tm_sla_printer_mirror
2019-06-18 17:42:10 +02:00
tamasmeszaros
18bbf493c1
Merge branch 'master' into tm_ui_jobs
2019-06-18 16:26:56 +02:00
tamasmeszaros
468516aa31
Apply fixes for the ui jobs.
...
- Localization
- Mutual exclusion (ExclusiveJobGroup), only one UI job can run at a time, and background processing is stopped
- m_range not used for finalization anymore
- stop_jobs called before Window is closed
2019-06-18 16:24:30 +02:00
Enrico Turri
b001eca21f
#2528 - New project command automatically switches to 3D editor view
2019-06-18 14:45:10 +02:00
tamasmeszaros
d60ecb3788
Merge remote-tracking branch 'origin/master' into tm_ui_jobs
2019-06-18 12:16:24 +02:00
YuSanka
917702f252
Fixed DoubleSlider manipulation from Preview scene
2019-06-18 11:40:26 +02:00
bubnikv
0c95d4e0d9
Merge remote-tracking branch 'remotes/origin/ys_new_features'
2019-06-18 10:01:29 +02:00
bubnikv
a892fa6105
Merge remote-tracking branch 'remotes/origin/ys_bugfixing'
2019-06-18 09:57:55 +02:00
bubnikv
f72f55dc08
A bit of documentation of the mirroring and reset buttons at the side panel.
2019-06-18 09:57:07 +02:00
bubnikv
1cbd6845d5
Merge remote-tracking branch 'remotes/origin/lm_reset_buttons'
2019-06-18 09:33:33 +02:00
bubnikv
c95a324c3f
Merge branch 'vb_admesh_fix'
2019-06-18 08:54:50 +02:00
bubnikv
630883ad0f
Extended the error message when the G-code cannot be copied to the SD card
2019-06-18 08:54:28 +02:00
Enrico Turri
5ee695b629
#2506 - Fixed crash while manually editing SLA supports
2019-06-18 08:53:13 +02:00
YuSanka
90beadb65f
Check a possibility to load SLA project if there is at least one multi-part object on the bed
2019-06-17 17:04:19 +02:00
YuSanka
f70b25d2f8
Fixed SPE 957 - Impossible to add a part by "Load..." to an object, if the object has some instances
2019-06-17 15:33:58 +02:00
YuSanka
72479428d7
Merge remote-tracking branch 'origin/master' into ys_bugfixing
2019-06-17 14:02:43 +02:00
YuSanka
7fe8965c53
Merge remote-tracking branch 'origin/master' into ys_new_features
2019-06-17 13:50:12 +02:00
YuSanka
5fd3cc2676
Select edited layer after changing instead of "Layers" selection, if editing was in "Layer" mode
2019-06-17 13:46:56 +02:00
YuSanka
f394f84d51
Fixed selection after layers deleting
2019-06-17 13:09:11 +02:00
tamasmeszaros
ce22251707
Warning hunt session followup
2019-06-17 10:05:46 +02:00
Enrico Turri
ac8de0bcaf
Follow-up of 1a91add2e6
-> Improvements to tighter camera frustrum to reduce z-fighting
2019-06-14 15:37:29 +02:00
Lukas Matena
7b07a8da83
Reset buttons: synchronization of instances/volumes
2019-06-14 15:28:09 +02:00
Lukas Matena
980c6673d4
Reset buttons - fixed rotation of instances with multiple volumes
...
Mirroring buttons now hide where appropriate
2019-06-14 15:28:09 +02:00
Lukas Matena
a3c1644ead
Added mirroring buttons into object manipulation panel
2019-06-14 15:03:42 +02:00
Lukas Matena
9f236bc603
Added transformation reset buttons in object manipulation panel
2019-06-14 15:03:42 +02:00
Enrico Turri
541f58c656
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera
2019-06-14 10:57:29 +02:00
Enrico Turri
ed4b71eb15
Layers editing overlay rendering modified to use a texture drawn on a quad lying in a plane parallel to the camera viewport
2019-06-14 10:55:56 +02:00
Enrico Turri
1a91add2e6
Tighter camera frustrum to reduce z-fighting
2019-06-14 10:38:09 +02:00
bubnikv
dbfa4e6c83
Fix of a smart pointer gymnastics from previous commit
2019-06-13 16:55:12 +02:00
bubnikv
9379fedd43
Further C++isation of the admesh library & TriangleMesh
...
(copy & move constructors / operators)
2019-06-13 16:33:50 +02:00
YuSanka
7da9d2f66d
Merge remote-tracking branch 'origin/master' into ys_new_features
2019-06-13 16:18:39 +02:00
YuSanka
86e7a07dd8
Fixed selection
2019-06-13 16:17:54 +02:00
YuSanka
4712c5bbdf
DoubleSlider manipulation from preview scene
2019-06-13 16:10:33 +02:00
YuSanka
a9ee4ff4b5
Fixed object selection in right panel form the Scene by context menu
2019-06-13 15:35:10 +02:00
tamasmeszaros
821ca0e36a
Build fix when boost is not in prefix/boost
2019-06-13 14:19:24 +02:00
YuSanka
e00774d2e2
Workarounds for selection under OSX and GTK
2019-06-13 13:00:46 +02:00
YuSanka
c9dd5f8786
Fixed updating of data for LayerEditors selection
2019-06-13 11:37:03 +02:00
Enrico Turri
a99466ef1d
Method Camera::apply_projection() called at every rendered frame
2019-06-13 10:24:19 +02:00
Enrico Turri
f0b228c4d2
Added support for distance between camera position and camera target
2019-06-13 09:12:44 +02:00
Enrico Turri
26d48b7f52
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera
2019-06-13 08:48:19 +02:00
Enrico Turri
9805417028
Fixed method Camera::get_position()
2019-06-13 08:47:38 +02:00