Scrolling waveform using SceneGraph in QML #13470

acolombier · 2024-07-14T13:24:35Z

This PR is a rebase of @m0dB's qml_scrolling_waveform on the latest main

The waveform rendering approach should provided better result in the long run and should integrate with the new allshader approach.

Currently, the waveform rendering logic which happen in QmlWaveformDisplay::updatePaintNode is duplicated (or rather strongly inspired) from the RGB allshader rendering. A "definition of ready" for this PR would be to have some kind of compatibility layer/integration to reuse the rendering logic define in allshader and should support at least one waveform type logic (e.g RGB)

Depends on #13599

github-actions · 2024-10-13T00:10:19Z

This PR is marked as stale because it has been open 90 days with no activity.

acolombier · 2024-10-16T22:36:00Z

Note that this is still being actively worked on with @m0dB and myself!

…Node for end of track

…and material for mixxx and rendergraph examples

…he opengl or the scenegraph backend.

un-name unused argument Co-authored-by: Swiftb0y <[email protected]>

Co-authored-by: Daniel Schürmann <[email protected]>

Co-authored-by: Swiftb0y <[email protected]>

…re clear transfer of waveformrendermarknode

Holzhaus · 2024-11-24T19:26:39Z

I see this when trying to build it:

CMake Error at /usr/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:2138 (get_target_property):
  get_target_property() called with non-existent target "rendergraph_sg".
Call Stack (most recent call first):
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:103 (_qt_internal_expose_source_file_to_ide)
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:354 (_qt_internal_add_shaders_impl)
  res/shaders/rendergraph/CMakeLists.txt:16 (qt6_add_shaders)


endoftrack.frag -> endoftrack.frag.qsb exposed as :/shaders/rendergraph/endoftrack.frag.qsb
CMake Error at /usr/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:2138 (get_target_property):
  get_target_property() called with non-existent target "rendergraph_sg".
Call Stack (most recent call first):
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:103 (_qt_internal_expose_source_file_to_ide)
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:354 (_qt_internal_add_shaders_impl)
  res/shaders/rendergraph/CMakeLists.txt:16 (qt6_add_shaders)


endoftrack.vert -> endoftrack.vert.qsb exposed as :/shaders/rendergraph/endoftrack.vert.qsb
CMake Error at /usr/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:2138 (get_target_property):
  get_target_property() called with non-existent target "rendergraph_sg".
Call Stack (most recent call first):
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:103 (_qt_internal_expose_source_file_to_ide)
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:354 (_qt_internal_add_shaders_impl)
  res/shaders/rendergraph/CMakeLists.txt:16 (qt6_add_shaders)


pattern.frag -> pattern.frag.qsb exposed as :/shaders/rendergraph/pattern.frag.qsb
CMake Error at /usr/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:2138 (get_target_property):
  get_target_property() called with non-existent target "rendergraph_sg".
Call Stack (most recent call first):
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:103 (_qt_internal_expose_source_file_to_ide)
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:354 (_qt_internal_add_shaders_impl)
  res/shaders/rendergraph/CMakeLists.txt:16 (qt6_add_shaders)


pattern.vert -> pattern.vert.qsb exposed as :/shaders/rendergraph/pattern.vert.qsb
CMake Error at /usr/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:2138 (get_target_property):
  get_target_property() called with non-existent target "rendergraph_sg".
Call Stack (most recent call first):
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:103 (_qt_internal_expose_source_file_to_ide)
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:354 (_qt_internal_add_shaders_impl)
  res/shaders/rendergraph/CMakeLists.txt:16 (qt6_add_shaders)


rgb.frag -> rgb.frag.qsb exposed as :/shaders/rendergraph/rgb.frag.qsb
CMake Error at /usr/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:2138 (get_target_property):
  get_target_property() called with non-existent target "rendergraph_sg".
Call Stack (most recent call first):
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:103 (_qt_internal_expose_source_file_to_ide)
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:354 (_qt_internal_add_shaders_impl)
  res/shaders/rendergraph/CMakeLists.txt:16 (qt6_add_shaders)


rgb.vert -> rgb.vert.qsb exposed as :/shaders/rendergraph/rgb.vert.qsb
CMake Error at /usr/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:2138 (get_target_property):
  get_target_property() called with non-existent target "rendergraph_sg".
Call Stack (most recent call first):
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:103 (_qt_internal_expose_source_file_to_ide)
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:354 (_qt_internal_add_shaders_impl)
  res/shaders/rendergraph/CMakeLists.txt:16 (qt6_add_shaders)


rgba.frag -> rgba.frag.qsb exposed as :/shaders/rendergraph/rgba.frag.qsb
CMake Error at /usr/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:2138 (get_target_property):
  get_target_property() called with non-existent target "rendergraph_sg".
Call Stack (most recent call first):
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:103 (_qt_internal_expose_source_file_to_ide)
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:354 (_qt_internal_add_shaders_impl)
  res/shaders/rendergraph/CMakeLists.txt:16 (qt6_add_shaders)


rgba.vert -> rgba.vert.qsb exposed as :/shaders/rendergraph/rgba.vert.qsb
CMake Error at /usr/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:2138 (get_target_property):
  get_target_property() called with non-existent target "rendergraph_sg".
Call Stack (most recent call first):
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:103 (_qt_internal_expose_source_file_to_ide)
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:354 (_qt_internal_add_shaders_impl)
  res/shaders/rendergraph/CMakeLists.txt:16 (qt6_add_shaders)


texture.frag -> texture.frag.qsb exposed as :/shaders/rendergraph/texture.frag.qsb
CMake Error at /usr/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:2138 (get_target_property):
  get_target_property() called with non-existent target "rendergraph_sg".
Call Stack (most recent call first):
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:103 (_qt_internal_expose_source_file_to_ide)
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:354 (_qt_internal_add_shaders_impl)
  res/shaders/rendergraph/CMakeLists.txt:16 (qt6_add_shaders)


texture.vert -> texture.vert.qsb exposed as :/shaders/rendergraph/texture.vert.qsb
CMake Error at /usr/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:2138 (get_target_property):
  get_target_property() called with non-existent target "rendergraph_sg".
Call Stack (most recent call first):
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:103 (_qt_internal_expose_source_file_to_ide)
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:354 (_qt_internal_add_shaders_impl)
  res/shaders/rendergraph/CMakeLists.txt:16 (qt6_add_shaders)


unicolor.frag -> unicolor.frag.qsb exposed as :/shaders/rendergraph/unicolor.frag.qsb
CMake Error at /usr/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:2138 (get_target_property):
  get_target_property() called with non-existent target "rendergraph_sg".
Call Stack (most recent call first):
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:103 (_qt_internal_expose_source_file_to_ide)
  /usr/lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake:354 (_qt_internal_add_shaders_impl)
  res/shaders/rendergraph/CMakeLists.txt:16 (qt6_add_shaders)


unicolor.vert -> unicolor.vert.qsb exposed as :/shaders/rendergraph/unicolor.vert.qsb
endoftrack.frag -> endoftrack.frag.qsb exposed as :/shaders/rendergraph/endoftrack.frag.qsb
endoftrack.vert -> endoftrack.vert.qsb exposed as :/shaders/rendergraph/endoftrack.vert.qsb
pattern.frag -> pattern.frag.qsb exposed as :/shaders/rendergraph/pattern.frag.qsb
pattern.vert -> pattern.vert.qsb exposed as :/shaders/rendergraph/pattern.vert.qsb
rgb.frag -> rgb.frag.qsb exposed as :/shaders/rendergraph/rgb.frag.qsb
rgb.vert -> rgb.vert.qsb exposed as :/shaders/rendergraph/rgb.vert.qsb
rgba.frag -> rgba.frag.qsb exposed as :/shaders/rendergraph/rgba.frag.qsb
rgba.vert -> rgba.vert.qsb exposed as :/shaders/rendergraph/rgba.vert.qsb
texture.frag -> texture.frag.qsb exposed as :/shaders/rendergraph/texture.frag.qsb
texture.vert -> texture.vert.qsb exposed as :/shaders/rendergraph/texture.vert.qsb
unicolor.frag -> unicolor.frag.qsb exposed as :/shaders/rendergraph/unicolor.frag.qsb
unicolor.vert -> unicolor.vert.qsb exposed as :/shaders/rendergraph/unicolor.vert.qsb
-- Adding gl shaders to rendergraph_gl
-- Configuring incomplete, errors occurred!
make: *** [Makefile:25705: cmake_check_build_system] Error 1

Move back local classes in the private namespace

github-actions bot added ui build waveform qml labels Jul 14, 2024

acolombier changed the title ~~scrolling qml waveformdisplay working~~ Scrolling waveform using SceneGraph in QML Jul 14, 2024

github-actions bot added stale Stale issues that haven't been updated for a long time. and removed stale Stale issues that haven't been updated for a long time. labels Oct 13, 2024

m0dB and others added 21 commits October 19, 2024 04:17

using rendergraph for allshader waveforms, with rendergraph::Geometry…

280fcf7

…Node for end of track

waveformrenderbeat with rendergraph, various fixes, use same shaders …

d3a69bb

…and material for mixxx and rendergraph examples

preroll/postroll using rendergraph

c2fffea

node iterator, fixed examples

4ad583c

fix teardown order

1dc16a5

mark range with dynamic nodes

8014163

make linked list handling part of rendergraph::Node

9a01213

towards digits renderer as node

9eb2938

draw playpos with rendergraph

1e4d04b

reuse materialshaders

058f5ec

keep track of material that modified the shader uniforms, fix scenegraph

8032b38

digitsrenderer with rendergraph

3dcf907

draw marks with rendergraph

507a465

removed pimpl from rendergraph opengl

a0df59e

removed pimpl from rendergraph scenegraph

18fa2c4

cleanup and moved common rendergraph files to common/rendergraph

1967817

remove nodebase, use encapsulation for scenegraph Node

88013d4

reorganized the code, with a public common API that is derived from t…

b8bcb19

…he opengl or the scenegraph backend.

Update src/rendergraph/common/rendergraph/material/patternmaterial.h

319ffb0

un-name unused argument Co-authored-by: Swiftb0y <[email protected]>

Update src/rendergraph/common/rendergraph/material/rgbamaterial.cpp

390dd0e

Co-authored-by: Daniel Schürmann <[email protected]>

Update res/shaders/rendergraph/unicolor.frag

afdc0ed

Co-authored-by: Swiftb0y <[email protected]>

acolombier force-pushed the feat/qml-scrolling-waveform-with-sg branch 2 times, most recently from d16b1dc to 23f331f Compare October 22, 2024 22:49

github-actions bot added the code quality label Oct 22, 2024

m0dB added 8 commits November 1, 2024 20:42

merge changes from acolombier, clear and set owned by parent flag, mo…

3c76b1b

…re clear transfer of waveformrendermarknode

missing file

2de8ded

typo

d12d463

various cleanup, acting on review

c2d6c44

improved attributeset from niko

8b25d13

cleanup and comments

a57b823

use std::erase

c7a3c7a

reduce delta with qml-rendergraph-fixes

f409455

acolombier force-pushed the feat/qml-scrolling-waveform-with-sg branch 2 times, most recently from fe570b1 to 3d9deed Compare November 9, 2024 20:50

acolombier force-pushed the feat/qml-scrolling-waveform-with-sg branch 4 times, most recently from 317256a to 8c71da3 Compare November 23, 2024 01:14

acolombier added 2 commits November 23, 2024 12:39

Move back local classes in the private namespace

709f8ca

Round texture coordinate to prevent glitch

42a53d1

m0dB and others added 7 commits November 30, 2024 17:26

Merge pull request mixxxdj#10 from acolombier/rendergraph-reduce-delta

51bf675

Move back local classes in the private namespace

minor changes to fix compilation

ebc1108

improve alignment of markers, avoid images that are half empty

b27ab9a

draw rounded to pixel

368776d

fix: prevent use-after-free with a texture buffer deepcopy

6aae89b

scrolling qml waveformdisplay working

72f0a0b

feat: add scrolling waveform in QML using scenegraph

a59fe88

acolombier force-pushed the feat/qml-scrolling-waveform-with-sg branch from 8c71da3 to a59fe88 Compare December 1, 2024 22:19

acolombier added 2 commits December 1, 2024 22:27

fixup! feat: add scrolling waveform in QML using scenegraph

ad11a74

fixup! feat: add scrolling waveform in QML using scenegraph

d424088

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Scrolling waveform using SceneGraph in QML #13470

Scrolling waveform using SceneGraph in QML #13470

acolombier commented Jul 14, 2024 •

edited

Loading

github-actions bot commented Oct 13, 2024

acolombier commented Oct 16, 2024

Holzhaus commented Nov 24, 2024

Scrolling waveform using SceneGraph in QML #13470

Are you sure you want to change the base?

Scrolling waveform using SceneGraph in QML #13470

Conversation

acolombier commented Jul 14, 2024 • edited Loading

github-actions bot commented Oct 13, 2024

acolombier commented Oct 16, 2024

Holzhaus commented Nov 24, 2024

acolombier commented Jul 14, 2024 •

edited

Loading