Commit graph

159 commits

Author SHA1 Message Date
YuSanka
7bb0b7eefc Cut bug fixing: Fixed a place of connectors after several cutting
+ Added info about camera direction to a DEBUG window
+ Code factoring (deleted unused code)
+ Fixed build warnings
2022-10-20 16:34:21 +02:00
YuSanka
2880704de9 Cut improvements/ bug fixing:
* Wrong position of grabber is fixed
* OSX specific: ObjectList: Fixed update of the info items after cut
* Show info line, when Cut plane is invisible

+ Fixed non-Win build: added missed include
2022-10-19 17:38:04 +02:00
YuSanka
3a21f156c0 Cut Improvements/Bug Fixing
* Context menu: Suppress "Simplify model" for cut object
* CutGizmo:
  * Disable gizmo for dowel object
  * Invalidate cut plane position after update of Bounding box
  * Suppress Frustum style for connectors with Dowel type
  * Rectangle selection: Fixed processing on LeftUp
* Selection on Canvas: Suppress to move NEGATIVE_VOLUME if it's a connector
* Model:cut: Fixed a bug in add_cut_volume(). Cut info wasn't copied to the new volume
2022-10-18 14:13:50 +02:00
YuSanka
5922bf2910 Cut small improvements:
* Disable revert icon if cut_plane position wasn't changed
* Hide CutGizmo for Simple mode.
* Fixed update of bounding box after changing scale during Z axis
2022-10-17 16:59:40 +02:00
YuSanka
64c57faf8f Cut Improvements: Fixed Undo/Redo for cut performance
+ ObjectList: Fixed items update after Invalidate cut information
+ CutGizmo: Fixed wrong mode selection after delete object and that add new
2022-10-17 12:15:10 +02:00
YuSanka
85af9b93f1 Cut: Fixes and improvements for object's context menu
* Disable or delete some menu items, which are inappropriate for cut objects
* For cut objects added menu item "Invalidate cut info" to disconnect related cut parts of initial object
* If just one part is kept after cut performance, than don't apply a cut info for this object.

+ CutGizmo: Fixed selection of the mode
   An object has connectors         -> Connectors mode
   An object doesn't has connectors -> CutPlane mode
2022-10-07 16:26:19 +02:00
YuSanka
74a32e3261 Cut: Bug fixing and Improvements
* CutGizmo: Fixed a label scale
* Fixed deselection of selected connectors, when moving the camera
* Implemented update of the settings for selected connectors
* Connector selection: Ctrl shortcut is changed to Shift to compatibility of the selection/deselection with rectangle selection
2022-10-07 11:14:13 +02:00
YuSanka
58c7d8b188 CutGizmo: Connectors mode: Implemented Rectangular selection of connectors
+ some code refactoring
2022-10-03 17:24:50 +02:00
YuSanka
a8440db5ec Cut WIP:
* ObjectList & Selection: Show Connectors in the Scene, when CutConnectors Item is selected
* ObjectList: refactoring: extract the adding of volumes to the add_volumes_to_object_in_list()
* If some connector is selected on 3dScene -> select all connectors of this object
* GLGizmoScale3D : check if grabber is enabled, when do rendering
+ GLGizmoCut: refactoring : split render_cut_plane_grabbers to several functions
2022-09-30 14:07:17 +02:00
YuSanka
0201a5055a Cut WIP:
* Suppress to split cut objects
* ObjectList:
  * Use another icons to mark the cut objects and connectors 
  * For the cut object show parts, which are not connectors
* Set different colors for the Plugs and Dowels
* CutGizmo:
  * Invalidate CutGizmo after changes in ObjectList or perform a cut
  * CupPlane in Connectors mode: Unselect selection, when click on empty space
  * Connectors mode: Fixed performance issue
2022-09-27 16:17:09 +02:00
YuSanka
66e2c3b30a Cut WIP: Send to the cut() whole cut_matrix instead of cut_plane_pos and rotation angles
+ Fixed units inside input window
+ NotificationManager: Added info line for loaded object with cut parts
+ Next Code refactoring
2022-09-27 08:22:20 +02:00
YuSanka
0fcb7243b7 Cut WIP: Upgrade for reset_buttons in inpot_window 2022-09-21 16:29:06 +02:00
YuSanka
e676d40df5 Cut WIP: Beatifications for input window dialog
+ Fixed rendering of the connectors, when cut plane is rotated for 270 deg by Y axis
2022-09-21 13:40:24 +02:00
YuSanka
94685b5ad8 WIP Cut: Fixed an adding/deleting of the connectors to the selection_info
+ more code refactoring
2022-09-20 20:29:00 +02:00
YuSanka
e93ff4d087 WIP Cut: Fixed transformation of a cut plane and a clipper.
+ Fixed a picking of the scaled grabbers
+ Code refactoring
2022-09-19 17:53:01 +02:00
Lukas Matena
582eccd51b Cut: turn off contour disabling for now 2022-09-19 11:19:18 +02:00
Lukas Matena
d7f55253cd Cut: allow enabling/disabling an island 2022-09-19 11:19:18 +02:00
YuSanka
cf144da4fe Cut WIP: Import/Export cut information to/from .3mf file
+ Fixed a crash during change object selection, when CutGizmo is On
+ Fixed Undo/Redo (was accidentally broken with 7912613dc8)
2022-08-22 10:09:32 +02:00
YuSanka
70a575198b Cut WIP: Fix for drawing of the cut line 2022-08-17 15:50:49 +02:00
YuSanka
79e9df4b64 Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-08-17 10:05:44 +02:00
Lukas Matena
deac513faa Fixed conflicts after merge 2022-08-15 15:23:59 +02:00
YuSanka
edebda511c Cut WIP: Set Circle connector shape as a default.
Allow set connectors to any place of the cut plane.
2022-08-15 14:16:05 +02:00
Lukas Matena
bce2b148f4 Merged 2.5.0-beta1 into master (NO CONFLICTS FIXED) 2022-08-15 13:41:40 +02:00
YuSanka
7912613dc8 Cut WIP: Fixed crash on second "Perform cut"
+ some code cleaning
2022-08-12 17:59:36 +02:00
YuSanka
df8f7e1069 Cut WIP: Raycasters for picking are applied
+ Added snapping for rotation of the cut plane
2022-08-10 13:42:36 +02:00
YuSanka
dda346b70a After merge fixes 2022-08-08 14:58:13 +02:00
YuSanka
2ac3861b2a Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-08-08 10:57:38 +02:00
YuSanka
a7930cdedd Cut WIP: Cut by line: Some rework for its behavior.
Line can be drawn by :
Shift +
1. LeftDown, Dragging, LeftUp
2. LeftDown, LeftUp, Move, LeftDown
2022-07-28 17:01:05 +02:00
YuSanka
05c22604fb Cut WIP: Suppress use connectors for SLA mode 2022-07-27 15:21:37 +02:00
YuSanka
27f7a8da0f Cut WIP: Added shortcuts for "Edit connectors" ImGuiDialog
+ Added processing for the Ctrl+A ("Select All connectors")
2022-07-27 13:53:54 +02:00
YuSanka
e990254d52 Cut WIP: set attributes for each connector separately.
+ Allow select/deselect several connectors and apply size/depth for selected group of connectors
2022-07-27 11:32:38 +02:00
YuSanka
0fd29dfec7 Cut WIP: Suppress un-universal scaling for cut objects
Added editing of the tolerance
2022-07-22 16:38:28 +02:00
YuSanka
003acee218 Cut WIP: Added snapping for the rotation of cut plane
+ Some code refactoring
2022-07-21 10:20:19 +02:00
enricoturri1966
ca34518bcc Fixed conflicts after merge with master 2022-07-21 08:55:52 +02:00
enricoturri1966
520261925f Fixed conflicts after merge with master 2022-07-21 08:14:44 +02:00
YuSanka
cd8e0d002b Cut WIP: Added "Place o cut" 2022-07-19 16:58:27 +02:00
YuSanka
15418bfb76 Cut WIP: Extensions for grabbers
+ Some code refactoring (RotationGizmo isn't used anymore)
+ A reversion from 63890b5f8d is putted back
2022-07-19 10:54:41 +02:00
enricoturri1966
76562d1e75 SPE-1252 - Fixed update of contours in Cut Gizmo when modifying the orientation or the scale of a part of a multipart object 2022-07-18 15:38:56 +02:00
enricoturri1966
6b0ea79d34 SPE-1252 - Fixed update of contours in Cut Gizmo when modifying the orientation or the scale of a part of a multipart object 2022-07-15 14:55:13 +02:00
YuSanka
07d455a125 Cut WIP: some UI improvements
+ partially reverted 63890b5f8d
2022-07-11 10:42:57 +02:00
YuSanka
4b214598a2 After merge fixes 2022-06-29 13:42:10 +02:00
YuSanka
89a7f6bdb1 Merge remote-tracking branch 'origin/ys_wx317_master' into ys_cut 2022-06-29 11:44:11 +02:00
enricoturri1966
0a7dae6df6 Tech ENABLE_RAYCAST_PICKING - Raytraced picking of Cut Gizmo 2022-06-13 14:54:52 +02:00
enricoturri1966
df47ba7122 Tech ENABLE_RAYCAST_PICKING - Raytraced picking of gizmos - Move Gizmo 2022-06-13 13:09:24 +02:00
enricoturri1966
cd6155293b Fixed conflicts after merge with master 2022-06-07 11:10:19 +02:00
enricoturri1966
0e3490620e Added method const GLVolume* Selection::get_first_volume() const to simplify client code
Fixed conflicts during rebase with master
2022-06-06 08:44:11 +02:00
enricoturri1966
8d0780aabe Tech ENABLE_GL_CORE_PROFILE - Added command line option '--opengl-core=M.m' which allows the user to select a specific OpenGL version supporting core profile 2022-05-30 16:15:25 +02:00
enricoturri1966
1a1cf108fc Tech ENABLE_GL_SHADERS_ATTRIBUTES merged into ENABLE_LEGACY_OPENGL_REMOVAL
Fixed conflicts during rebase with master
2022-05-26 10:50:32 +02:00
enricoturri1966
914a66e2c3 Tech ENABLE_GL_CORE_PROFILE - Thick lines shader enhanced to render dashed lines
Fixed conflicts while rebase with master
2022-05-26 08:11:04 +02:00
enricoturri1966
017784c38e Tech ENABLE_GL_CORE_PROFILE - Use thick_lines shader where needed
Fixed conflicts during rebase with master
2022-05-25 15:55:39 +02:00