Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri dc223066d3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 08:26:55 +02:00
Enrico Turri bd1d70d8d3 Fixed crash when slicing from Layers tab 2018-06-26 12:50:04 +02:00
Enrico Turri ab587babb9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 12:20:41 +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 90b0cd5cae Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 11:16:00 +02:00
Enrico Turri ecda2a6140 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 16:09:27 +02:00
Enrico Turri 714204b227 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 15:27:06 +02:00
Enrico Turri b6b14ef819 Fixed conflicts after merge with master branch 2018-06-25 15:26:37 +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 8a4a5e487e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:51:47 +02:00
Enrico Turri 7d15a15e14 Fix of #999 2018-06-25 08:48:36 +02:00
Enrico Turri 3da21a4ce8 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:27:09 +02:00
Enrico Turri f9e6bcf872 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:26:14 +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 f420ced581 Time estimators use initial data from config 2018-06-22 14:01:27 +02:00
Enrico Turri 00ef0610a5 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-22 12:57:16 +02:00
Enrico Turri f8982c0ca1 Merge branch 'machine-limits-config' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-22 12:30:15 +02:00
Enrico Turri e89083090f Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 16:08:40 +02:00
Enrico Turri 8194d7713b Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 12:21:11 +02:00
Enrico Turri 4ee365194a Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 11:03:38 +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 a3d21b6b0e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 08:39:51 +02:00
Enrico Turri 59b6de3d01 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-20 14:47:23 +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 fa9014fc8e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-20 08:32:27 +02:00
Enrico Turri a3949b9f01 Object updated by scale gizmo 2018-06-18 15:07:17 +02:00
Enrico Turri e92e51effb Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-18 15:06:26 +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 077aaca2e0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-13 08:31:53 +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 7a08e665bc Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-12 11:56:16 +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 64104c8f1f Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-12 11:08:36 +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 ac8004f28e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-12 08:32:55 +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
Enrico Turri 085110c4d9 Removed 3DScene volumes from perl 2018-06-11 13:48:02 +02:00
Enrico Turri 9a4e250c33 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-11 13:46:55 +02:00
Enrico Turri efe6a29032 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-11 13:46:35 +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 8867e8ca60 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-08 08:31:21 +02:00
Enrico Turri f4a687703c Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-08 08:30:55 +02:00
Enrico Turri 766d1d52a9 Fixed import of model rotated clockwise from 3mf 2018-06-07 16:13:32 +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 f6ef28becc Removed method update_bed_size from 3D perl class 2018-06-06 15:17:10 +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 71d750c1b8 Remaining time gcode line exported only for Marlin firmware 2018-06-06 12:21:24 +02:00
Enrico Turri 2d34843943 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-06 12:19:12 +02:00
Enrico Turri 2dee4d1a83 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-06 12:18:52 +02:00
Enrico Turri b2b95d590f Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-06-06 12:17:16 +02:00
Enrico Turri 4009fdcc18 Finalized format for gcode line containing remaining printing time 2018-06-06 11:00:36 +02:00
Enrico Turri c6e44509e0 3DScene load_object method moved to c++ 2018-06-06 10:16:58 +02:00
Enrico Turri 40bb0b6f55 Fixed overflow in Polygon::area() 2018-06-05 16:07:09 +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 e8b32fa1df Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-05 10:54:35 +02:00
Enrico Turri fe3f5471e7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-05 10:54:25 +02:00
Enrico Turri 1f79713c15 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-05 10:54:15 +02:00
Enrico Turri 489bce5a18 Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-06-05 10:53:20 +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 548f773074 2nd attempt to fix opengl initialization on linux 2018-06-04 13:52:57 +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
Enrico Turri 4672a18b49 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-04 12:25:25 +02:00
Enrico Turri 34a944bd1c Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-04 12:25:14 +02:00
Enrico Turri 109dde00b2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-04 12:25:04 +02:00
Enrico Turri 78c32bdf9a Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-06-04 12:24:14 +02:00
Enrico Turri 8911cf6051 OpenGL info moved to c++ 2018-06-04 10:14:09 +02:00