oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,644 Commits 1 Branch 0 Tags
2a74522aa67da1ce8abf1d7bc4dbce669b58b1be
Commit Graph
5644 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Simran Spiller cdf9efa7f6 CI: Use new 2022.1 image 2022-03-18 23:47:21 +01:00
Simran Spiller b55961d5bb Docker: Update deps (FFmpeg 5.0, OTIO 0.14.1, OpenEXR/Imath 3.1.3, etc.), add WIP OIIO package 2022-03-18 23:42:26 +01:00
Simran Spiller 2dacce58af Docker: Update OCIO to v2.1.1 (2.1.x is VFX reference platform 2022) 2022-03-18 23:42:26 +01: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
Pablo Gil 7318d321a6 fix missing "padlock_opened" references 2022-03-15 17:27:21 +01:00
Pablo Gil ebf734fec0 autogenerated .png and manually updated .qrc 2022-03-15 16:47:57 +01:00
Pablo Gil edf7b483dc adding "mute" and "lock" timeline icons 2022-03-15 16:40:45 +01: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
Thomas Wilshaw 1e3e620269 timeline-tests: Setup config before running 2022-03-09 14:05:27 +00:00
Thomas Wilshaw d64f153e0b filefunctions: change permissions to allow deleting 2022-03-09 13:41:13 +00:00
Thomas Wilshaw 6ccebcd988 colormanager: Remove hard coded color space 
The hard coded color space was causing custom configs to crash if they
didn't contain that specific color space.

Also sets the default role in the config to sRGB EOTF to keep
consistency with previous behaviour
 2022-03-09 12:50:34 +00:00
Blendy f75e91cf4d Fixed typo in Spanish translation (#1870) 
Avtivado -> Activado
 2022-03-05 19:18:23 +01: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
ThomasWilshawanditsmattkc f5b4729a19 Corner pin (#1851) 
* Start adding a corner pin node

* Start gizmo support

* Correctly setup QVector2d inputs

* Missing breaks were causing incorect data to be set

* Add ability to override vertex coords

* Get perspective pin working

* Cleanup

* Add none perspective corner pin

* Small optimisation

* Improve comments, clean up and fix bug in job optimisation

* [skip ci] cornerpin: Improve description

* Move GL extension from shader to standard preamble.

* Use #version 130 for mobile GPU compatibility

* Cache half resolution

* Use built in NodeInputDragger::GetStartValue

* Pass cnst references to avoid deep copies

Co-authored-by: itsmattkc <itsmattkc@gmail.com>
 2022-03-02 19:38:12 -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
Tércio Martins 027f789a62 Fix the error "‘AV_CH_LAYOUT_STEREO’ was not declared in this scope" during build 
The build of Olive under Arch Linux (package "olive-git") crashes in the file "app/dialog/sequence/sequencedialogpresettab.cpp".

GCC tries to look for the directive "AV_CH_LAYOUT_STEREO", but cannot find it, because the source code has no reference to the header "render/audioparams.h".

The following link contains more details about the error: https://aur.archlinux.org/packages/olive-git#comment-852760
 2022-02-26 16:07:02 -03:00
tecnotercio b0a153a15e Merge branch 'olive-editor:master' into master 2022-02-26 15:09:54 -03:00
Tércio Martins 92ef984184 Revert "Fix Travis script "install.sh" - execution hangs on osx "if" condition." 
This reverts commit f82bef4195.
 2022-02-26 15:04:09 -03: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
Simran Spiller 536f518ba2 Change file mode of Chinese translations to not be executable [skip ci] 2022-02-18 00:02:21 +01:00
itsmattkc 21efc945cf ci: keep attributes when copying mac frameworks 2022-02-17 14:54:49 -08:00
itsmattkc 03f0ec9f64 ffmpeg: updated for 5.0 2022-02-17 14:53:12 -08:00
Quackdoc 7d52dc19e3 Add support for x264 and x265 presets (#1856) 
* Add support for x264 and x265 presets

just adds presets for x264 and x265. seems to work fine for me.

* UI tweaks

Make the presets easier to understand, add tooltip explaining preset's effects

* Do things properly, minor typo fix
 2022-02-03 17:44:08 -08:00
Quackdocanditsmattkc 249006c685 Cineform support (#1853) 
* Cineform Support

Add default cineform support

* Revert "Cineform Support"

This reverts commit f810358b7997ea2d996a3dbbae21252c9f37e7e9.

* Cineform Support

Add default cineform support

* Do not expose DNxHD yet

* ExportDialog: Add CineformSection

Co-authored-by: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
 2022-02-02 09:58:13 -08:00
itsmattkc cf1e8c9a95 fixed bug preventing negative timecodes being parsed correctly 2022-02-01 19:55:30 -08:00
itsmattkc f9112c05fd Implemented time offset node 2022-02-01 19:55:09 -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