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:

TODO:

Crash on shutdown
Waveform zoom init
Something is wrong with the clipping
Something is wrong with the stem waveform

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!

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

Holzhaus · 2025-01-17T21:14:52Z

Unfortunately, there are merge conflicts now.

Holzhaus · 2025-01-17T21:24:15Z

FYI, the PR is still broken :(

CMake Error at /usr/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:2127 (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:2127 (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:2127 (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:2127 (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:2127 (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:2127 (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:2127 (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:2127 (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:2127 (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:2127 (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:2127 (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:2127 (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)

acolombier · 2025-01-19T02:37:54Z

@Holzhaus this should now be ready for some very early testing!

JoergAtGithub · 2025-01-19T23:50:30Z

@m0dB @acolombier I wonder if a clearer seperation between QML and QtQuick would be of benefit here, as we could use a QQuickWindow instead of the QOpenGLWindow in the existing QWidget GUI: https://doc.qt.io/qt-6/qtquick-embeddedinwidgets-example.html
Wouldn't this provide us the use of native graphic APIs, instead of OpenGL - for all builds with recent Qt? And we are just in the process to update the VCPKG buildenv for macOS and Windows builds to Qt6.8.1.

Holzhaus · 2025-01-20T23:18:30Z

Hi, configuring works now. I'm getting the following build error though:

[ 25%] Building CXX object CMakeFiles/mixxx-qml-lib.dir/src/qml/qmlstemsmodel.cpp.o
In file included from src/rendergraph/scenegraph/../common/rendergraph/assert.h:4,
                 from src/rendergraph/scenegraph/../common/rendergraph/material.h:6,
                 from src/rendergraph/scenegraph/../common/rendergraph/geometrynode.h:5,
                 from src/waveform/renderers/allshader/waveformrendermark.h:5,
                 from src/waveform/renderers/allshader/waveformrendermark.cpp:1:
src/waveform/renderers/allshader/waveformrendermark.cpp: In member function ‘void {anonymous}::WaveformMarkNode::update(float, float, float)’:
src/waveform/renderers/allshader/waveformrendermark.cpp:50:35: error: ‘RoundToPixel’ was not declared in this scope
   50 |         DEBUG_ASSERT(std::abs(x - RoundToPixel(devicePixelRatio)(x)) < epsilon);
      |                                   ^~~~~~~~~~~~
src/rendergraph/scenegraph/../common/rendergraph/../../../util/assert.h:59:32: note: in definition of macro ‘DEBUG_ASSERT’
   59 |         if (!static_cast<bool>(cond)) [[unlikely]] {                        \
      |                                ^~~~
src/waveform/renderers/allshader/waveformrendermark.cpp:51:35: error: ‘RoundToPixel’ was not declared in this scope
   51 |         DEBUG_ASSERT(std::abs(y - RoundToPixel(devicePixelRatio)(y)) < epsilon);
      |                                   ^~~~~~~~~~~~
src/rendergraph/scenegraph/../common/rendergraph/../../../util/assert.h:59:32: note: in definition of macro ‘DEBUG_ASSERT’
   59 |         if (!static_cast<bool>(cond)) [[unlikely]] {                        \
      |                                ^~~~
make[2]: *** [CMakeFiles/mixxx-qml-lib.dir/build.make:666: CMakeFiles/mixxx-qml-lib.dir/src/waveform/renderers/allshader/waveformrendermark.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [CMakeFiles/Makefile2:803: CMakeFiles/mixxx-qml-lib.dir/all] Error 2
make: *** [Makefile:166: all] Error 2

m0dB · 2025-01-21T13:13:57Z

I fixed this in the rg-wr-… PR, so if @acolombier merges the latest commits of my branches it will be fixed here too.

Swiftb0y

couple high level thoughts

src/mixxxmainwindow.cpp

src/rendergraph/scenegraph/backend/baseattributeset.cpp

src/waveform/renderers/allshader/waveformrenderbeat.h

src/waveform/renderers/allshader/waveformrendererstem.cpp

src/waveform/renderers/waveformmarkset.h

Holzhaus · 2025-02-25T18:38:39Z

Thanks, looks and works great. 🎉

Once we get this PR in, the only big remaining issue with the QML interface is the library IMHO.

acolombier · 2025-02-25T23:05:21Z

Glad you like it! Most of the credit goes to @m0dB tho

Agreed on the library, and the settings, as well as a good revamp of the deck controls, but I'm on it! :D (cf Zulip)

acolombier · 2025-02-25T23:46:34Z

Addressed the last comments and squashed the fixups - ready to go 🚀

acolombier · 2025-03-01T18:45:34Z

@mixxxdj/developers merge?

Swiftb0y

Did another sanity check. Most of the comments are nits, though the missing initialization and the endOfTrackWarning need some discussion.

src/waveform/renderers/allshader/waveformrendermark.cpp

src/qml/qmlwaveformrenderer.cpp

src/waveform/renderers/allshader/waveformrendererendoftrack.cpp

src/waveform/renderers/allshader/waveformrendererendoftrack.h

src/waveform/renderers/allshader/waveformrendererstem.cpp

src/waveform/renderers/allshader/waveformrendererstem.h

src/waveform/renderers/waveformmark.cpp

src/waveform/renderers/waveformmarkrange.cpp

Swiftb0y

LGTM. Thank you.

src/waveform/renderers/waveformmarkrange.cpp

acolombier · 2025-03-05T23:10:38Z

Thanks @Swiftb0y - all squashed and ready to go now!

Holzhaus · 2025-03-05T23:16:32Z

There are still a bunch of fixup commits

acolombier · 2025-03-05T23:22:24Z

Indeed, I didn't notice that the push failed for some unrelated git hooks checks. We should be good to go now!

Swiftb0y · 2025-03-06T12:15:08Z

Thank you for pushing for yet another milestone.

PPN-SD · 2025-03-06T14:04:44Z

CMakeLists.txt

 target_link_libraries(mixxx-lib PUBLIC rendergraph_gl)
 target_compile_definitions(mixxx-lib PUBLIC rendergraph=rendergraph_gl)
+target_compile_definitions(mixxx-lib PRIVATE allshader=allshader_gl)
+target_compile_definitions(mixxx-test PRIVATE allshader=allshader_gl)


missing if(BUILD_TESTING)/endif()

CMake Error at CMakeLists.txt:4727 (target_compile_definitions): Cannot specify compile definitions for target "mixxx-test" which is not built by this project.

Is there a CI run for this or how does this happen?

checked with live ebuild from gentoo. But I think integrating base/test and SHARED_LIBS (#14021 (comment)) into CI could be advantageous.

@acolombier is it feasible for you to look into this?

I'll check that when I can - how can I reproduce this?

it fails when building mixxx target only. adding if(BUILD_TESTING) as other occurences of mixxx-test target resolves this.

how can I reproduce this?

BUILD_TESTING=OFF

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

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

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

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 force-pushed the feat/qml-scrolling-waveform-with-sg branch from 8c71da3 to a59fe88 Compare December 1, 2024 22:19

acolombier force-pushed the feat/qml-scrolling-waveform-with-sg branch from d424088 to 141a5e2 Compare January 19, 2025 02:30

acolombier mentioned this pull request Jan 19, 2025

S4 Mk3 screen support #13653

Open

3 tasks

acolombier force-pushed the feat/qml-scrolling-waveform-with-sg branch from bb5c4f8 to 7e39d2f Compare February 2, 2025 23:13

Swiftb0y reviewed Feb 25, 2025

View reviewed changes

acolombier mentioned this pull request Feb 25, 2025

Scenegraph implementation of the rendergraph appears to have a geometry verticies upper limit #14407

Open

Swiftb0y reviewed Feb 25, 2025

View reviewed changes

src/waveform/renderers/waveformmarkset.h Outdated Show resolved Hide resolved

acolombier force-pushed the feat/qml-scrolling-waveform-with-sg branch 2 times, most recently from a0a4752 to 716d06b Compare February 25, 2025 23:45

acolombier force-pushed the feat/qml-scrolling-waveform-with-sg branch from 716d06b to 8200753 Compare February 26, 2025 18:56

Swiftb0y reviewed Mar 1, 2025

View reviewed changes

Swiftb0y approved these changes Mar 5, 2025

View reviewed changes

src/waveform/renderers/waveformmarkrange.cpp Outdated Show resolved Hide resolved

acolombier added 9 commits March 5, 2025 23:08

feat: add scrolling waveform in QML using scenegraph

917671b

fix: support for different output of QSB for rendergraph shader script

f7dbdd0

fix: reduce stem waveform precison on SG

6a5ccb0

feat: add stem waveform split track mode

2e8cfdc

fix: allow renderer to be unsupported without asserts

38dd3b0

chore: publish logs on failed build packing

63ed6b6

chore: enable QML build on Win and MacOS

ce0cb72

chore: disable broken shader optimisation

6adc7d2

fix: remove DLL duplication for QtQuickControl

7524344

acolombier force-pushed the feat/qml-scrolling-waveform-with-sg branch from ed1712f to 7524344 Compare March 5, 2025 23:21

Swiftb0y merged commit 33192db into mixxxdj:main Mar 6, 2025
13 checks passed

acolombier deleted the feat/qml-scrolling-waveform-with-sg branch March 6, 2025 13:10

PPN-SD reviewed Mar 6, 2025

View reviewed changes

acolombier mentioned this pull request Mar 10, 2025

fix: don't add rendergraph to test if disabled #14461

Merged

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

Holzhaus commented Jan 17, 2025

Holzhaus commented Jan 17, 2025

acolombier commented Jan 19, 2025

JoergAtGithub commented Jan 19, 2025

Holzhaus commented Jan 20, 2025 •

edited

Loading

m0dB commented Jan 21, 2025

Swiftb0y left a comment

Holzhaus commented Feb 25, 2025

acolombier commented Feb 25, 2025

acolombier commented Feb 25, 2025 •

edited

Loading

acolombier commented Mar 1, 2025

Swiftb0y left a comment

Swiftb0y left a comment

acolombier commented Mar 5, 2025

Holzhaus commented Mar 5, 2025 •

edited

Loading

acolombier commented Mar 5, 2025

Swiftb0y commented Mar 6, 2025

PPN-SD Mar 6, 2025

Swiftb0y Mar 6, 2025

PPN-SD Mar 6, 2025 •

edited

Loading

Swiftb0y Mar 6, 2025

acolombier Mar 6, 2025

PPN-SD Mar 6, 2025

PPN-SD Mar 6, 2025

Scrolling waveform using SceneGraph in QML #13470

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

Holzhaus commented Jan 17, 2025

Holzhaus commented Jan 17, 2025

acolombier commented Jan 19, 2025

JoergAtGithub commented Jan 19, 2025

Holzhaus commented Jan 20, 2025 • edited Loading

m0dB commented Jan 21, 2025

Swiftb0y left a comment

Choose a reason for hiding this comment

Holzhaus commented Feb 25, 2025

acolombier commented Feb 25, 2025

acolombier commented Feb 25, 2025 • edited Loading

acolombier commented Mar 1, 2025

Swiftb0y left a comment

Choose a reason for hiding this comment

Swiftb0y left a comment

Choose a reason for hiding this comment

acolombier commented Mar 5, 2025

Holzhaus commented Mar 5, 2025 • edited Loading

acolombier commented Mar 5, 2025

Swiftb0y commented Mar 6, 2025

PPN-SD Mar 6, 2025

Choose a reason for hiding this comment

Swiftb0y Mar 6, 2025

Choose a reason for hiding this comment

PPN-SD Mar 6, 2025 • edited Loading

Choose a reason for hiding this comment

Swiftb0y Mar 6, 2025

Choose a reason for hiding this comment

acolombier Mar 6, 2025

Choose a reason for hiding this comment

PPN-SD Mar 6, 2025

Choose a reason for hiding this comment

PPN-SD Mar 6, 2025

Choose a reason for hiding this comment

acolombier commented Jul 14, 2024 •

edited

Loading

Holzhaus commented Jan 20, 2025 •

edited

Loading

acolombier commented Feb 25, 2025 •

edited

Loading

Holzhaus commented Mar 5, 2025 •

edited

Loading

PPN-SD Mar 6, 2025 •

edited

Loading