bubnikv
2ad3c05a65
WIP: Improvement in the picking robustness: store a checksum
...
into the alpha channel.
2019-08-07 11:37:38 +02:00
bubnikv
a58b1844e0
WIP: Picking fix - disable alpha blending and render with false colors
...
including the alpha channels, which have their 3 lowest bits set to zero.
In case some blending occurs, the lowest 3 bits will likely be used
to interpolate between the false colors, therefore the 3 lowest bits
may be used to detect alpha blending or multi-sampling.
2019-08-07 11:14:04 +02:00
YuSanka
0520da3241
Merge remote-tracking branch 'origin' into ys_printable_property
2019-08-06 10:31:17 +02:00
YuSanka
b43f7c3880
Generated new POT-file
...
Fixed lines with translation of the empty strings
2019-08-06 10:01:10 +02:00
YuSanka
4152a5df43
Implemented update on canvas of a printable state for new volumes added from ObjectList
2019-08-05 14:57:30 +02:00
bubnikv
7e1d2daf78
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-08-05 14:30:42 +02:00
bubnikv
731e5abd88
Fixed a regression issue where excessive memory was allocated
...
for the GLVolumes before sending to the GPU driver. The following commits
were partially reverted:
4269c8b23c
Removed GLVolume non-VBO rendering
d15698e21e
GLVolume and GLIndexedVertexArray refactored to send data to gpu at the first render call
Namely, the GLVolume buffers are "shrink to size"'d before sending their
content to the OpenGL driver, and the vertex buffers are populated
as quickly as possible from the GLVolume, so that the same buffer is not
kept twice in RAM on systems, where the RAM is shared with the graphics
card.
Also the memory allocation reporting was improved for the GLVolumes.
2019-08-05 14:30:32 +02:00
Enrico Turri
1cdc3e0493
Workaround for gizmos being clipped by the perspective camera
2019-08-02 15:30:37 +02:00
bubnikv
ca1c78b3fc
Merge remote-tracking branch 'remotes/origin/et_custom_bed'
2019-07-30 16:48:47 +02:00
Lukas Matena
94f9b701e2
Merge branch 'lm_sla_gizmo_undo'
2019-07-30 14:52:44 +02:00
YuSanka
47b3440561
Fix of #2401
2019-07-29 15:44:00 +02:00
Lukas Matena
fe62362960
Hiding the sla support structures after undo/redo
2019-07-28 11:37:08 +02:00
Enrico Turri
10b27968d1
Code cleanup
2019-07-26 11:32:44 +02:00
Enrico Turri
77857f7292
Refactoring into rendering pipeline
2019-07-26 09:45:22 +02:00
Enrico Turri
f4209dce0b
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo
2019-07-25 15:29:58 +02:00
Enrico Turri
9bcdb2ebd0
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-25 15:29:25 +02:00
Enrico Turri
4e4bdb5edd
Removed obsolete code
2019-07-25 15:28:34 +02:00
Enrico Turri
7e7550b416
Custom bed texture applied to custom bed shapes
2019-07-24 10:11:17 +02:00
Enrico Turri
0d10d8aba7
1st installment for selection's undo/redo snapshots
2019-07-23 15:14:08 +02:00
Enrico Turri
7749677b27
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-22 11:57:17 +02:00
tamasmeszaros
a59e782e85
Update Arrange tooltip: [Shift+A]
2019-07-22 11:36:56 +02:00
Enrico Turri
c1dee0e87d
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-22 11:26:02 +02:00
tamasmeszaros
dcb073d4fd
Merge branch 'tm_arrange_selection'
2019-07-22 11:14:34 +02:00
Enrico Turri
9cb1a584e1
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-22 08:21:40 +02:00
enricoturri1966
b60b44ed5e
Added additional tooltip to toolbar items and use it for undo/redo items
2019-07-20 14:03:34 +02:00
enricoturri1966
33c0683d11
Reworked rendering of toolbars background texture
2019-07-20 12:02:29 +02:00
tamasmeszaros
8d66b51e8c
Merge branch 'master' into tm_arrange_selection
2019-07-19 18:17:58 +02:00
bubnikv
47df9506bb
Fix of OSX Imgui Undo / Redo pull down list scaling issue.
2019-07-19 17:16:20 +02:00
bubnikv
07a3072622
Simplified loading of the SLA support structures into the scene.
...
Fixed referesh of SLA support structures after Undo / Redo
and when moving an object outside / inside the build volume.
2019-07-19 17:14:37 +02:00
bubnikv
ba997be812
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-07-19 15:59:35 +02:00
bubnikv
152c2fe0c0
Undo / Redo pull down menu scaling fix on OSX Retina
2019-07-19 15:59:23 +02:00
Enrico Turri
81d3669a25
Undo/Redo buttons moved into their own toolbar
2019-07-19 15:36:55 +02:00
Enrico Turri
749bb2bfed
Refactoring in GLTexture
2019-07-19 11:18:19 +02:00
Enrico Turri
84d61e28fd
Tech ENABLE_TEXTURES_FROM_SVG set as default
2019-07-19 09:52:01 +02:00
tamasmeszaros
6b8c72944d
Merge branch 'master' into tm_arrange_selection
2019-07-18 12:59:40 +02:00
Enrico Turri
8febd88e80
Fixed rendering of toolbars' textures with prespective camera
2019-07-18 11:36:17 +02:00
tamasmeszaros
6949543912
Fixes after merge with master.
2019-07-17 18:10:08 +02:00
tamasmeszaros
a695dec51a
Merge branch 'master' into tm_arrange_selection
2019-07-17 17:25:31 +02:00
Enrico Turri
f97a61cdcf
Fixed use of translate macros
2019-07-17 14:13:50 +02:00
Enrico Turri
401707a6fe
Another refactoring of GLGizmosManager
2019-07-17 12:43:27 +02:00
Enrico Turri
0a530ab7bc
Added undo/redo snapshot for layers height editing
2019-07-17 10:03:00 +02:00
Enrico Turri
21624f5305
Framework to serialize gizmos into undo/redo stack
...
Serialization into undo/redo of Cut gizmo
Refactoring of GLGizmosManager
2019-07-17 08:38:48 +02:00
tamasmeszaros
44801f4429
Priority for wipe tower, Increased safety distance from bed edges.
...
* WipeTowerInfo class extended in plater (WipeTower) instead of GLCanvas3D
* Bed origin support in ModelInstance and WipeTower
2019-07-16 18:33:42 +02:00
tamasmeszaros
1b0e192046
Arrange cache in ModeInstance and logical bed remembered.
2019-07-15 17:30:44 +02:00
bubnikv
d2a3a36013
Fix of the SLA Undo
2019-07-15 15:51:25 +02:00
bubnikv
a492360d19
Fix of the merge - missing Undo / Redo toolbar buttons.
2019-07-15 11:59:54 +02:00
bubnikv
ab7ecc1819
Merge remote-tracking branch 'remotes/origin/vb_undo_redo'
2019-07-15 11:34:18 +02:00
Lukas Matena
e674c586b0
Merge branch 'lm_improving_wipe_tower'. Summary of changes:
...
- wipe tower respects max volumetric flow, slowing down with PVA etc is not hardcoded anymore
- wipe tower is now allowed for multiple-extruder printers. single extruder stuff is not used in that case (ramming, cooling, etc.)
- start/end filament and toolchange custom gcodes are now inserted differently than before - see 41164a9
- some refactoring, e.g. the abstract WipeTower class was eradicated
2019-07-15 10:25:38 +02:00
tamasmeszaros
df7bb94daf
Not handling logical beds in arrange()
2019-07-12 21:17:11 +02:00
Enrico Turri
cc70c8dff9
Tech ENABLE_SVG_ICONS set as default
2019-07-12 10:13:35 +02:00
Enrico Turri
2f57f756e5
Follow-up of 4c6c608342
-> refactoring
2019-07-12 09:26:19 +02:00
Enrico Turri
4c6c608342
GLToolbar and GLToolbarItem refactored to allow two different actions when left/right clicking on items.
...
Stack dialog for undo and redo items is now shown on right click only
2019-07-11 15:29:46 +02:00
Enrico Turri
f964f5e99a
Deactivate undo/redo toolbar items by pressing Esc key
2019-07-11 07:54:33 +02:00
Enrico Turri
dbf0eacfa7
Deactivate undo/redo toolbar items when leaving the 3D scene or clicking into it
2019-07-11 07:46:40 +02:00
Enrico Turri
1b5ab100bd
GLToolbar::m_imgui_hovered_pos replaced with GLCanvas3D::m_imgui_undo_redo_hovered_pos
2019-07-10 14:08:14 +02:00
Enrico Turri
14dad5039a
Imgui dialogs for undo/redo centered on their toolbar item icon
2019-07-10 13:45:25 +02:00
YuSanka
3720e6a3a3
Fixed redo_to() function and code cleaning from redundant options
2019-07-10 10:15:07 +02:00
YuSanka
f985f5190c
Completed undo/redo from a toolbar
2019-07-09 20:45:00 +02:00
YuSanka
3dd1bc753c
Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo
2019-07-09 19:41:37 +02:00
YuSanka
1347e655c2
Next improvements of an undo/redo from a toolbar
2019-07-09 19:39:36 +02:00
Enrico Turri
d4914441f3
Modified logic to add snapshots to undo/redo stack using GLCanvas::do_xxxxxx() methods
2019-07-09 10:18:57 +02:00
YuSanka
fbf14b42e9
Added undo/redo icons. Fist step to implementation Undo/Redo list for toolbar
2019-07-08 18:01:14 +02:00
Enrico Turri
4ba7dfb6dd
Refactoring of functions thick_lines_to_indexed_vertex_array() to reduce the amount of produced vertices while reducing visual artifacts in gcode toolpaths due to averaged normals
2019-07-08 15:30:59 +02:00
Enrico Turri
9ba5568539
Fixed conflicts after merge with master
2019-07-08 09:23:37 +02:00
bubnikv
4e2fda3315
Undo / Redo fixes
2019-07-05 19:06:19 +02:00
bubnikv
c7cc760067
Merge remote-tracking branch 'origin/master' into vb_undo_redo
2019-07-04 20:22:15 +02:00
YuSanka
e4d8c5410c
Merge remote-tracking branch 'origin/master' into ys_new_features
2019-07-04 14:26:05 +02:00
bubnikv
5a2ace1a6e
WIP Undo / Redo: First Undo in the history of PrusaSlicer!
2019-07-04 10:45:41 +02:00
tamasmeszaros
e81f8a5fd9
WIP still with arrange return value.
2019-07-03 19:24:41 +02:00
YuSanka
136e5156bc
Fixed colot_print issues:
...
* Disabled color change information for the SLA and FFF-multimaterial presets
* Corrected switch between "color print" and "feature type" on Preview
2019-07-02 14:06:58 +02:00
Enrico Turri
d15698e21e
GLVolume and GLIndexedVertexArray refactored to send data to gpu at the first render call
2019-07-02 12:55:55 +02:00
Enrico Turri
2356fe5a13
Added member BoundingBoxf3 m_bounding_box to GLIndexedVertexArray and removed member BoundingBoxf3 bounding_box from GLVolume
2019-07-01 13:26:06 +02:00
Enrico Turri
4269c8b23c
Removed GLVolume non-VBO rendering
2019-07-01 12:28:16 +02:00
tamasmeszaros
299e4f74c7
Arranging with new structure.
2019-06-28 17:03:50 +02:00
tamasmeszaros
19e6bf58dd
WIP on structuring arrange inputs
2019-06-27 21:13:44 +02:00
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
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
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
BeldrothTheGold
d818d1b429
Add debug option to display picking pass to screen
2019-06-25 19:25:03 -06: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
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
Enrico Turri
7aaba25520
Do not allow to copy/paste volumes when using sla printer
2019-06-24 13:21:05 +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
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
Enrico Turri
b91b94ad3c
Key K set as camera type toggle and updated keyboard shortcuts dialog
2019-06-19 14:33:09 +02:00