Commit Graph

196 Commits

Author SHA1 Message Date
Enrico Turri
c9d23d0ac0 Font for warning texture set to bold 2018-07-31 15:32:16 +02:00
Enrico Turri
e7cc3c5f4a Code cleanup 2018-07-31 15:31:24 +02:00
Enrico Turri
a03d5178eb Legend texture use square power of two image 2018-07-31 14:32:59 +02:00
Enrico Turri
e234973ab4 Warning texture use square power of two image and bigger font size 2018-07-31 14:20:16 +02:00
Enrico Turri
1c0fa19824 3D scene toolbar uses a single texture 2018-07-31 12:25:00 +02:00
Enrico Turri
55e7a1af46 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-31 08:34:34 +02:00
Enrico Turri
2f7876b852 Fixed camera jump after object rotate 2018-07-30 13:57:05 +02:00
Enrico Turri
3f6d3b903d Fixed rotation of 3D view camera after change of bed data 2018-07-30 10:35:08 +02:00
Enrico Turri
1882cd41a4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-30 09:10:15 +02:00
Enrico Turri
bf4871d7f8 Improved remove hovering on objects when mouse leaves 3D scene 2018-07-30 09:09:14 +02:00
YuSanka
c2993de6e0 Scale and rotation from scene to value updates correctly 2018-07-29 21:42:57 +02:00
Enrico Turri
c64cba8ec2 A few fixes on 3D scene toolbar 2018-07-27 14:38:19 +02:00
Enrico Turri
590773d77b Fixed conflict after merge with master 2018-07-27 12:15:35 +02:00
Enrico Turri
ddda5062c2 3D scene toolbar actions 2018-07-27 12:08:33 +02:00
bubnikv
987fc4c6df Merge remote-tracking branch 'origin/backspace_to_delete_on_osx' 2018-07-27 09:55:13 +02:00
Enrico Turri
3a1ec8285e Reddish background when detected out of print volume toolpaths 2018-07-27 09:38:39 +02:00
Enrico Turri
c2ab8c2ae3 Out of print volume detection for extrusion toolpaths only 2018-07-27 08:49:58 +02:00
YuSanka
ca1a11742b After merging bug fixes 2018-07-26 15:47:18 +02:00
Enrico Turri
b5b7894a6f Fixed color of all toolpaths when detected as out of print bed volume 2018-07-26 13:12:09 +02:00
Enrico Turri
dd014136b0 Remove hovering on objects when mouse leaves 3D scene 2018-07-26 12:51:31 +02:00
Enrico Turri
efbc1cce25 Fixed rotate gizmo update with multimaterial objects 2018-07-25 11:49:38 +02:00
Enrico Turri
93a05c4946 Use wxWidgets tooltip for 3D scene toolbar 2018-07-25 10:01:17 +02:00
Enrico Turri
2107ea7702 Fixed selection of multimaterial objects 2018-07-25 08:40:34 +02:00
Enrico Turri
d8f5daf345 Fixed selection of object modified by gizmo 2018-07-24 15:32:44 +02:00
Enrico Turri
d4adcd4077 Out of print volume detection for toolpaths 2018-07-24 13:39:17 +02:00
Enrico Turri
8bf3e63f75 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-24 11:20:02 +02:00
Enrico Turri
c68bcb9e60 1st installment of 3D scene toolbar 2018-07-23 13:49:48 +02:00
Enrico Turri
df36de0d35 Fixed status of Slice now and Export G-Code buttons after object import 2018-07-23 10:16:56 +02:00
YuSanka
ee4f2cf549 Try to fix #977 2018-07-23 09:59:04 +02:00
Enrico Turri
aaa592bab9 Another fix in gizmos update 2018-07-19 16:06:46 +02:00
Enrico Turri
feb0f76279 Better fix for gizmo update when deleting objects 2018-07-19 13:43:33 +02:00
Enrico Turri
63fe2a9fb9 Warning and legend textures moved from _3DScene class to GLCanvas3D class 2018-07-19 13:18:19 +02:00
Enrico Turri
5ff26bce50 Fixed update of gizmo when deleting all objects 2018-07-19 11:39:51 +02:00
Enrico Turri
678be2b317 Fixed update of rotate gizmo when selecting objects 2018-07-19 11:24:04 +02:00
Enrico Turri
7f267987cb Code cleanup 2018-07-18 15:52:20 +02:00
Enrico Turri
13ced87089 Fixed depth test when rendering the picking texture 2018-07-18 15:09:26 +02:00
Enrico Turri
d805c8ac3b Disable slicing when one object crosses the print volume boundary 2018-07-18 14:26:42 +02:00
Enrico Turri
d672a69554 Slice only objects contained into the print volume 2018-07-18 09:37:25 +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
0e9ac1679f Keep fixed radius of rotate gizmo 2018-07-12 11:26: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
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
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
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
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
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
80e4155cbc Bed textures selection using config inheritance 2018-06-21 10:24:57 +02:00
Enrico Turri
550f6e307f Faster gizmos update 2018-06-21 08:37:04 +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
6874949556 Scale gizmo interaction with mouse 2018-06-15 14:10:28 +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
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
af3d07bb05 Attempt to workaround bug in wxWidgets IsShownOnScreen() method 2018-06-12 09:18:25 +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
Enrico Turri
085110c4d9 Removed 3DScene volumes from perl 2018-06-11 13:48:02 +02:00
Enrico Turri
7b4870d1cb Fixed selection and rendering in object settings dialog 2018-06-11 11:40:11 +02:00
Enrico Turri
7b1187992c Added bed texture for Prusa printers 2018-06-11 10:46:32 +02:00
Enrico Turri
96d9879d72 class 3D on_select callback moved to c++ 2018-06-08 11:37:07 +02:00
Enrico Turri
bf2fd54578 reload_scene method of 3D class moved to c++ 2018-06-08 09:40:00 +02:00
Enrico Turri
a8500d6bae class 3D callbacks moved to c++ 2018-06-07 11:18:28 +02:00
Enrico Turri
ff86407840 Key down and char event handlers of class 3D moved to c++ 2018-06-07 09:22:19 +02:00
Enrico Turri
66b4620d9b Fixed runtime error on Linux when removing canvases 2018-06-06 14:33:04 +02:00
Enrico Turri
8192580b5f Removed DestroyGL method from 3DScene 2018-06-06 14:19:28 +02:00
Enrico Turri
e79037c44d 3DScene member variables moved to c++ 2018-06-06 12:36:52 +02:00
Enrico Turri
c6e44509e0 3DScene load_object method moved to c++ 2018-06-06 10:16:58 +02:00
Enrico Turri
a8254e0053 Generation of preview paths moved to c++ 2018-06-05 14:09:36 +02:00
Enrico Turri
f262ec9094 Modified logic to finalize volumes geometry 2018-06-05 12:24:26 +02:00
Enrico Turri
5392008916 Generation of gcode paths moved to c++ 2018-06-05 10:56:55 +02:00
Enrico Turri
d74b85f3fe Another set of 3DScene methods moved to c++ 2018-06-04 15:42:34 +02:00
Enrico Turri
9729c71691 Fixed opengl initialization on linux 2018-06-04 14:38:41 +02:00
Enrico Turri
af8e869880 3rd attempt to fix opengl initialization on linux 2018-06-04 14:28:59 +02:00
Enrico Turri
fa60917580 Fixed Linux compile 2018-06-04 13:18:04 +02:00
Enrico Turri
ac47ba5864 1st attempt to fix opengl initialization on linux 2018-06-04 13:15:28 +02:00
Enrico Turri
adca3035f9 Fixed Linux compile 2018-06-04 12:32:23 +02:00
Enrico Turri
676210d6f4 Fixed typo 2018-06-04 12:30:40 +02:00
Enrico Turri
95e7d96f52 3DScene paint event handler moved to c++ 2018-06-04 12:26:39 +02:00