Enrico Turri
|
ba8c8e5a1f
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-07-17 10:39:42 +02:00 |
|
Enrico Turri
|
f17d67871a
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-07-17 08:28:26 +02:00 |
|
Enrico Turri
|
7c545bc2b5
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-07-13 14:45:42 +02:00 |
|
Enrico Turri
|
4805df6037
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-07-13 14:45:15 +02:00 |
|
Enrico Turri
|
d99b484ac6
|
Fixed update of sliders' texts into object settings dialog
|
2018-07-13 14:41:49 +02:00 |
|
Enrico Turri
|
344b71915f
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-07-13 11:27:48 +02:00 |
|
Enrico Turri
|
2bf7b02e3a
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-07-13 11:27:37 +02:00 |
|
Enrico Turri
|
06613e4792
|
Fixed 3D preview not updated after g-code export
|
2018-07-13 11:16:28 +02:00 |
|
Enrico Turri
|
7caada244a
|
Attempt to fix SPE-356
|
2018-07-13 08:58:28 +02:00 |
|
Enrico Turri
|
0f5ce827a1
|
Rotate gizmo radius changed only when moving one of multiple instances
|
2018-07-12 15:19:43 +02:00 |
|
Enrico Turri
|
4488ceaf7d
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-07-12 15:16:56 +02:00 |
|
Enrico Turri
|
b2d9877cd5
|
Fixed crash on MAC when selecting system info
|
2018-07-12 13:34:39 +02:00 |
|
Enrico Turri
|
76d4b9dbb8
|
Attempt to fix SPE-352
|
2018-07-12 13:10:18 +02:00 |
|
Enrico Turri
|
63ab713585
|
Added debug output to investigate SPE-352
|
2018-07-12 12:15:30 +02:00 |
|
Enrico Turri
|
0e9ac1679f
|
Keep fixed radius of rotate gizmo
|
2018-07-12 11:26:13 +02:00 |
|
Enrico Turri
|
cb59cfe128
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-07-12 08:32:31 +02:00 |
|
Enrico Turri
|
1356a9977e
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-07-12 08:32:18 +02:00 |
|
Enrico Turri
|
6c6f6ed4e2
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-27 15:32:39 +02:00 |
|
Enrico Turri
|
3dba0be81e
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-27 15:32:31 +02:00 |
|
Enrico Turri
|
cf6552484d
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-27 13:53:13 +02:00 |
|
Enrico Turri
|
48915a65fd
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-27 13:52:57 +02:00 |
|
Enrico Turri
|
06f44a9e4b
|
Code cleanup
|
2018-06-27 12:49:38 +02:00 |
|
Enrico Turri
|
8db4fdc24c
|
3rd attempt to fix opengl on ubuntu
|
2018-06-27 12:36:49 +02:00 |
|
Enrico Turri
|
23d10fdadc
|
2nd attempt to fix opengl on ubuntu
|
2018-06-27 12:05:23 +02:00 |
|
Enrico Turri
|
5c32347449
|
1st attempt to fix opengl on ubuntu
|
2018-06-27 11:31:11 +02:00 |
|
Enrico Turri
|
f7a0d817ae
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-27 08:26:45 +02:00 |
|
Enrico Turri
|
db95460154
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-27 08:26:33 +02:00 |
|
Enrico Turri
|
bd1d70d8d3
|
Fixed crash when slicing from Layers tab
|
2018-06-26 12:50:04 +02:00 |
|
Enrico Turri
|
3a7c9123fa
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-26 12:20:34 +02:00 |
|
Enrico Turri
|
9b2f760679
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-26 12:20:23 +02:00 |
|
Enrico Turri
|
87c1654e31
|
Fixed bed update when changing selected printer
|
2018-06-26 12:19:19 +02:00 |
|
Enrico Turri
|
a754de4c32
|
Fixed panning in Layers view
|
2018-06-26 11:17:30 +02:00 |
|
Enrico Turri
|
a9d3e21579
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-26 11:15:46 +02:00 |
|
Enrico Turri
|
69ff60b557
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-26 11:15:33 +02:00 |
|
Enrico Turri
|
ba0637461f
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-25 15:25:12 +02:00 |
|
Enrico Turri
|
7b0ba7a9d4
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-25 15:24:58 +02:00 |
|
Enrico Turri
|
40b327eb11
|
Fix of interaction between opengl contexts and main page notebook
|
2018-06-25 15:17:13 +02:00 |
|
Enrico Turri
|
3febf1dffb
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-25 13:22:02 +02:00 |
|
Enrico Turri
|
581ed7764c
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-25 13:21:52 +02:00 |
|
Enrico Turri
|
789a760fbd
|
Fixed conflict after merge with master
|
2018-06-25 10:49:30 +02:00 |
|
Enrico Turri
|
663bc20d1b
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-25 08:51:38 +02:00 |
|
Enrico Turri
|
7d15a15e14
|
Fix of #999
|
2018-06-25 08:48:36 +02:00 |
|
Enrico Turri
|
92ecda5abe
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-25 08:26:04 +02:00 |
|
Enrico Turri
|
ac0f3a6ef7
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-22 16:13:51 +02:00 |
|
Enrico Turri
|
c948ca647c
|
Code cleanup
|
2018-06-22 16:11:00 +02:00 |
|
Enrico Turri
|
2a03b90d2b
|
Forced render of 3D scene when changing tab in plater's notebook
|
2018-06-22 16:06:37 +02:00 |
|
Enrico Turri
|
de540de9aa
|
5th Attempt to fix texture rendering on OpenGL 1.1 cards
|
2018-06-22 15:11:04 +02:00 |
|
Enrico Turri
|
15c69a90ec
|
Changed use of GL_LIGHTING logic and code cleanup
|
2018-06-22 12:21:43 +02:00 |
|
Enrico Turri
|
ac7d21b50a
|
Geometry info updated while using gizmos
|
2018-06-22 11:19:38 +02:00 |
|
Enrico Turri
|
266a4413bd
|
4th Attempt to fix texture rendering on OpenGL 1.1 cards
|
2018-06-22 09:42:56 +02:00 |
|
Enrico Turri
|
be52647440
|
Smaller gizmos icons
|
2018-06-22 09:00:01 +02:00 |
|
Enrico Turri
|
4ba3cef496
|
3rd Attempt to fix texture rendering on OpenGL 1.1 cards
|
2018-06-22 08:38:13 +02:00 |
|
Enrico Turri
|
d2588d9da1
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-21 16:08:30 +02:00 |
|
Enrico Turri
|
e0db2a925d
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-21 16:08:20 +02:00 |
|
Enrico Turri
|
75cd436ae5
|
2nd Attempt to fix texture rendering on OpenGL 1.1 cards
|
2018-06-21 15:43:34 +02:00 |
|
Enrico Turri
|
b139f38784
|
Attempt to fix texture rendering on OpenGL 1.1 cards
|
2018-06-21 13:03:53 +02:00 |
|
Enrico Turri
|
4fcbb73141
|
Cleanup of perl code
|
2018-06-21 12:21:51 +02:00 |
|
Enrico Turri
|
0b935e999b
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-21 12:21:03 +02:00 |
|
Enrico Turri
|
21e7d379b1
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-21 12:20:52 +02:00 |
|
Enrico Turri
|
8c40a962fb
|
Shift key to move selected instances together
|
2018-06-21 11:14:17 +02:00 |
|
Enrico Turri
|
a7e9ec5757
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-21 11:05:07 +02:00 |
|
Enrico Turri
|
0e5bca7e80
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-21 11:03:12 +02:00 |
|
Enrico Turri
|
a3a8333d20
|
Force update when changing selected printer using the GUI
|
2018-06-21 10:43:01 +02:00 |
|
Enrico Turri
|
80e4155cbc
|
Bed textures selection using config inheritance
|
2018-06-21 10:24:57 +02:00 |
|
Enrico Turri
|
b386f52acc
|
Removed error dialog when texture file does not exist
|
2018-06-21 09:54:43 +02:00 |
|
Enrico Turri
|
f48ee20a23
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-21 08:39:41 +02:00 |
|
Enrico Turri
|
0c24a65039
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-21 08:39:26 +02:00 |
|
Enrico Turri
|
550f6e307f
|
Faster gizmos update
|
2018-06-21 08:37:04 +02:00 |
|
Enrico Turri
|
223db4b054
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-20 14:47:13 +02:00 |
|
Enrico Turri
|
cea5b97cad
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r
|
2018-06-20 14:34:46 +02:00 |
|
Enrico Turri
|
4803e7fc84
|
Fixed crash at startup on OpenGL 1.1 cards
|
2018-06-20 14:34:20 +02:00 |
|
Enrico Turri
|
58afe9502c
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-20 08:32:14 +02:00 |
|
Enrico Turri
|
b9ce19b07c
|
Object updated by rotate gizmo
|
2018-06-19 09:46:26 +02:00 |
|
Enrico Turri
|
a3949b9f01
|
Object updated by scale gizmo
|
2018-06-18 15:07:17 +02:00 |
|
Enrico Turri
|
e91073d818
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-18 15:06:15 +02:00 |
|
Enrico Turri
|
56ea84fef8
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-18 15:06:04 +02:00 |
|
Enrico Turri
|
53f8706805
|
Rotate gizmo interaction with mouse
|
2018-06-15 16:16:55 +02:00 |
|
Enrico Turri
|
6874949556
|
Scale gizmo interaction with mouse
|
2018-06-15 14:10:28 +02:00 |
|
Enrico Turri
|
52a7d7ed09
|
Partial perl code cleanup
|
2018-06-14 16:09:36 +02:00 |
|
Enrico Turri
|
c624d6bb0a
|
Hover on gizmo grabbers rendering
|
2018-06-14 15:32:26 +02:00 |
|
Enrico Turri
|
4d405977dd
|
Keep selection when panning/rotating 3D view
|
2018-06-14 12:34:19 +02:00 |
|
Enrico Turri
|
7fb6e2aa03
|
Use mipmaps for bed textures
|
2018-06-14 10:37:28 +02:00 |
|
Enrico Turri
|
bc5640eef4
|
Rotate gizmo rendering
|
2018-06-14 10:00:59 +02:00 |
|
Enrico Turri
|
3a19b81cef
|
Scale gizmo rendering
|
2018-06-13 15:44:04 +02:00 |
|
Enrico Turri
|
099d59ad27
|
Selection on gizmo overlay
|
2018-06-13 13:14:17 +02:00 |
|
Enrico Turri
|
c657654c02
|
Hovering on gizmo overlay
|
2018-06-13 10:49:59 +02:00 |
|
Enrico Turri
|
6079fed951
|
Fixed compile on Linux
|
2018-06-13 09:26:58 +02:00 |
|
Enrico Turri
|
b2cf576bf3
|
1st installment of gizmos
|
2018-06-13 09:12:16 +02:00 |
|
Enrico Turri
|
7aad729c0e
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-13 08:31:42 +02:00 |
|
Enrico Turri
|
2d97d8e7fe
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-13 08:31:30 +02:00 |
|
Enrico Turri
|
0faaef76e8
|
C++ code cleanup
|
2018-06-12 12:18:16 +02:00 |
|
Enrico Turri
|
85e7bdbddf
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-12 11:56:07 +02:00 |
|
Enrico Turri
|
f8664fce71
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-12 11:55:57 +02:00 |
|
Enrico Turri
|
c37db5ab7f
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-12 11:08:26 +02:00 |
|
Enrico Turri
|
756064810c
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-12 11:08:16 +02:00 |
|
Enrico Turri
|
af3d07bb05
|
Attempt to workaround bug in wxWidgets IsShownOnScreen() method
|
2018-06-12 09:18:25 +02:00 |
|
Enrico Turri
|
686d38643e
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
|
2018-06-12 08:32:45 +02:00 |
|
Enrico Turri
|
5f02669d2d
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
|
2018-06-12 08:32:34 +02:00 |
|
Enrico Turri
|
44220530cb
|
Use a single gl context created in c++
|
2018-06-11 15:49:04 +02:00 |
|
Enrico Turri
|
a02ea39525
|
GLCanvas3D volumes as a stack variable
|
2018-06-11 15:13:13 +02:00 |
|