oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,382 Commits 1 Branch 0 Tags
1ceefb6dbaa4689305f44d29d398a95a3b566d45
Commit Graph
635 Commits
Author SHA1 Message Date
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 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 c6213b32ad Merge branch 'nodeviewredux' 2020-05-05 23:47:33 +10:00
itsmattkc 0628ddb901 nodes: use different colors from config based on category 2020-05-05 23:24:00 +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 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 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 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 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 c5458c6843 timeline: use headers in waveform data files rather than sidecar metadata files 2020-05-03 00:44:14 +10:00
itsmattkc cfc5ce24a3 Merge branch 'master' into gizmos 2020-05-02 17:06:49 +10:00
itsmattkc 676b18ba6e timelineviewblockitem: fixed incorrectly positioned underline 2020-05-02 15:45:16 +10:00
itsmattkc e67dabf1ff keyframes: implemented deleting keyframes with the delete shortcut 2020-05-01 17:01:16 +10:00
itsmattkc 9335815d20 waveform: ensure waveform updates on null buffers 2020-05-01 14:20:35 +10:00
itsmattkc be5e5042bd timeline: prevent rubberband from showing if the user right clicked 2020-05-01 04:08:35 +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 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 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
Troy James Sobotka 949e43cada Update IRE increments 
Move to 10% increments.
 2020-04-28 15:59:40 -07:00
Troy James Sobotka c06bdc5eac Update flourishes 
Centre and align text.
 2020-04-28 15:39:16 -07:00
Troy James Sobotka 4af10b2b5c Update Waveform Output 
Updates:
 * Added IRE text on 20% increments
 * Added waveform lines that work
 * Scaled waveform to a subsection of the surface
 2020-04-28 15:06:22 -07:00
Troy James Sobotka b9a62eb1aa Add lines 
Adding waveform lines. Still requires scaling to
fit in arbitrary range.
 2020-04-28 15:06:22 -07:00
itsmattkc ff1a470aa0 Merge branch 'master' into nodeviewredux 2020-04-29 05:01:11 +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 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
itsmattkc 61dd75a2ed scopes: only update if visible 
Updating scopes can require heavy processing so we limit updates to only
when the scope is visible
 2020-04-28 23:55:40 +10:00
itsmattkc ad419754a9 waveformscope: fixed double free on close 2020-04-28 17:40:22 +10:00
itsmattkc 4906bb7d53 scopes: don't use shared context 
OpenGL shared contexts (through Qt at least) seem to be buggy. Scopes have been
shifted to a non-shared approach as a result.
 2020-04-28 17:08:52 +10:00
itsmattkc d74d6a1542 nodes: implementing saving/loading node positions from project file 2020-04-28 03:43:35 +10:00
itsmattkc 3c01b14a14 palette: fixed disabled text color 2020-04-28 03:32:50 +10:00
itsmattkc b57d12868f nodeview: allow dropping a node on any edge 
Before we checked data types to ensure compatibility, but some nodes (e.g. the
math node) may be compatible despite a not apparently compatible data type.
We allow users to make any connection quickly this way.
 2020-04-28 03:20:08 +10:00