Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri 5c745485e1 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-29 13:56:41 +02:00
Enrico Turri 363a964ebb 3DScene render method partially moved to c++ 2018-05-29 13:54:34 +02:00
Enrico Turri db260a669c 3DScene mouse wheel event moved to c++ 2018-05-28 15:23:01 +02:00
Enrico Turri aacdcd4add 3DScene layers editing mouse containment methods moved to c++ 2018-05-28 14:39:59 +02:00
Enrico Turri 994222c317 3DScene _first_selected_object_id_for_variable_layer_height_editing method moved to c++ 2018-05-28 14:10:02 +02:00
Enrico Turri 951e8528b4 3DScene layers editing parameters moved to c++ 2018-05-28 13:43:29 +02:00
Enrico Turri a8311bd1bd 3DScene layer_editing_allowed method moved to c++ 2018-05-25 16:28:24 +02:00
Enrico Turri c51ce63b9b 3DScene layer editing overlay completely moved to c++ 2018-05-25 15:56:14 +02:00
Enrico Turri 455076231b Layers editing shader moved to c++ 2018-05-25 14:05:08 +02:00
Enrico Turri bdbc86167c 3DScene volume selection methods moved to c++ 2018-05-25 09:03:55 +02:00
Enrico Turri f121817501 Removed from Perl all 3DScene methods already moved to c++ 2018-05-24 16:11:34 +02:00
Enrico Turri c2e38fc6fe Fixed compile on Linux 2018-05-24 15:22:53 +02:00
Enrico Turri 70664122af 3DScene layer height profile rendering moved to c++ 2018-05-24 15:17:01 +02:00
Enrico Turri f31c55ceed 3DScene layer editing overlay textures rendering moved to c++ 2018-05-24 13:46:17 +02:00
Enrico Turri 751b41b94b 3DScene picking pass moved to c++ 2018-05-23 15:35:11 +02:00
Enrico Turri 486180c422 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-23 15:33:25 +02:00
Enrico Turri 90c50b281a 3DScene mouse variables moved to c++ 2018-05-23 13:56:54 +02:00
Enrico Turri b36243ba10 Objects rendering moved to c++ 2018-05-23 11:14:49 +02:00
Enrico Turri b4beb7aae9 3DScene plain shader moved to c++ 2018-05-23 09:57:44 +02:00
Enrico Turri 37ab7594fc Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-23 08:38:29 +02:00
Enrico Turri 85b6784dcb Merge with master 2018-05-22 15:03:40 +02:00
Enrico Turri ae394ca97d Fixed remember output directory default value set to true 2018-05-22 13:57:28 +02:00
Enrico Turri 4e29147756 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-22 11:48:45 +02:00
Enrico Turri 451c58d58f 3DScene's enable_picking variable moved to c++ 2018-05-22 09:02:42 +02:00
Enrico Turri 59af3fb866 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-22 08:33:23 +02:00
Enrico Turri ae53c7cb2e Volumes rendering moved to c++ 2018-05-21 15:57:03 +02:00
Enrico Turri 0f035d0bae Background rendering moved to c++ 2018-05-21 15:24:52 +02:00
Enrico Turri bf7b9eb3e7 Legend texture moved to c++ 2018-05-21 14:57:43 +02:00
Enrico Turri 3fdc5e20a7 Warning texture moved to c++ 2018-05-21 14:40:09 +02:00
Enrico Turri 7cff6ef6db Shaders loaded from files 2018-05-21 13:08:02 +02:00
Enrico Turri 3fb96ff636 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-21 13:06:16 +02:00
Enrico Turri 308a0b5709 Remember output directory default value set to true 2018-05-21 11:50:48 +02:00
Enrico Turri 3291cbfdad Fix of #889 2018-05-21 11:19:03 +02:00
Enrico Turri 67f7ec2d20 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-21 11:17:55 +02:00
Enrico Turri ad5eab8fd7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-21 11:17:45 +02:00
Enrico Turri 53ddf724e1 Fixed object setting dialog on NVIDIA cards 2018-05-21 10:51:47 +02:00
Enrico Turri 01b6bc1dc8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-21 08:38:05 +02:00
Enrico Turri 05dcda8ef7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-21 08:37:53 +02:00
Enrico Turri a7fd1b6741 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-18 14:13:06 +02:00
Enrico Turri effaef024d Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-18 14:12:44 +02:00
Enrico Turri a7fc57a176 3DScene reset_object method moved to c++ 2018-05-18 14:08:59 +02:00
Enrico Turri 5fc8fdee11 3DScene axes moved to c++ 2018-05-18 13:02:47 +02:00
Enrico Turri 1e0a8de5b1 3DScene cutting plane moved to c++ 2018-05-18 11:05:48 +02:00
Enrico Turri 0584990b65 Fixed z layers indices under 3D preview sliders 2018-05-18 10:14:47 +02:00
Enrico Turri 5224acad59 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-18 09:55:30 +02:00
Enrico Turri 6c6b8ccc42 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-18 09:55:21 +02:00
Enrico Turri f34250ea6a Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-18 09:29:14 +02:00
Enrico Turri 255bec7432 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-18 09:29:05 +02:00
Enrico Turri d56b543ff8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-18 08:32:19 +02:00
Enrico Turri d85fd5501c Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-18 08:32:09 +02:00
Enrico Turri de0b8226e1 Tweaks to logic for sliders update in 3D Preview 2018-05-17 16:02:31 +02:00
Enrico Turri f7702c05f2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 15:22:55 +02:00
Enrico Turri c9dc54bed7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 15:20:25 +02:00
Enrico Turri 9b4afb77d1 Hide legend texture when invalidating gcode by editing config data 2018-05-17 15:18:52 +02:00
Enrico Turri 7ca9f46b9c Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 14:43:27 +02:00
Enrico Turri f26bce2538 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 14:43:18 +02:00
Enrico Turri 2cb108fbf8 Fix in File menu 2018-05-17 12:56:14 +02:00
Enrico Turri 15f35a9e9e Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 12:12:27 +02:00
Enrico Turri 74b0ed4b23 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 12:12:18 +02:00
Enrico Turri 24b5d61eb3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 09:53:46 +02:00
Enrico Turri 4a4f4db6a5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 09:53:36 +02:00
Enrico Turri e13564cb19 Fixed shell visualization in g-code preview 2018-05-17 09:50:40 +02:00
Enrico Turri ee4f95bce5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 09:31:06 +02:00
Enrico Turri 36ce8e395e Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 09:30:55 +02:00
Enrico Turri b6b7945830 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-05-17 09:27:16 +02:00
Enrico Turri 77578f4a3e Reset tooltips for manifold objects into object info panel 2018-05-17 09:26:50 +02:00
Enrico Turri 7a6d83e7eb Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 08:33:32 +02:00
Enrico Turri 853ebf6ad2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 08:33:16 +02:00
Enrico Turri 41c51d7614 3DScene's char event handler moved to c++ 2018-05-15 16:09:04 +02:00
Enrico Turri 2b4829a4b9 3DScene bed variables moved to c++ 2018-05-15 15:38:25 +02:00
Enrico Turri c60bf694ef Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-15 12:22:44 +02:00
Enrico Turri 43784f3409 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-15 12:22:35 +02:00
Enrico Turri a612b5b648 Replacement of xml escape characters when exporting to amf 2018-05-15 12:19:43 +02:00
Enrico Turri f0d1888ca9 3DScene select_view() function moved to c++ 2018-05-15 11:30:11 +02:00
Enrico Turri 75f1f832aa 3DScene bed origin moved to c++ 2018-05-15 11:07:32 +02:00
Enrico Turri 7519e34507 3DScene zoom functions moved to c++ 2018-05-15 10:32:38 +02:00
Enrico Turri f4303ebdb8 1st attempt of perl callback from c++ for 3DScene 2018-05-15 09:50:01 +02:00
Enrico Turri e31244e8a5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-15 09:46:57 +02:00
Enrico Turri 328eba5610 Removed auto zoom to volumes when changing view 2018-05-15 09:41:58 +02:00
Enrico Turri 0155f4a7f7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-15 08:41:59 +02:00
Enrico Turri 986630c2dc 3DScene's idle even handler moved to c++ 2018-05-14 14:47:13 +02:00
Enrico Turri a12e3c1cc9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-14 14:15:31 +02:00
Enrico Turri 0c1655b884 3DScene::Resize() method moved to c++ 2018-05-14 14:14:19 +02:00
Enrico Turri a73cb45792 Camera angle clamping moved to c++ 2018-05-14 12:08:23 +02:00
Enrico Turri 1fd59144c7 Camera data moved to c++ - WIP 2018-05-14 11:31:58 +02:00
Enrico Turri 32063cbe23 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-14 10:02:28 +02:00
Enrico Turri 1edd2d01f0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-14 10:01:27 +02:00
Enrico Turri 5fb81bacd5 Added layer index under sliders in 3D view 2018-05-14 09:54:38 +02:00
Enrico Turri e90bc3fcab Fix in _3DScene::_load_gcode_extrusion_paths::Helper::path_color() 2018-05-14 09:00:19 +02:00
Enrico Turri 5024fc4be7 OpenGL to c++ 1st installment - WIP 2018-05-09 10:47:04 +02:00
Enrico Turri 86155ae4c0 Fixed conflict in previous merge 2018-05-09 10:28:26 +02:00
Enrico Turri bd4061c3b0 Merge with master branch 2018-05-09 10:16:28 +02:00
Enrico Turri 8eb9ddc2eb Max count of auto assigned extruders when splitting object set as dependent of current printer 2018-05-07 16:13:58 +02:00
Enrico Turri c579ec7f5f Fixed wrong extrusion paths detection with multimaterial objects 2018-05-07 14:23:07 +02:00
Enrico Turri ec8b8a6a98 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-04 12:01:14 +02:00
Enrico Turri c488550636 Fixed update of 3D view when selecting objects on Linux 2018-05-04 11:57:37 +02:00
Enrico Turri 678cbd9d47 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-04 08:56:16 +02:00
Enrico Turri 471f90659f Fixed typo preventing to build on Win 2018-05-03 16:28:41 +02:00
Enrico Turri 6d88d0d39b Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-03 16:13:22 +02:00
Enrico Turri dd4669d1a0 Fixed crash when reducing objects from 2D/preview/layers tabs 2018-05-03 16:08:41 +02:00