oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,399 Commits 1 Branch 0 Tags
3da9643da2c142c6535dfb2cfbf4e68cc76aeeea
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
itsmattkc 3da9643da2 Squashed commit of the following: 
commit 8e06ded5769a41294d1f6645b1442634d2f503ff
Author: itsmattkc <itsmattkc@gmail.com>
Date:   Thu May 7 03:18:39 2020 +1000

    updated widget layout consistency

commit ba0ef33d56af23ccb611bc10293bd6cd0a52f250
Merge: 0f306550 9a4f7b54
Author: itsmattkc <itsmattkc@gmail.com>
Date:   Thu May 7 03:12:12 2020 +1000

    Merge branch 'pp_tabs' of https://github.com/ThomasWilshaw/olive into ThomasWilshaw-pp_tabs

commit 9a4f7b546eb096c64de16ab6ea9d942963ac9ae2
Author: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date:   Mon May 4 23:56:26 2020 +0100

    Tabify Project Properties

    Move the project properites from boxes to tabs.
 2020-05-07 03:19:25 +10:00
itsmattkc 43ee598e01 Merge branch 'master' of https://github.com/olive-editor/olive 2020-05-07 03:14:18 +10:00
itsmattkc 0f306550bf slider: use custom dragging code on mac 
The slider dragging implementation used for other platforms caused issues on
macOS. We now have a custom Mac implementation that doesn't cause problems, and
is arguably better than the other implementation anyway.
 2020-05-07 03:04:40 +10:00
itsmattkc 373eeaeacd renderer: when invalidating visible, kick the workers into emit mode 2020-05-07 01:29:05 +10:00
itsmattkc c61adbf2a2 videorenderer: if an InvalidateVisible() signal comes through, cancel the queue 
Optimization that frees up the GPU as quickly as possible when the user starts
making changes that may require quick feedback.
 2020-05-07 00:56:16 +10:00
itsmattkc 2eb753e99d matrix: comment out broken test code 2020-05-06 23:23:07 +10:00
itsmattkc 3ef119c0ab removed shaders.qrc 
Accidentally got merged in on this branch.
 2020-05-06 23:22:49 +10:00
itsmattkc f262f1dadd Merge branch 'master' into gizmos 2020-05-06 23:18:15 +10:00
itsmattkc ee61ed3b2b Merge branch 'master' of https://github.com/olive-editor/olive 2020-05-06 23:15:24 +10:00
itsmattkc 4d85987b71 nodeparamviewwidgetbridge: fixed array index out of bounds 2020-05-06 17:47:42 +10:00
itsmattkc 530aae00b8 nodeparamviewitem: fixed bug that didn't pass time target to array elements 2020-05-06 17:47:13 +10:00
itsmattkc 67854a2c97 gizmos: use scale instead of matrix transform 
Improves appearance of gizmos lines and ensures other controls are drawn in
UI dimensions rather than texture dimensions.
 2020-05-06 17:45:44 +10:00
itsmattkc 1ceefb6dba Merge branch 'master' into gizmos 2020-05-06 16:35:40 +10:00
itsmattkc 2e0082b04c nodes: started array widget 2020-05-06 16:32:54 +10:00
itsmattkc 78e305a593 mergenode: optimize so null textures (gaps, etc.) don't affect the hash 2020-05-06 16:14:27 +10:00
itsmattkc d49c6a059c nodes: optimize blocks so they don't unnecessarily change the hash 2020-05-06 16:14:23 +10:00
itsmattkc fb625cb76e nodes: removed XML infrastructure 2020-05-06 15:06:37 +10:00
itsmattkc 057cfe4296 config: make sure floats are used for color instantiation 2020-05-06 02:53:36 +10:00
itsmattkc fd30643204 Merge branch 'master' of https://github.com/olive-editor/olive 2020-05-06 00:23:11 +10:00
itsmattkc 721f6a79b4 mild conform to the rest of the code 2020-05-06 00:22:43 +10:00
itsmattkc 0d0d35f025 Merge branch 'ire_lines' of https://github.com/ThomasWilshaw/olive into ThomasWilshaw-ire_lines 2020-05-06 00:12:37 +10:00
itsmattkc d5f293c02a Merge branch 'master' of https://github.com/olive-editor/olive 2020-05-06 00:11:09 +10:00
itsmattkc 17876410b5 rewrote OCIO C locale patch 
Previous build was getting optimized out. This one shouldn't.
 2020-05-06 00:10:10 +10:00
itsmattkc c6213b32ad Merge branch 'nodeviewredux' 2020-05-05 23:47:33 +10:00
itsmattkc af994cd1b6 preferences: added preference for node color scheme 2020-05-05 23:47:03 +10:00
itsmattkc 0628ddb901 nodes: use different colors from config based on category 2020-05-05 23:24:00 +10:00
itsmattkc 74d252c5c0 nodes: use defined categories rather than arbitrary string based 2020-05-05 22:12:15 +10:00
itsmattkc 911ef782f9 colormanager: always temporarily set C locale when loading an OCIO config from file 
Fixes known bug in OCIO when loading files from non-English locales.
 2020-05-05 14:48:09 +10:00
itsmattkc 51c896ed7e scopes: moved all shared code to a base class to easily add more scopes 2020-05-05 02:41:16 +10:00
itsmattkc 54baba63f9 Merge branch 'master' into gizmos 2020-05-05 01:05:52 +10:00
itsmattkc 30efe054c7 colordialog: if display changes, ensure views change before anything else 
Prevents exception if new display doesn't contain current view.
 2020-05-05 00:42:55 +10:00
itsmattkc b80eb6fd45 track: fixed segfault if user tried to use "add" tool on nonexistant track 2020-05-05 00:36:28 +10:00
itsmattkc c387ce1cd7 polygon node: early crude implementation 2020-05-05 00:22:49 +10:00
itsmattkc b6696f3161 Merge branch 'master' into gizmos 2020-05-04 13:12:11 +10:00
itsmattkc 63f3e542ee style: fixed windows compile issue 2020-05-04 12:58:28 +10:00
itsmattkc 1fa3f4edb4 footageproperties: auto-select first usable stream (fixes #105) 2020-05-04 02:09:52 +10:00
itsmattkc 22bfff2c62 proxy: improved progress signalling 
Signals once cache to disk is fully complete (rather than signalling on decode
and then sitting at 100% for ages until the disk saving is done).
 2020-05-04 01:53:47 +10:00
itsmattkc b458bfa542 proxy: improved UI on proxy menu 2020-05-04 01:33:26 +10:00
itsmattkc 2b1640ac04 frame/texture: use dividers when allocating buffers 
Allows render pipeline to know the "real" and "simulated" resolution of a
divided buffer.
 2020-05-04 01:08:46 +10:00
itsmattkc e4e797c901 proxy: cleaned up, re-use the render cache's disk save system for proxies, multithreaded compression 2020-05-04 00:29:26 +10:00
itsmattkc f7f437ab04 Merge branch 'master' into exrproxy 2020-05-03 17:15:32 +10:00
itsmattkc b2acb5c326 style: use native menu styling on macOS too 2020-05-03 17:15:09 +10:00
itsmattkc 6754feb2f6 proxy: began work towards creating proxy from video 2020-05-03 17:09:52 +10:00
itsmattkc e4c3b6bf7b renderer/decoder: simplified audio PCM transcode 
Turned the two-step PCM transcode into one step and simplified/removed much of
the unnecessary infrastructure that supported it. This makes the code cleaner
and generally improves the code paths.
 2020-05-03 16:07:10 +10:00
itsmattkc a925476c3f began work on exr proxy task 2020-05-03 05:23:36 +10:00
itsmattkc 403a8a8656 ocio: change lut edge size to 64 instead of 32 
Doesn't "solve" the white inaccuracy issue, but does mitigate it somewhat. Also
improves accuracy across the board.
 2020-05-03 03:14:38 +10:00
itsmattkc 80acd91d88 created script to auto-generate qt resource file from ocio config 2020-05-03 02:21:52 +10:00
itsmattkc c5458c6843 timeline: use headers in waveform data files rather than sidecar metadata files 2020-05-03 00:44:14 +10:00
itsmattkc 2d0e5322f2 oiiodecoder: fixed namespace issue 2020-05-02 22:55:45 +10:00
itsmattkc 3e57cdac1d use linesize workaround for setting OIIO pixels as well as getting 2020-05-02 22:51:29 +10:00
itsmattkc cfc5ce24a3 Merge branch 'master' into gizmos 2020-05-02 17:06:49 +10:00
itsmattkc 90597bd08a mainmenu: fixed bug in window menu 2020-05-02 16:28:06 +10:00
itsmattkc 676b18ba6e timelineviewblockitem: fixed incorrectly positioned underline 2020-05-02 15:45:16 +10:00
itsmattkc 4f23db02db preferences: removed integer quality modes 2020-05-02 15:36:35 +10:00
itsmattkc 6a50c0a66d Merge branch 'master' of https://github.com/olive-editor/olive 2020-05-01 18:19:38 +10:00
itsmattkc e7400adabc oiiodecoder: added compatibility for OIIO 1.x 2020-05-01 18:19:08 +10:00
itsmattkc 4a225aff85 colormanager: show OCIO error if env config failed to load 2020-05-01 17:55:04 +10:00
itsmattkc b39403a4e9 fixed formatting on contributing page 2020-05-01 17:03:06 +10:00
itsmattkc e67dabf1ff keyframes: implemented deleting keyframes with the delete shortcut 2020-05-01 17:01:16 +10:00
itsmattkc ca323b7bfd updated contributing page with more information 2020-05-01 16:57:13 +10:00
itsmattkc 4290797389 colormanager: use env variable as default config if it exists 2020-05-01 16:33:46 +10:00
itsmattkc 6433a0bb8c appveyor: fixed incorrect comparison in last commit 2020-05-01 14:40:07 +10:00
itsmattkc 2125293a3c appveyor: use ninja to build and try to prevent deploying on PRs 2020-05-01 14:38:49 +10:00
itsmattkc 9335815d20 waveform: ensure waveform updates on null buffers 2020-05-01 14:20:35 +10:00
itsmattkc baf954a4e0 cmake: add minimum macos version 2020-05-01 14:00:40 +10:00
itsmattkc be5e5042bd timeline: prevent rubberband from showing if the user right clicked 2020-05-01 04:08:35 +10:00
itsmattkc 6f2993477d added null check for audio that hasn't been indexed yet 2020-05-01 03:51:56 +10:00
itsmattkc a2cba8c103 pixelformat: respect linesizes when converting pixel formats 2020-05-01 03:42:31 +10:00
itsmattkc 8c8bb45f7f crashhandler: include git commit hash with crash report 2020-05-01 02:11:26 +10:00
itsmattkc 1f76c33f6b crashhandler: include git commit hash 2020-05-01 02:09:59 +10:00
itsmattkc 95b7c9770c manageddisplay: fixed segfault when closing exportdialog 
Really affected any color managed display widget, including scopes, viewers,
and the export dialog.
 2020-05-01 02:04:26 +10:00
itsmattkc 472030f8f0 oiiodecoder: implemented workaround for oiio stride bug in versions < 2.1.12 2020-05-01 01:38:31 +10:00
itsmattkc a9208294a0 exportdialog: automatically snap resolutions to even numbers 2020-05-01 00:49:09 +10:00
itsmattkc afc9cff301 exporter: fixed segfault when cancelling introduced by multithreaded color space conversion 2020-05-01 00:36:37 +10:00
itsmattkc f371aff448 exportdialog: move messageboxes to sheets 
Improves UI on macOS.
 2020-05-01 00:35:13 +10:00
itsmattkc 65e117c3de exportdialog: warn against a non-even resolution 2020-05-01 00:13:00 +10:00
itsmattkc 5a83f3db79 exportdialog: prevent widths/heights from becoming <= 0 2020-04-30 23:44:50 +10:00
itsmattkc dc355dca46 export: multithread the color space conversion 2020-04-30 18:54:30 +10:00
itsmattkc 549ecc448a ffmpegencoder: use qstring rather than sprint_s (which is only available on msvc) 2020-04-30 18:54:13 +10:00
itsmattkc ce42388d68 export: allow users to override the thread count 2020-04-30 17:19:43 +10:00
itsmattkc aecfa842c3 nodes: moved hashing to nodes so they can override behavior if they wish 2020-04-30 01:56:08 +10:00
itsmattkc ba94aa0b22 fixed some float typing for msvc build 2020-04-29 18:43:00 +10:00
itsmattkc 4ac5513e3f nodeview: implemented ability to select and delete node edges 2020-04-29 17:25:41 +10:00
itsmattkc 3f77c2ce91 Merge branch 'master' into nodeviewredux 2020-04-29 15:57:24 +10:00
itsmattkc 544a8855d3 waveform: update for glsl 150 2020-04-29 15:56:46 +10:00
itsmattkc dfedcb97b2 waveform: use qfontmetrics macro for version compatibility 2020-04-29 15:56:24 +10:00
itsmattkc bf68a4d631 nodes: added ability to label nodes 2020-04-29 15:35:05 +10:00
itsmattkc 13dc79d0cd nodeview: implemented duplicate feature 2020-04-29 15:04:53 +10:00
itsmattkc d83073cf85 nodeview: attach pasted nodes to the cursor 2020-04-29 14:49:43 +10:00
itsmattkc 1db5cf4de4 nodeview: reduce width of items 2020-04-29 14:36:06 +10:00
itsmattkc 999e841bc7 nodes: implemented short name 
Nodes can provide "short" names for use in the node graph, distinct from their
full names shown everywhere else.
 2020-04-29 14:33:57 +10:00
itsmattkc ff1a470aa0 Merge branch 'master' into nodeviewredux 2020-04-29 05:01:11 +10:00
itsmattkc 2a9c11823e Merge branch 'master' of https://github.com/olive-editor/olive 2020-04-29 04:57:39 +10:00
itsmattkc 8ab91a70cc nodeview: implemented moving with either the hand tool or middle mouse button 
Includes splitting off this functionality from TimelineViewBase so it can be
re-used in any QGraphicsView.
 2020-04-29 04:56:58 +10:00
itsmattkc 366945fd29 add rdynamic to the linux build options 
This appears to be necessary for debug symbols to show in the crash handler.
 2020-04-29 03:57:49 +10:00
itsmattkc f04fa12c06 nodeview: allow expanded views of nodes again 
Re-implementing expanding nodes to see the connections (but nicer this time).
 2020-04-29 03:56:50 +10:00
itsmattkc d8df7cd5a7 Merge branch 'master' into nodeviewredux 2020-04-29 02:15:34 +10:00
itsmattkc 877e8d3afc curveview: ensured curveview is updated with the correct length and playhead 2020-04-29 01:26:09 +10:00
itsmattkc 69d399105a manageddisplaywidgets: fixed issue that caused buffers to be drawn on the main window 2020-04-29 01:24:21 +10:00
itsmattkc 3070aa7e40 waveformscope: convert buffers to DVL before drawing the waveform 2020-04-29 00:36:55 +10:00