oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,689 Commits 1 Branch 0 Tags
2c31fdfc0eb555a2ee985c282e55582c632d491f
Commit Graph
5689 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Wilshaw 2c31fdfc0e Fix PR comments and generate mask 2022-05-02 20:47:18 +01:00
Thomas Wilshaw f9f8622682 Add ability to set custom OCIO function names 2022-04-27 22:48:41 +01:00
itsmattkc 3c13e32620 further implement colortransformjob 2022-04-26 13:13:28 -07:00
Thomas Wilshaw 831fe77275 Cleanup and rename OCIO Linear Grading node 2022-04-24 21:03:00 +01:00
Thomas Wilshaw 4d2f8f775c Add ability to add custom shaders to ColorProcessorJobs 2022-04-24 18:50:06 +01:00
itsmattkc 1a2cd9ac3e Merge branch 'master' into pr/1875 2022-04-15 17:41:38 -07:00
itsmattkc d65da69c7d ci: don't sign on pull requests 2022-04-15 17:25:51 -07:00
itsmattkc 7f0fc1de90 implement color processor job 
Refactored code to use a color processor job
 2022-04-15 14:03:06 -07:00
itsmattkc 97a210f14b Merge branch 'master' into pr/1875 2022-04-15 13:24:23 -07:00
ThomasWilshaw 95aa3249d0 Add Blackmagic Film Wide Gamut Gen 5 (#1871) 
- Adds a Blackmagic Film Wide Gamut Gen 5 input transform to the config
- Adds a CIE-XYZ D65 space to the config
app/render/ocioconf/luts/Blackmagic_FilmWideGamut_Gen5_to_linear.spi1d
 2022-04-12 13:25:14 -07:00
itsmattkc 3aafb2466d Squashed commit of the following: 
commit f05b5b3ff8286f6252c2a3f3c8c367f8a5b821b5
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue Apr 12 13:05:25 2022 -0700

    final consistency modifications

commit 4f27718d46de9660822eb197b0e900be947ec515
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue Apr 12 11:40:58 2022 -0700

    opengl: don't set texture options for null texture

commit bb54cfcf4e219e1cbf1ecc6b5552cca75e6e1573
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue Apr 12 11:40:29 2022 -0700

    rename inputs

commit e5ac8fffa2ac15f5549b6da5f42b05659c6d020f
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue Apr 12 10:37:23 2022 -0700

    change alpha association formula

commit dee09a88f17552e3f98be8940966822e45d6df4f
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue Apr 12 10:36:58 2022 -0700

    glsl: use constants to improve readability

commit aedc75ebee11b61198f29c464501a2ddb0506129
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue Apr 12 10:36:26 2022 -0700

    changed id capitalization

commit 470b2bb85b51c4a57c109d3fb230088a81024277
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue Apr 12 10:35:53 2022 -0700

    node: update categories

commit c78dacad82051dfbb3e40c92cfaf456dbff2de0d
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue Apr 12 09:22:57 2022 -0700

    updated shaders to es 3

commit 1e7544be93e55916c94cd91629ec5eef728bfad8
Merge: 1bbb8d7f9 25d019609
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue Apr 12 09:02:32 2022 -0700

    Merge branch 'master' into pr/1818

commit 1bbb8d7f9acd75cb4498733f105fbe0487c0db9c
Author: brimson <40442071+brimson@users.noreply.github.com>
Date:   Tue Jan 18 18:36:24 2022 -0700

    Simplify colordifferencekey.frag

    Avoiding extra MOV instruction

commit c7cf1021ce5a3d090833e94e4bc212cc51a61a2a
Author: brimson <40442071+brimson@users.noreply.github.com>
Date:   Tue Jan 18 11:43:02 2022 -0700

    Revert switch-case changes

    Thanks Simran, MattKC, and Wilshaw for the clarifications

commit 882ffeede01b81f0cb4dfd885ba05bf66119ac7e
Author: brimson <40442071+brimson@users.noreply.github.com>
Date:   Tue Jan 18 00:06:31 2022 -0700

    Optimize despill shader

    Turn previous averaging from (1 MAD + 1 MUL) to (1 DP2), reuse the result to prevent recalculation.

commit 0c93f519977fa34840ab03d51addcf2456f931d8
Author: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date:   Sat Jan 8 17:23:49 2022 +0000

    Cleanup

commit 222560ce1a4666899b1111854d4d549dd7ba1357
Merge: 96e21c2b4 d3ffeaa35
Author: ThomasWilshaw <thomaswilshaw@gmail.com>
Date:   Tue Jan 4 23:50:39 2022 +0000

    Merge branch 'master' into color_key

commit 96e21c2b43db3bf1051aca696970509292159548
Author: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date:   Tue Jan 4 23:45:26 2022 +0000

    Rename and reoganise keying nodes

commit 6d42ed23a69ebdb1f5b399957f0b37434d0519dd
Author: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date:   Tue Jan 4 23:04:50 2022 +0000

    Move despill code to it's own node

commit e97ab2e16fd1d4e2f2ff145b8c023ff0e1ee451e
Author: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date:   Mon Jan 3 21:39:48 2022 +0000

    Add option for blue screens

commit 2346f44e5af48bb9547c77c4c08ee7abfcb09393
Author: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date:   Mon Jan 3 21:14:55 2022 +0000

    Optimise node slightly

commit 446522edcf63525fafe7a97cf6d59b7ea0385460
Author: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date:   Mon Jan 3 21:10:03 2022 +0000

    Fix GL ES compile error

commit a765ce6c6f3e0c0e996f08e2a3ef1101818098e8
Author: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date:   Sun Jan 2 18:27:24 2022 +0000

    Cleanup

commit d268e0645df34aa306dc391d1dc10bf335524f94
Author: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date:   Sun Jan 2 18:03:26 2022 +0000

    Fix core matte and change Darks start value

commit 30b024dc5f59dd60ffc5012eee7a79201ed4f9c3
Author: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date:   Sun Jan 2 17:26:39 2022 +0000

    Change matte controls and cleanup

commit b742a9ba7ed651785a0781289a4c03fd4fb72e03
Author: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date:   Sun Jan 2 16:31:41 2022 +0000

    Add a core and garbage matte

commit f814d036b61b8de090df4c1f080c124b98b432d6
Author: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date:   Sun Jan 2 03:31:20 2022 +0000

    Improve basic keyer

commit 4995ec3b9b92c9b4cb0dc31a247d585b2a47e408
Author: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date:   Sun Jan 2 00:23:18 2022 +0000

    Start simple color key node
 2022-04-12 13:05:45 -07:00
itsmattkc 60f80d4a14 ui: moved timeline selection signal queue to timeline 
Probably a safer way to do this
 2022-04-12 09:28:51 -07:00
itsmattkc 25d0196094 timeline: add links when trimming adjacent gaps 
Fixes #1808
 2022-04-12 00:32:15 -07:00
itsmattkc 0eaf42204c fixed rogue space 2022-04-11 21:17:33 -07:00
itsmattkc 7ceb5c0914 timeline: implement track select tool 
Fixes #866
 2022-04-11 19:49:50 -07:00
itsmattkc 5bb1aa41f7 nodeparamview: fixed crash 2022-04-11 19:40:44 -07:00
itsmattkc b426e8f8a0 renderer: handle null samples on tempoprocessor 
Fixes #1862
 2022-04-11 18:38:10 -07:00
itsmattkc c073fb418f speeddurationdialog: reordered duration/reverse settings 2022-04-11 18:32:11 -07:00
itsmattkc 245a0a112a clip: fixed speed/reverse order 2022-04-11 18:30:17 -07:00
itsmattkc 60e5241f05 clip: fixed waveform issues with speed and in trimming 2022-04-11 16:41:14 -07:00
itsmattkc 80d53c6d0c clip: improve waveforms when reversed 2022-04-11 16:25:32 -07:00
itsmattkc e85a5b21b0 nodeparamview: fixed problematic behavior 
Fixes #1894
 2022-04-11 11:06:51 -07:00
itsmattkc 5afd322644 nodeparamview: significant optimization 
- Skips multiple calls to SetContexts in quick succession
- Only add/remove contexts as necessary rather than resetting every time
 2022-04-10 12:09:04 -07:00
itsmattkc d6b90f4e94 timeline: set waveform after initial input copy 2022-04-09 16:37:38 -07:00
itsmattkc 1895497bed viewer: unset gizmos on disconnect 
Fixes potential crash
 2022-04-09 16:37:24 -07:00
itsmattkc 1448f641e5 nodeparamview: remove item when nodes is removed from context 2022-04-09 15:36:49 -07:00
itsmattkc 48adb159b8 various: consolidated dir exists+mkpath into one function 2022-04-07 17:11:50 -07:00
itsmattkc 20f74919a3 export: check if exists and if can mkpath 2022-04-07 16:49:18 -07:00
itsmattkc fb9034023c cmake: require ocio 2.1.1 2022-04-07 16:49:05 -07:00
itsmattkc e0bfbf12b2 groups: improved functionality 
Various improvements and fixes to groups
 2022-04-04 23:34:34 -07:00
itsmattkc 38c8bd4b0d paramview: implemented passthrough editing 2022-04-04 22:13:08 -07:00
itsmattkc d7b3c523f4 groups: improved serialization 
Introduced new project version with extra customization for groups
 2022-04-04 00:03:57 -07:00
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 2a74522aa6 viewertexteditor: fixed UI issues on macOS 2022-03-30 12:04:36 -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