oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,650 Commits 1 Branch 0 Tags
afaf6bcf92e814059b0bf433b9de57672ca4b73d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
itsmattkc afaf6bcf92 groups: started revision 
- Removed UUIDs since we already have ptrs
- Changed input passthroughs from map to list so they'll always be added in the same order
- Fixed group copy on duplication
- Fixed group copy on clip split
 2022-04-03 19:18:39 -07:00
itsmattkc 49e622ac0f viewertexteditor: shifted code to class [skip ci] 
Minor code organization
 2022-03-30 20:36:24 -07:00
itsmattkc 1f70c8f18d viewertexteditor: reset style on family change 2022-03-30 15:48:11 -07:00
itsmattkc f23d838068 Merge branch 'master' of https://github.com/olive-editor/olive 2022-03-30 15:10:55 -07:00
itsmattkc 9617436584 ui: disable native OS styling 
There really isn't much point to maintaining this and it directly opposes Qt's code so we'll be fighting them forever
 2022-03-30 15:07:33 -07:00
itsmattkc 7c68efb0ce viewertexteditor: force weight and italic 
Windows seems to require this for some reason
 2022-03-30 15:06:33 -07:00
itsmattkc 102b782215 viewertexteditor: improved UI 2022-03-30 10:13:45 -07:00
itsmattkc a4e86bac72 Merge branch 'pr/1881' 2022-03-28 13:40:27 -07:00
itsmattkc 5dd6f9d0ce trackviewitem: fixed bug 2022-03-28 13:39:54 -07:00
itsmattkc 9022a4f825 add icons for olive-light 2022-03-28 13:37:49 -07:00
itsmattkc c4711370c4 add skip existing option to style script 2022-03-28 13:37:42 -07:00
itsmattkc 99be25a67b added new icons to tracks 2022-03-28 13:33:40 -07:00
itsmattkc 5a9de2b773 viewertexteditor: empty check for styles list 2022-03-28 01:03:17 -07:00
itsmattkc 518f57992e cmake: revert to C++14 
I've modified some of the code so our C++ version can decrease back to C++14. If this fixes the OTIO linker issue... well that sucks. Hopefully whatever the issue is gets resolved some time so that we can upgrade to C++17
 2022-03-28 00:40:19 -07:00
itsmattkc 16580841a6 Squashed commit of the following: 
commit 8619bb044081da81b4eef238d138bd051e678a4c
Merge: 1a767e0c2 1c30c4d36
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Sun Mar 27 23:59:10 2022 -0700

    Merge branch 'master' into gizmo-rework

commit 1a767e0c2279cac3baf96a9028c1b78ec0491e00
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Sun Mar 27 17:23:07 2022 -0700

    implement custom html parser/exporter

commit bbd9361d345ce864d198f4340b3d59f526e642e5
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 9 22:27:17 2022 -0800

    textgizmo: further improved behavior

commit 27634d5d377f03cab009bca418765d73764893f2
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 9 22:26:19 2022 -0800

    textgizmo: improved double click behavior

commit 0897ebfa36e676461c7a47305a3c1bf66e7a9fd1
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 9 10:20:57 2022 -0800

    text: added more features and improvements

commit 9d6446a25d977ea0c66e5f5c69239aed0e92fe83
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 9 10:14:59 2022 -0800

    text: don't create color input

commit d1d3b9d46e74d8197ba3485a8e965068eb245166
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 9 09:10:23 2022 -0800

    text: convert to reference space

commit 3ba1565129a0bdd74b860b1869fec5ef30025abb
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon Mar 7 17:57:26 2022 -0800

    finally got scaling to work

    holy shit I never thought it'd be this easy

commit 081368cfac9b49a171db6c1d576e134903dffac0
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon Mar 7 11:25:58 2022 -0800

    improved text behavior

commit f3eda52eee29b7cd354d7d90b3ae1a819e1b1cf2
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon Mar 7 11:08:31 2022 -0800

    implemented font styles (weights and italics)

commit 0898b613ec9b473ac93996536d00541e0a2a3f74
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon Mar 7 01:26:13 2022 -0800

    implemented beginnings of text gizmo

commit bffb8ede2d425e7391d16bc03e613d4d90367add
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Sun Mar 6 17:55:03 2022 -0800

    conformed transform node to new gizmos

commit 1a1f86fa9bec9ea6b67f77032748c04b6b4c95fd
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Sat Mar 5 11:16:34 2022 -0800

    update polygon node

commit 2388dd69164e8c57e0a1d221c7680a0d39173c2c
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Fri Mar 4 15:31:39 2022 -0800

    implement glsl hack for corner pin

commit e96df6cb326fb278cc6555890ff0ac1d37ebf4bf
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Thu Mar 3 17:06:14 2022 -0800

    updated corner pin

commit c70aa0e72d4e83045c84259294608c1380e8929b
Merge: 5afed6383 780342881
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Thu Mar 3 17:04:40 2022 -0800

    Merge branch 'master' into gizmo-rework

commit 5afed6383952d7d936b5eeda2556339c854610af
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Thu Mar 3 16:55:57 2022 -0800

    use float points for more precise math

commit 159ade0d2812d556dee57f99e3f733ef1e838d01
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Thu Mar 3 16:55:40 2022 -0800

    ported shape node

commit 28f9500d7bc6cd2661ee9ea591db7b3f8d583196
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Thu Mar 3 15:50:19 2022 -0800

    implemented enough dragging code to reimplement crop

    Requires far less boiler-plate code per node

commit 5aeaa59227ad2f1dc3c7f499c636de843a262a88
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 2 19:45:04 2022 -0800

    update just merged corner pin for new gizmos

commit 8a2d041650d1b873c6d87664564ebcdf92a3760f
Merge: c916e8e08 f5b4729a1
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 2 19:38:36 2022 -0800

    Merge branch 'master' into gizmo-rework

commit c916e8e08016c1d0b72d85087db76e4137587d52
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 2 19:35:09 2022 -0800

    gizmos: rewrote drawing into standard routines

    Work towards a far more maintainable gizmo system
 2022-03-28 00:01:48 -07:00
itsmattkc 1c30c4d361 ffmpeg: use best effort timestamp instead of pts 2022-03-27 17:43:07 -07:00
itsmattkc cbd7c99219 nodeparamview: span columns where possible 2022-03-27 17:23:27 -07:00
itsmattkc a8bb3a9880 opengl: replace all texture2Ds with texture 
No idea how this passed through the cracks but oh well
 2022-03-24 09:30:53 -07:00
itsmattkcandThomas Wilshaw a4056d8454 Upgrade to OpenGL ES 3.2 (#1879) 
* upgrade to opengl 3.2

* cornerpin: no need for hack

* renderer: Update OCIO shader language to ES 3.0

Co-authored-by: Thomas Wilshaw <thomaswilshaw@gmail.com>
 2022-03-20 11:17:18 -07:00
itsmattkc 53154df9b2 menu: add extra actions when clips are selected 2022-03-18 14:18:28 -07:00
itsmattkc 60aa03733c node: declare bezier as interpolated type 2022-03-17 11:55:30 -07:00
itsmattkc 43cef6e332 opengl: set texture wrap R on 3D textures 2022-03-10 12:22:14 -08:00
itsmattkc 1434f0f225 blur: default to repeat edge pixels on 2022-03-10 11:37:51 -08:00
itsmattkc 3e12fb1f96 cornerpin: fix bug with hack 2022-03-04 15:50:55 -08:00
itsmattkc 63c807b902 implement glsl hack for corner pin 2022-03-04 15:46:08 -08:00
itsmattkc 780342881e cornerpin: add version to frag shader too 
This fixes shader compilation issue on some platforms/drivers
 2022-03-02 19:45:47 -08:00
itsmattkc 41a49c4880 Merge pull request #1866 from tecnotercio/sequence-dialog-header 
Fix the error "‘AV_CH_LAYOUT_STEREO’ was not declared in this scope" during build
 2022-02-27 21:47:17 -08:00
itsmattkc c2dd7da723 ci: set minimum deployment versions correctly [skip ci] 
Shouldn't really be an issue since 10.13 is already lower than 11.0, but this is more "correct"
 2022-02-17 17:56:59 -08:00
itsmattkc 76831a2bfd ci: rm zlib on arm64 2022-02-17 17:32:01 -08:00
itsmattkc 96ef7ae066 ci: comment out error line for now 2022-02-17 17:15:53 -08:00
itsmattkc d7067d5b97 ci: fix capitalization 2022-02-17 16:40:17 -08:00
itsmattkc 8118ee29d4 ci: attempt to codesign on macos 2022-02-17 16:33:55 -08:00
itsmattkc 21efc945cf ci: keep attributes when copying mac frameworks 2022-02-17 14:54:49 -08:00
itsmattkc 5cf076082c ExportDialog: improved codec stack UI 2022-02-01 16:46:30 -08:00
itsmattkc 217973e069 Slider: add label substitution for certain values 
Allows "Threads" option in advanced export setting to show "Auto" when set to 0
 2022-02-01 15:36:26 -08:00
itsmattkc 60aa76794a actually fix msvc compile issue 2022-02-01 14:30:50 -08:00
itsmattkc f61031db2d fix msvc compile issue 2022-02-01 14:10:40 -08:00
itsmattkc 019b3cfe29 implemented maintaining audio pitch and reversing 2022-02-01 13:39:43 -08:00
itsmattkc efa74c72a8 ci: fix incorrect path 2022-01-30 23:00:31 -08:00
itsmattkc bc81f5d832 ci: implement mac bundle hacks 2022-01-30 22:48:33 -08:00
itsmattkc 37b695c5e1 ci: rework dylibbundler call 
I have no idea
 2022-01-30 18:01:00 -08:00
itsmattkc 6f6d9aedf1 ci: use dylibbundler instead of macdeployqt 
Good riddance
 2022-01-30 17:49:03 -08:00
itsmattkc e26dbc71c6 ci: use different qt5 tools package for deployment 2022-01-30 16:47:35 -08:00
itsmattkc 5a99f21e06 ci: force correct qt platform plugin 2022-01-30 13:05:07 -08:00
itsmattkc b0c5f47695 ci: wrap symbol generation in x86_64 if since we don't have crashpad yet 2022-01-30 12:10:23 -08:00
itsmattkc a455e3f9b4 ci: fix untar mistake 2022-01-30 11:54:49 -08:00
itsmattkc f7b1b3b1c0 ci: acquire x86_64 macdeployqt 
No idea if this will work, hopefully macdeployqt is smart enough to use the ARM64 versions of Qt libraries rather than its own x86_64 versions
 2022-01-30 11:36:48 -08:00
itsmattkc 7bb07d21a2 ci: disable tests for non-x86_64 builds 2022-01-30 11:05:38 -08:00
itsmattkc adc30216a2 further revised icon system 
- Move QRC generation to CMake so they can be generated automatically rather than with generate-style.sh
- Removed QRC generation from generate-style.sh
- Added extra "disabled icon" generation in generate-style.sh
- Added disabled icon loading to main code
 2022-01-28 16:39:55 -08:00
itsmattkc c9c82fae0b Merge branch 'master' of https://github.com/olive-editor/olive 2022-01-28 16:33:44 -08:00
itsmattkc cce379ad22 handle cache properly in ripple delete 2022-01-28 13:49:49 -08:00
itsmattkc 3f7381f7cb PolygonGenerator: Finished main implementation 
It's been 84 years, but the polygon generator not only works, but now has bezier support. The UI could still use some work, but this was the hardest part. I guess complex masking should be possible now, if perhaps slightly cumbersome until the UI is smoothed out.
 2022-01-24 22:17:19 -08:00
itsmattkc 1e7d5a1751 include brush setting in gizmo handle draw function 2022-01-24 14:51:12 -08:00
itsmattkc 7436c1e213 timeline: perform transition removal before calculating clips 2022-01-24 12:19:55 -08:00
itsmattkc 437f74c6b4 Fix GCC 11 compile issue 
Jesus Christ...
 2022-01-24 11:38:06 -08:00
itsmattkc 9b19f7eab6 NodeParamViewItemBase: Set widget in constructor 
Fixes #1829
 2022-01-24 09:58:04 -08:00
itsmattkc 8c481b4bd8 implemented delete all empty tracks command 
Fixes #1843
 2022-01-24 09:53:30 -08:00
itsmattkc 124d66a281 remove track and exclusive dependencies from sequence 2022-01-24 09:53:16 -08:00
itsmattkc 7fa8c6f33a timeline: rewrite ripple delete 
Fixes #1841
 2022-01-23 23:54:38 -08:00
itsmattkc eafa2ca3be implemented basic track delete function 2022-01-23 14:51:43 -08:00
itsmattkc 21b8bbe292 undocommand: get project before redo 2022-01-23 14:51:16 -08:00
itsmattkc b1ae7d5eda node: fixed catastrophic array bug 
Jesus Christ how did this not get caught sooner
 2022-01-23 14:51:04 -08:00
itsmattkc 8f8d43f634 move xmlnodedata to serializers 
Since this differs between serializers too, move the class into each with changes as appropriate
 2022-01-22 21:09:36 -08:00
itsmattkc 83fad2a438 use constants for polygon node 2022-01-22 20:24:06 -08:00
itsmattkc 08ffc63922 paramview: disable timing for now 2022-01-22 20:22:15 -08:00
itsmattkc 8f440569f8 paramview: update keyframe positions on show 2022-01-22 20:22:02 -08:00
itsmattkc 6aa493bd67 reworked param view passthroughs for groups 2022-01-22 18:17:51 -08:00
itsmattkc aae0c4963b add pixel aspect ratio to nodeglobals 
Turns our pixel aspect ratio is broken in various places. Will have to fix this at some point.
 2022-01-22 17:31:14 -08:00
itsmattkc 1412d69de7 reimplemented polygon node on cpu 
This is still incomplete, it's a little slow (like text is), gizmos aren't functional, and still no beziers, but hey it works again now
 2022-01-22 17:19:33 -08:00
itsmattkc 6701e78498 opacity: set texture input flag to be not keyframeable 2022-01-22 17:16:27 -08:00
itsmattkc bf8dd4fd87 include qstring in tohex.h 2022-01-22 17:16:07 -08:00
itsmattkc 42d744d624 group: or original flags with additional flags 2022-01-22 17:15:56 -08:00
itsmattkc 4476a8d858 consolidate cpu optimizations into single header 2022-01-22 17:15:23 -08:00
itsmattkc bda9b00c62 Merge branch 'master' of https://github.com/olive-editor/olive 2022-01-22 17:14:37 -08:00
itsmattkc 9714164723 fix serializer bug where element 0 would always be loaded incorrectly 2022-01-22 17:14:28 -08:00
itsmattkc 3cf90116e2 implement group-based opacity node 2022-01-21 10:08:48 -08:00
itsmattkc 8ab3331586 group: if override name exists, return that 2022-01-21 10:08:20 -08:00
itsmattkc 75691e8bea group: when adding input passthrough, return unique ID 2022-01-21 10:08:06 -08:00
itsmattkc bc14b0454d nodeview: when new nodes are added from any source, select them 2022-01-21 10:07:37 -08:00
itsmattkc cc4bc91cc3 nodeview: when adding new group, ensure children are added too 2022-01-21 10:07:19 -08:00
itsmattkc 11d0d366eb nodeview: update context rect if node is removed 2022-01-21 10:06:56 -08:00
itsmattkc ce0bdee295 paramview: always connect signals to real node rather than group 2022-01-21 10:06:43 -08:00
itsmattkc a55e142ed0 appimage: pass args through 2022-01-18 13:03:46 -08:00
itsmattkc a2f8c6eb29 preferences: fixed bug that broke selecting backend 2022-01-14 22:44:00 -08:00
itsmattkc 6fed061e65 implemented audio dialog 
It's arguably not finished in that each API has parameters that users may want control over (e.g. ASIO latency), but it allows selecting devices again which is a necessity
 2022-01-14 18:21:12 -08:00
itsmattkc 4584d28652 Merge branch 'serializers' 2022-01-12 16:35:25 -08:00
itsmattkc 1325f1af42 implement werror option 2022-01-12 16:35:17 -08:00
itsmattkc 576ea8e81f refactored copy/paste code for new serializers 
Vastly improves code quality and reusability
 2022-01-12 16:34:40 -08:00
itsmattkc 88b7151c17 restored project properties dialog 2022-01-12 13:15:52 -08:00
itsmattkc 1e5ecaace6 sequencedialog: fixed catastrophic save bug 
This commit also switches to shared ptrs because this dialog has caused a surprising amount of memory-related mistakes that it really ought not to and ptrs will take a lot of the memory management burden off us.
 2022-01-12 09:20:00 -08:00
itsmattkc 4ecce20c35 start implementing serializers 2022-01-12 08:48:31 -08:00
itsmattkc b40a61c6ed rendertask: return errors and respond appropriately 
Fixes #1348
 2022-01-10 10:15:45 -08:00
itsmattkc e0c8a2e569 export: allow running task in background 
Realized the "Task" infrastructure completely permits this essentially as-is.

Fixes #542
 2022-01-10 10:05:05 -08:00
itsmattkc c3a02e3dc2 audiomonitor: null channel count check 2022-01-10 09:35:43 -08:00
itsmattkc 3731b0a4b7 nodeview: null check on block track and sequence 2022-01-10 09:31:10 -08:00
itsmattkc 6728a3d349 hashtraverser: remove unnecessary warning 2022-01-09 22:21:25 -08:00
itsmattkc b5be11a93b push null texture if footage time is NaN 
Fixes #1767
 2022-01-09 22:21:10 -08:00
itsmattkc 8373a7ea96 loadotio: minor UI tweaks 2022-01-08 11:57:30 -08:00
itsmattkc 9264a2f856 Merge pull request #1330 from ThomasWilshaw/OTIO_load 
OTIO load
 2022-01-07 19:35:38 -08:00
itsmattkc d88b7f35ce [skip ci] revise comment in math node 2022-01-07 16:21:39 -08:00