Commit graph

410 commits

Author SHA1 Message Date
Jeremy Bullock
05958a4a7b
OT changes as of 7-11 (#82)
* add multi arc mockup

* implement mutli arc

* add join and smooth option

* reset multiarc and arc when deactivated

* create self loop if the last point is the same as the first

* make join option in multiarc consistent with tape tool

* fix a bug where thickness don't affect mutliarc in vector level

* remove join option in geometric tool

* stop mutliarc after closing shape

* double click can also end multi arc

* fix a bug where multiArc will produce buggy stroke

* fix a bug where geometric tools is not deactivated

* add multiArc shortcut

* rewrite multiArc

* revert changes to tvectorimage

* add undo data for multiArc

* Paste as Copy Command for XSheet

* Remove unneeded code

* Bug fix

* prevent guide lines from jumping around in MultiArc

* make stroke color consistent in MultiArc

* remove color in MultiArc's undo data

* make color consistent in MultiArc with previous version

* Fix single image raster levels

* fix compilation error

* fix a bug where multiArc might generate bugged stroke

* Remove ICONV dep (#3304)

* fix crash on saving studio palette

* Move to Paste Special Menu

* Don't Set Fixed Width if Docking a Floating Panel

* Update how_to_build_win.md

New draft of pr for requested changes to windows build instructions.

* fix geometric tool multiarc smooth option

* fix level saving failure

* fix wrong warning after saving palette

* fix a bug where moving a control point while holding alt has unintended result

* fix travis-install (#3389)

* Fix assert debug crash in flipconsole.cpp

Fix crash when using the viewer controls in the console (debug)

* Redraw Audio Waveform

Fills the waveform rather than outlines it.

* fix undo data when drawing arc and mutliarc

* fix overwriting raster drawing palette (#3387)

Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
2020-07-11 21:03:15 -06:00
Jeremy Bullock
83c0cff6dc
Merge changes from OpenToonz as of 7-7 (#77)
* add multi arc mockup

* implement mutli arc

* add join and smooth option

* reset multiarc and arc when deactivated

* create self loop if the last point is the same as the first

* make join option in multiarc consistent with tape tool

* fix a bug where thickness don't affect mutliarc in vector level

* remove join option in geometric tool

* stop mutliarc after closing shape

* double click can also end multi arc

* fix a bug where multiArc will produce buggy stroke

* fix a bug where geometric tools is not deactivated

* add multiArc shortcut

* rewrite multiArc

* revert changes to tvectorimage

* add undo data for multiArc

* Paste as Copy Command for XSheet

* Remove unneeded code

* Bug fix

* prevent guide lines from jumping around in MultiArc

* make stroke color consistent in MultiArc

* remove color in MultiArc's undo data

* make color consistent in MultiArc with previous version

* Fix single image raster levels

* fix compilation error

* fix a bug where multiArc might generate bugged stroke

* Remove ICONV dep (#3304)

* fix crash on saving studio palette

* Move to Paste Special Menu

* Don't Set Fixed Width if Docking a Floating Panel

* Update how_to_build_win.md

New draft of pr for requested changes to windows build instructions.

* fix geometric tool multiarc smooth option

* fix level saving failure

* fix wrong warning after saving palette

* fix a bug where moving a control point while holding alt has unintended result

* fix overwriting raster drawing palette

* Hide color swatch on color 0

Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
2020-07-07 11:06:59 -06:00
Jeremy Bullock
0e717f4ad5
Fixes (#76)
* Fix function editor colors, ruler status bar. . .

* Fix stop motion bugs
2020-07-06 22:49:36 -06:00
Jeremy Bullock
d9a5c16baa
Merge shuns pr from 7-5-20 (#74)
* add multi arc mockup

* implement mutli arc

* add join and smooth option

* reset multiarc and arc when deactivated

* create self loop if the last point is the same as the first

* make join option in multiarc consistent with tape tool

* fix a bug where thickness don't affect mutliarc in vector level

* remove join option in geometric tool

* stop mutliarc after closing shape

* double click can also end multi arc

* fix a bug where multiArc will produce buggy stroke

* fix a bug where geometric tools is not deactivated

* add multiArc shortcut

* rewrite multiArc

* revert changes to tvectorimage

* add undo data for multiArc

* prevent guide lines from jumping around in MultiArc

* make stroke color consistent in MultiArc

* remove color in MultiArc's undo data

* make color consistent in MultiArc with previous version

* fix compilation error

* fix a bug where multiArc might generate bugged stroke

* Remove ICONV dep (#3304)

* fix crash on saving studio palette

* Don't Set Fixed Width if Docking a Floating Panel

* fix geometric tool multiarc smooth option

Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
2020-07-06 00:23:39 -06:00
Jeremy Bullock
133c867d93
Merge with core OpenToonz as of 7-5 (#73)
* add multi arc mockup

* implement mutli arc

* add join and smooth option

* reset multiarc and arc when deactivated

* create self loop if the last point is the same as the first

* make join option in multiarc consistent with tape tool

* fix a bug where thickness don't affect mutliarc in vector level

* remove join option in geometric tool

* stop mutliarc after closing shape

* double click can also end multi arc

* fix a bug where multiArc will produce buggy stroke

* fix a bug where geometric tools is not deactivated

* add multiArc shortcut

* rewrite multiArc

* revert changes to tvectorimage

* add undo data for multiArc

* Paste as Copy Command for XSheet

* Remove unneeded code

* Bug fix

* prevent guide lines from jumping around in MultiArc

* make stroke color consistent in MultiArc

* remove color in MultiArc's undo data

* make color consistent in MultiArc with previous version

* Fix single image raster levels

* fix compilation error

* fix a bug where multiArc might generate bugged stroke

* Remove ICONV dep (#3304)

* fix crash on saving studio palette

* Move to Paste Special Menu

* Don't Set Fixed Width if Docking a Floating Panel

Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
2020-07-05 23:32:52 -06:00
Jeremy Bullock
5850554b2d
More ui tweaks (#70) 2020-07-03 17:45:44 -06:00
Jeremy Bullock
3605260cbd
Ot master (#58)
* prevent unintentional frameworks use and fix typos

* Fix build with Clang 10

* System depend code deduplication

* Improve multi-layer style picker.

Allows clicking anywhere on a stroke in another layer to pick it -
not just the center.

Fixes #2843.

* Get actual pixel size instead of hard-coding to 1.0.

* Rehide features

* fix pegbar restoring

* fix crash on converting single image

* Fix wrong path to FXs

* fix expression reference in sub xsheet

* Fix build with GCC 10.

The default option was fixed in the latest Twain releases
but Opentoonz includes Twain 2.1.

* Fix build with Qt 5.15.

QPainterPath is no longer included indirectly.

* fix pegbar lost on exploding subxsheet

* fix fxs missing on explode

* Adobe Animate keyboard shortcuts but now with better shapes

* fix a bug where level in xsheet gets replaced when cancelling saving

* add include intersection option in selection tool

Co-authored-by: artisteacher <thingymadingy@yahoo.com>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: Rozhuk Ivan <rozhuk.im@gmail.com>
Co-authored-by: Martin van Zijl <martin.vanzijl@gmail.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Konstantin Dmitriev <ksee.zelgadis@gmail.com>
Co-authored-by: Christophe Giboudeaux <christophe@krop.fr>
Co-authored-by: MrBlockCat <37186692+MrBlockCat@users.noreply.github.com>
Co-authored-by: pojienie <pojienie@gmail.com>
2020-06-28 21:05:10 -06:00
Jeremy Bullock
8e0cc7af42
Fix line visibility on straight lines with MyPaint styles (#56)
* Fix assistant pressure

* Fix pressure on mypaint straight lines
2020-06-20 22:58:33 -06:00
Jeremy Bullock
a970d34579
Misc fixes (#52) 2020-06-17 21:05:36 -06:00
Jeremy Bullock
1d7b13f4d8
Perspective Assistant for Smart Raster and Raster levels (#51)
* It's working

* Raster brush too

* Added saving and toggling points
2020-06-16 23:06:09 -06:00
Jeremy Bullock
7faa31f359
misc fixes (#49) 2020-06-12 02:33:50 -06:00
Jeremy Bullock
bc9b68e15e
Straight line tool on raster brush tool (#44) 2020-06-04 20:50:21 -06:00
Jeremy Bullock
6247863442 Fix mac performance on straight lines 2020-06-04 12:15:46 -06:00
Jeremy Bullock
7a22a827d0
Allow Straight Lines on Shift plus more. . . (#39)
* Toonz Raster Straight Lines

* Lock to vertical diagonal or horizontal on ctrl
2020-06-03 23:09:51 -06:00
Jeremy Bullock
e239e2633c
Fix brush tool on rasters with different sizes (#38) 2020-06-03 12:19:53 -06:00
Jeremy Bullock
4b19ca95f2
Put back scan and cleanup (#13) 2020-05-27 00:38:36 -06:00
Jeremy Bullock
606afc272f
Function Editor Overhaul (#5) 2020-05-22 15:31:30 -06:00
Jeremy Bullock
50d82d74ab
Rip it out (#2)
* Part 1

* Part 1

* Part 2
2020-05-18 18:34:29 -06:00
Rodney
b57b764782
Merge pull request #3275 from turtletooth/ik
Remove Changing Pins on IK
2020-05-16 17:02:15 -05:00
Jeremy Bullock
ed38886df9 Fix Scrollable Plastic Options 2020-05-14 14:10:41 -06:00
Rodney
ef35521592
Merge pull request #3276 from turtletooth/brush_icon
Fix toonz raster brush and eraser cursor offset
2020-05-12 16:52:13 -05:00
Jeremy Bullock
195eae456d Fix widths 2020-05-12 00:54:11 -06:00
Jeremy Bullock
22d9f96232 Add scroll to tool options 2020-05-12 00:27:39 -06:00
Jeremy Bullock
6d77d97692 Fix toonz raster brush and eraser cursor offset 2020-05-11 23:16:59 -06:00
Jeremy Bullock
66c84468f3 Remove changing pins on IK 2020-05-11 02:30:29 -06:00
pojienie
74b1dd9b46 add locking stroke functionality in pump tool 2020-04-29 11:39:22 +00:00
pojienie
86e7f36817 add locking stroke functionality in cutter tool 2020-04-29 11:31:50 +00:00
Rodney
26b3167ad0
Merge pull request #3226 from rozhuk-im/master
Fix multiple warnings
2020-04-19 01:14:05 -05:00
Rozhuk Ivan
823a31f62c Fix multiple clang warnings 2020-04-13 22:21:56 +03:00
pojienie
ab83fce620 fix hook problem with brush tool 2020-04-13 08:40:19 +08:00
Rodney
05af46c4fd
Merge pull request #3219 from pojienie/add-freehand-mode-to-control-point-editor-tool
add freehand mode to control point editor tool
2020-04-10 17:22:18 -05:00
pojienie
286724e284 add freehand mode to control point editor tool 2020-04-08 12:10:51 +00:00
pojienie
4998cfd782 add interpolation in eraser tool 2020-04-07 11:25:45 +00:00
pojienie
7933abf6fd implement frame range for segment mode 2020-03-31 11:14:39 +00:00
pojienie
31955ed017 add segment mode in eraser tool 2020-03-30 11:35:56 +08:00
pojienie
b9b166433b fix tape tool not connecting not grouped strokes 2020-03-24 11:03:12 +00:00
Martin van Zijl
a10e2f0af9 Add option to disable use of ctrl+alt for changing brush size.
For #2864.
2020-03-23 07:11:38 +13:00
Martin van Zijl
dbf19d51c5 Fix vector brush drawing issue using alt key.
Fixes #2131.
2020-03-21 08:10:03 +13:00
Rodney
8e8bdecda7
Merge pull request #3138 from pojienie/add-snap-at-intersection-in-cutter-tool
Add snap at intersection in cutter tool
2020-03-06 20:25:18 -06:00
Rodney
1504675c25
Merge pull request #3129 from martinvanzijl/issue-2190-tape-tool-fix
Fix issue with tape tool not drawing after switching via shortcut
2020-03-06 09:10:21 -06:00
pojienie
75ef2ccf10 implement snap at intersection option in cutter tool 2020-03-05 22:49:12 +00:00
pojienie
0149f49ce8 add snap at intersection UI mock up in cutter tool 2020-03-05 21:35:26 +00:00
Martin van Zijl
f087241d3e Fix issue with tape tool not drawing after switching via shortcut.
Fixes #2190.
2020-03-04 06:20:01 +13:00
Martin van Zijl
18c2b4206a Fix crash with Eraser Tool in ranged mode in XSheet.
Fixes #2538.
2020-02-28 13:39:00 +13:00
Rodney
b5e86469bd
Merge pull request #3079 from pojienie/add-snap-option-to-control-point-editor-tool
Add snap option to control point editor tool
2020-02-17 18:09:45 -07:00
Tact Yoshida
47eaf794ad Use std::unordered_set 2020-02-04 05:13:21 +09:00
Tact Yoshida
1c2b20d028 Use std::unordered_map 2020-02-04 05:13:15 +09:00
Tact Yoshida
fd62558d54 Use std::copy_if 2020-02-04 05:12:52 +09:00
pojienie
3379cf3f47 disable snap option when no control point is last selected 2020-02-02 06:34:33 +00:00
pojienie
028bea049d fix style problem using clang-format 2020-01-31 13:57:23 +00:00
pojienie
59b772abea implement snap option for control point editor tool 2020-01-31 13:46:23 +00:00
pojienie
c6cb309936 set min distance for snap in control point editor tool 2020-01-31 12:15:04 +00:00
pojienie
2979a2e4d8 save snap options in control point editor tool 2020-01-31 12:13:19 +00:00
pojienie
c7106f8565 add snap sensitivity UI mock up 2020-01-31 12:12:01 +00:00
pojienie
64f16da722 add snap UI mock up 2020-01-31 12:10:24 +00:00
Rodney
a2795f2a3b
Merge pull request #3073 from manongjohn/fix_guided_drawing_issues
Fix guided drawing issues
2020-01-28 20:10:03 -07:00
manongjohn
4fae98b672 Fix guided undo removing frames 2020-01-28 19:22:35 -05:00
shun-iwasawa
085210630b fix toonz vector brush translation 2020-01-27 12:09:44 +09:00
manongjohn
bf1e217f1e Flag level changed on guide stroke direction change 2020-01-23 00:58:10 -05:00
manongjohn
233fcf81e3 Add Guided Drawing Controls Pane (#2992)
* guided drawings menu fix

* Add Guided Drawing Controls Pane

* Fix Guided Drawing Panel not opening

* Add Flip Guide Stroke Direction commands

* Restore Off to Guide Frame selection

Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
2020-01-14 17:01:17 +09:00
Martin van Zijl
bf25486844 Disable keyboard shortcuts while dragging vector line (#2914)
fix #2148
2020-01-08 11:32:25 +09:00
otakuto
91a93e2575 Remove tcg_function_types.h (#2772) 2020-01-08 10:49:48 +09:00
shun-iwasawa
5360253c32
Modify Autocreation Feature (#2943)
* modify autocreation mode
2019-12-26 12:14:50 +09:00
manongjohn
40a40ea47c Add Vector Guided Drawing Auto-Inbetween option (#2931)
* Add Vector Guided Drawing Auto-Inbetween option

* Enable Guided Drawing for Front Onion Skins

* Allow forward Guided Inbetweening

* Add Select Guide Stroke commands

* Add Tween Guide Strokes commands

* Add additional guide stroke selection optins

* Fix break setting issues with guided tweening

* Enable Guided Tweening for Geometric Tool

* Remove unnecessary tool switching for tweening

* Fix closest tweening using wrong strokes

* Disable Guided Tweening when onionskin is disabled
2019-12-25 13:04:57 +09:00
caryoscelus
fb92fd2ade SelectTool minor code improvements (#2932)
* SelectionTool: code improvement: use strongly-typed enum

* SelectionTool minor code improvement: use unique_ptr

* SelectionTool minor code improvement: formating / warnings

* SelectionTool: generalize code
2019-12-23 20:03:57 +09:00
manongjohn
f7197ed042 Swtich Auto-Inbetween Easing logic (#2930) 2019-12-10 09:11:09 -07:00
manongjohn
28129111a1 Fix tool crashes on Palette and Zerary column 2019-12-02 18:49:46 -05:00
Rodney
6b47a7627a
Merge pull request #2903 from manongjohn/allow_selection_tool_when_not_editable
Allow Selection Tool copy when level is not editable
2019-11-27 10:22:24 -06:00
manongjohn
b96cef30fa Ignore OT's paste shortcut in TypeTool box 2019-11-26 15:01:55 -05:00
manongjohn
6939a3e658 Allow Selection Tool copy when level is not editable 2019-11-24 19:22:20 -05:00
shun-iwasawa
ca556f8550 fix lineargradientfx handles (#2891) 2019-11-21 08:15:47 -07:00
Rodney
98a68d5c9b
Merge pull request #2878 from shun-iwasawa/g/linear_gradient_fx_revised
Linear Gradient Fx Revised
2019-11-15 18:18:25 -07:00
manongjohn
525c4b1d84 Fix tool option on Command bar crash 2019-11-15 10:49:00 -05:00
shun-iwasawa
b224639e1c fix type tool cursor jumping (#2874) 2019-11-14 00:04:30 -07:00
manongjohn
f2da01b0ab Fix ffmpeg loaded levels (#2876)
* Fix reading ffmpeg frame count and rate

* Make ffmpeg loaded levels uneditable

* Ffmpeg extract frames only when loading

* Fix ffmpeg gif input frame rate
2019-11-13 22:07:58 -07:00
shun-iwasawa
5903e5e9fd linear gradient fx revised 2019-11-14 11:42:05 +09:00
shun-iwasawa
00ed45cbe1 spin gradient iwa 2019-11-11 19:55:57 +09:00
Rodney
38f43a17b7
Merge pull request #2087 from manongjohn/hide_tools
Disable or Hide unusable tools
2019-11-07 07:12:43 -07:00
Rodney
508faa83aa
Merge pull request #2867 from manongjohn/fix_vector_selection_pivot
Revised vector selection pivot re-centering logic
2019-10-31 18:41:52 -07:00
manongjohn
7c36741cc5 Revised vector selection pivot logic 2019-10-31 14:29:23 -04:00
Rodney
be0c0511f7
Merge pull request #2858 from shun-iwasawa/g/precise_control_with_alt_key
Enable Animate tool to control precisely by pressing the Alt key
2019-10-30 17:45:19 -07:00
Rodney
8b393cd03c
Merge pull request #2848 from shun-iwasawa/g/maximum_values_for_pinch_and_magnet_tools_size
Modify Maximum Values for Pinch and Magnet Tools Size
2019-10-26 10:52:27 -05:00
shun-iwasawa
bce58dc69f animate tool : precise control with pressing Alt 2019-10-25 11:28:37 +09:00
manongjohn
79fa3692a3
Merge pull request #2842 from manongjohn/fix_intial_pivot_location
Fix pivot location on new/modified vector selections
2019-10-22 18:49:38 -04:00
shun-iwasawa
1c6241faa7 modify max values for pinch and magnet tools size 2019-10-21 15:27:44 +09:00
Rodney
eb04b70f37
Merge pull request #2810 from shun-iwasawa/g/fix_camera_column_handling
Fix Assertion Failure on Selecting Camera Column
2019-10-19 11:24:05 -05:00
manongjohn
3eb10e481d Fix pivot location on new/modified selections 2019-10-18 23:25:38 -04:00
Rodney
9dc6b12285
Merge pull request #2805 from martinvanzijl/issue-2180-pump-tool-tablet-issue
Fix for pump tool using Wacom tablet (#2180)
2019-10-17 23:13:47 -05:00
Rodney
db6b5f45a9
Merge pull request #2809 from manongjohn/improve_vector_stroke_selection
Improve vector stroke selection
2019-10-17 19:34:53 -05:00
Rodney
60fff429f0
Merge pull request #2830 from shun-iwasawa/g/geometric_tool_for_spline
Enable Geometric Tool for Motion Path
2019-10-16 21:45:39 -05:00
Rodney
1abc792d4e
Merge pull request #2838 from shun-iwasawa/g/pencil_for_toonzraster_eraser_freehand_and_polyline
Enable Pencil Mode for Toonz Raster Eraser in Freehand and Polyline types
2019-10-16 21:43:17 -05:00
shun-iwasawa
d02ca13b93 pencilmode for t.raster eraser freehand polyline 2019-10-15 15:46:57 +09:00
manongjohn
075c512aaf Stop resetting vector pivot location 2019-10-15 01:51:29 -04:00
manongjohn
d7c83c8b39 Prioritize selecting pivot over bounding box 2019-10-15 01:50:42 -04:00
Rodney
cb01bbe023
Merge pull request #2804 from manongjohn/fix_selection_box_visibility
Improve selection box visibility
2019-10-14 04:05:48 -05:00
shun-iwasawa
76d093f2f4
Nonlinear Slider for the Brush Size Options (#2824)
* nonlinear slider for tool size

* nonlinear slider for finger magnet and pinch tools
2019-10-11 12:13:41 +09:00
shun-iwasawa
6817df33ac
New Fx: Corridor Gradient Fx Iwa (#2816)
* corridor gradient fx iwa
2019-10-11 12:10:00 +09:00
shun-iwasawa
0368536bf3 geometric tool for spline 2019-10-11 11:57:49 +09:00
Rodney
881602af30
Merge pull request #2739 from martinvanzijl/issue-1807-fix-undo-redo-when-pasting-to-new-frame
Fix undo/redo issue when pasting to new frame (#1807)
2019-10-10 15:15:17 -05:00
manongjohn
c40ac590f5
Merge pull request #2175 from manongjohn/schematic_gesture_control
Schematic navigation enhancement
2019-10-01 16:07:23 -04:00