oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,415 Commits 1 Branch 0 Tags
cb1127936acc2fe65c41dbe5595036dd0bb388ac
Commit Graph
3415 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Wilshaw cb1127936a Implement Alt Click to default on sliders 
The following sliders now have Alt Click functionality:
 - Nodes (What it's initialy set too or 0 if not)
 - Export Dialog Dimensions~ (Defaults to Sequence width/height)
 - Export Compression Settings~
    - Advanced (0)
 - Speed/Duration
    - Speed (100%)
    - Duration (clip length)
 - Stream Properties Image sequence
    - Start Index (1)
    - End Index (sequence length)

Sliders with no default value set ignore an Alt
Click.

Added SliderBase::SetDefaultValue() which sets the
default value of a slider.

Added ValueReset() to SliderBase signals which is
called if a slider is Alt Clicked on. Only updates
if default_value_ is not Null.
 2020-05-07 22:14:37 +01:00
itsmattkc 502ce85828 Merge pull request #1146 from sobotka/ocio-fixes 
OCIO Fixes
 2020-05-08 03:20:37 +10:00
itsmattkc 8362a68aa9 viewer: factor visibility into audio playback 2020-05-08 02:57:59 +10:00
itsmattkc 95e1273a63 Merge branch 'gizmos' 2020-05-08 00:41:19 +10:00
itsmattkc 69941dc2da nodes: added access to default value 2020-05-08 00:37:43 +10:00
itsmattkc 65705d580d renderer: keep frames in vram while paused 
Saves some GPU cycles when adjusting parameters.
 2020-05-08 00:32:02 +10:00
itsmattkc 46b61c0226 Merge pull request #1152 from ThomasWilshaw/gitignore_update 
gitignore updates for Visual Studio with CMake
 2020-05-07 23:10:49 +10:00
Thomas Wilshaw 49b8e2bfab gitignore updates for Visual Studio with CMake 
Using Visual Studio and it's built in CMake generates a folder called .vs and a
JSON file of CMamke settings called CMakeSettings.json. These have both been
added to the .gitignore file.
 2020-05-07 13:28:21 +01:00
itsmattkc 5b956729b3 gizmos: work towards gizmos in the matrix transform node 2020-05-07 18:12:18 +10:00
itsmattkc 32eb28d05e Merge branch 'master' into gizmos 2020-05-07 14:42:11 +10:00
itsmattkc 3436740d23 gizmos: consolidated input param dragging code into reusable class 2020-05-07 14:41:50 +10:00
itsmattkc b9622ff916 Merge branch 'master' of https://github.com/olive-editor/olive 2020-05-07 04:57:37 +10:00
itsmattkc e45256f6ab cmake: rdynamic needs to be a *link* flag (not a compile flag) 2020-05-07 04:56:34 +10:00
itsmattkc d02e9090b9 implemented core gizmo interaction functionality 2020-05-07 04:45:27 +10:00
itsmattkc 3600d1254d config: shorten default cache length 2020-05-07 04:06:03 +10:00
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 39efafc8c2 Merge pull request #1151 from ThomasWilshaw/footageProperties 
Fix first useable stream being selected
 2020-05-07 03:11:41 +10:00
itsmattkc b3ffc42113 Merge pull request #1140 from Simran-B/msvc-mp-flag 
MSVC: Build with Multiple Processes (CMAKE_CXX_FLAGS /MP)
 2020-05-07 03:11:24 +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
Thomas Wilshaw df97a86dbc Fix first usable stream being selected 
Footage Properties should always select the first usable stream. Commit 1fa3f4e
didn't quite fix this with all footage. This should.
 2020-05-05 22:32:11 +01: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
Thomas Wilshaw 1e81969fca Waveform fixes 
- Due to a floating point division error not all the bars on the waveform were
  being drawn.
- Fix ratio in the fragment shader
 2020-05-05 11:29:15 +01: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
Troy James Sobotka 95f05d6429 OCIO Fixes 
Change the allocation variables to be lower
range and fit better. Should fix the 1.0
edge issue possibly.
 2020-05-04 13:13:47 -07:00
Thomas Wilshaw 921a5f357e Merge branch 'master' of https://github.com/olive-editor/olive 2020-05-04 18:11:43 +01:00
itsmattkc 1bf0f90a0a Merge pull request #1145 from eszlari/cmake-generate 
ocioconf: replace script with cmake
 2020-05-05 02:58:35 +10:00