Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qopenglwindow-based replacement of qglwidget, full glsl shader based waveforms, vumeters and spinnies #10989

Merged
merged 122 commits into from
May 29, 2023

Commits on May 26, 2023

  1. replaced use of qglwidget with wglwidget, add qopengl renderers, qope…

    …ngl rgbwaveformwidget and qopengl wvumetergl and qopengl wspinny
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    8aef319 View commit details
    Browse the repository at this point in the history
  2. wspinny qopengl implementation as extension of standard wspinny with …

    …some ifdefs, instead of having a copy
    
    removed unneeded includes
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    3b1b5d1 View commit details
    Browse the repository at this point in the history
  3. wvumetergl qopengl implementation as extension of standard wvumetergl…

    … with some ifdefs, instead of having a copy
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    facaab9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    30d65eb View commit details
    Browse the repository at this point in the history
  5. use VERIFY_OR_DEBUG_ASSERT

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    b037a13 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b53d0a5 View commit details
    Browse the repository at this point in the history
  7. Update src/waveform/renderers/qopengl/waveformrendererendoftrack.cpp

    Co-authored-by: Daniel Schürmann <daschuer@mixxx.org>
    
    added comment
    
    Update src/waveform/renderers/qopengl/iwaveformrenderer.h
    
    Co-authored-by: Daniel Schürmann <daschuer@mixxx.org>
    m0dB and daschuer committed May 26, 2023
    Configuration menu
    Copy the full SHA
    3d4ed50 View commit details
    Browse the repository at this point in the history
  8. dont always return true from shouldRender, comments, minor changes (a…

    …cting on review comments from @daschuer)
    
    fix formatting
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    a536cc4 View commit details
    Browse the repository at this point in the history
  9. check if shaders are available for vumeter and spinny, else fall back…

    … to non-shader implementation
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    41e1f72 View commit details
    Browse the repository at this point in the history
  10. qopengl equivalent of querying opengl version and capabilities

    hide instead of delete
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    ca37ebe View commit details
    Browse the repository at this point in the history
  11. simplified class hierarchy by removing IWaveformWidget and add virtua…

    …l renderGL to qopengl WGLWidget
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    d79ee4a View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    80279cf View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    9e7213b View commit details
    Browse the repository at this point in the history
  14. propagate resizeGL to widget and renderers, resize markers in resizeG…

    …L (fixes playhead marker not being resized)
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    58120bc View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    a480188 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    9b2cb77 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    92bb195 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    8fed99c View commit details
    Browse the repository at this point in the history
  19. more strict use of float/double to be able to compile these files wit…

    …h -Wconversion with clang on macOS, hopefully solving compilation on ubuntu 22.04
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    eae49c7 View commit details
    Browse the repository at this point in the history
  20. removed const from static_cast

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    7541dd5 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    2dbaf56 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    fb6e90c View commit details
    Browse the repository at this point in the history
  23. support vertical orientation by rotating the matrix (and thus removed…

    … dual implementation for hor/ver)
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    ddeb54c View commit details
    Browse the repository at this point in the history
  24. missing include memory

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    18333b7 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    5029f5e View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    ffbd20b View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    dfbe712 View commit details
    Browse the repository at this point in the history
  28. fix crash of glvsynctestwidget

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    bffc84c View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    b5bc098 View commit details
    Browse the repository at this point in the history
  30. Update CMakeLists.txt

    Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>
    m0dB and Swiftb0y committed May 26, 2023
    Configuration menu
    Copy the full SHA
    2a4a27d View commit details
    Browse the repository at this point in the history
  31. assert samplerate is positive

    Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>
    m0dB and Swiftb0y committed May 26, 2023
    Configuration menu
    Copy the full SHA
    786ed1e View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    f28943d View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    4de1da5 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    a085b87 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    bfd4286 View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    7a0a95e View commit details
    Browse the repository at this point in the history
  37. qopengl filteredwaveformwidget

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    bee4fe4 View commit details
    Browse the repository at this point in the history
  38. correct reserve

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    9b70593 View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    6b1dcd2 View commit details
    Browse the repository at this point in the history
  40. Configuration menu
    Copy the full SHA
    beb30a0 View commit details
    Browse the repository at this point in the history
  41. Configuration menu
    Copy the full SHA
    9ba52cd View commit details
    Browse the repository at this point in the history
  42. Update README-QOpenGL.md

    Co-authored-by: Daniel Schürmann <daschuer@mixxx.org>
    m0dB and daschuer committed May 26, 2023
    Configuration menu
    Copy the full SHA
    d3bc7dd View commit details
    Browse the repository at this point in the history
  43. Update src/widget/tooltipqopengl.cpp

    Co-authored-by: Daniel Schürmann <daschuer@mixxx.org>
    m0dB and daschuer committed May 26, 2023
    Configuration menu
    Copy the full SHA
    1e51f63 View commit details
    Browse the repository at this point in the history
  44. Configuration menu
    Copy the full SHA
    80cdf32 View commit details
    Browse the repository at this point in the history
  45. add comment clarifying need for handleEventFromWindow and moved toolt…

    …ip handling to OpenGLWindow
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    2271ac6 View commit details
    Browse the repository at this point in the history
  46. Configuration menu
    Copy the full SHA
    52a9bdc View commit details
    Browse the repository at this point in the history
  47. Configuration menu
    Copy the full SHA
    e212e0d View commit details
    Browse the repository at this point in the history
  48. removed obsolete commented code

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    7a041c0 View commit details
    Browse the repository at this point in the history
  49. Update src/waveform/renderers/qopengl/waveformrendererendoftrack.cpp

    Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>
    m0dB and Swiftb0y committed May 26, 2023
    Configuration menu
    Copy the full SHA
    3218eb6 View commit details
    Browse the repository at this point in the history
  50. Configuration menu
    Copy the full SHA
    578e5f9 View commit details
    Browse the repository at this point in the history
  51. removed unneeded inline

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    88c9d1b View commit details
    Browse the repository at this point in the history
  52. minor api change

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    0f1901e View commit details
    Browse the repository at this point in the history
  53. improved comment

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    2ad4199 View commit details
    Browse the repository at this point in the history
  54. typp

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    1b49354 View commit details
    Browse the repository at this point in the history
  55. Configuration menu
    Copy the full SHA
    83b8719 View commit details
    Browse the repository at this point in the history
  56. Configuration menu
    Copy the full SHA
    9bd12df View commit details
    Browse the repository at this point in the history
  57. Configuration menu
    Copy the full SHA
    2b14751 View commit details
    Browse the repository at this point in the history
  58. Configuration menu
    Copy the full SHA
    99e87bd View commit details
    Browse the repository at this point in the history
  59. Configuration menu
    Copy the full SHA
    a87a7be View commit details
    Browse the repository at this point in the history
  60. Configuration menu
    Copy the full SHA
    2594742 View commit details
    Browse the repository at this point in the history
  61. Configuration menu
    Copy the full SHA
    326d4d3 View commit details
    Browse the repository at this point in the history
  62. Update src/waveform/renderers/qopengl/waveformrendererfiltered.cpp

    Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>
    m0dB and Swiftb0y committed May 26, 2023
    Configuration menu
    Copy the full SHA
    e31da64 View commit details
    Browse the repository at this point in the history
  63. Configuration menu
    Copy the full SHA
    9c725a3 View commit details
    Browse the repository at this point in the history
  64. added DEBUG_ASSERT(false)

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    864906e View commit details
    Browse the repository at this point in the history
  65. use encapsulation instead of inheritence of colordata and vertexdata,…

    … added final where appropriate and additional clean-ups.
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    4f6a056 View commit details
    Browse the repository at this point in the history
  66. Configuration menu
    Copy the full SHA
    fafa14f View commit details
    Browse the repository at this point in the history
  67. renamed calculatematrix to matrixforwidgetgeometry, removed unused wi…

    …dgetrendertimer and minor improvement in textureshader
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    1986780 View commit details
    Browse the repository at this point in the history
  68. Configuration menu
    Copy the full SHA
    fd82ed3 View commit details
    Browse the repository at this point in the history
  69. using QTimer instead of unique_ptr<QTimer>, several cleanups, particu…

    …larly spinny and vumeter, and did some renaming. fixed compilation for QOPENGL=OFF
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    e2f6ffa View commit details
    Browse the repository at this point in the history
  70. removed unused include

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    ec9e6a2 View commit details
    Browse the repository at this point in the history
  71. Configuration menu
    Copy the full SHA
    76032dd View commit details
    Browse the repository at this point in the history
  72. Configuration menu
    Copy the full SHA
    97285fe View commit details
    Browse the repository at this point in the history
  73. Configuration menu
    Copy the full SHA
    3729370 View commit details
    Browse the repository at this point in the history
  74. fix clazy error

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    4b28aaf View commit details
    Browse the repository at this point in the history
  75. removed unnecesary dtor

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    75d2554 View commit details
    Browse the repository at this point in the history
  76. Configuration menu
    Copy the full SHA
    10c266a View commit details
    Browse the repository at this point in the history
  77. ran precommit manually

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    05f6a46 View commit details
    Browse the repository at this point in the history
  78. moved qopengl/shaders

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    fac0bdc View commit details
    Browse the repository at this point in the history
  79. Configuration menu
    Copy the full SHA
    9114f54 View commit details
    Browse the repository at this point in the history
  80. Configuration menu
    Copy the full SHA
    09f21f7 View commit details
    Browse the repository at this point in the history
  81. Configuration menu
    Copy the full SHA
    51cd5c0 View commit details
    Browse the repository at this point in the history
  82. fix clazy

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    38f53ee View commit details
    Browse the repository at this point in the history
  83. fix typo

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    a5afde1 View commit details
    Browse the repository at this point in the history
  84. Configuration menu
    Copy the full SHA
    4f4909e View commit details
    Browse the repository at this point in the history
  85. use QApplication::sendEvent instead of handleWindowFromEvent. this is…

    … cleaner and solves the key events not reaching the event filter
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    e1509e4 View commit details
    Browse the repository at this point in the history
  86. Configuration menu
    Copy the full SHA
    a847b9b View commit details
    Browse the repository at this point in the history
  87. Configuration menu
    Copy the full SHA
    ae7fe08 View commit details
    Browse the repository at this point in the history
  88. Configuration menu
    Copy the full SHA
    4145abc View commit details
    Browse the repository at this point in the history
  89. Configuration menu
    Copy the full SHA
    41b692f View commit details
    Browse the repository at this point in the history
  90. Configuration menu
    Copy the full SHA
    ed84c8e View commit details
    Browse the repository at this point in the history
  91. Configuration menu
    Copy the full SHA
    e1ec6fb View commit details
    Browse the repository at this point in the history
  92. glwaveformrenderbackground replacement for waveformrenderbackground u…

    …sing glClear to clear waveform widget
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    33ec185 View commit details
    Browse the repository at this point in the history
  93. using glwaveformrendererbackground to draw background for legacy gl w…

    …aveform widgets (adapted solution from PR 11523)
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    8e90e2a View commit details
    Browse the repository at this point in the history
  94. moved folders and namespaces

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    a2a1c3c View commit details
    Browse the repository at this point in the history
  95. cleanup and formatting post rebase on 2.4, compile allshader widgets …

    …also with QGLWidget and use shader based vumeters and spinnys by default
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    8a47d05 View commit details
    Browse the repository at this point in the history
  96. fix pre-commit

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    16c05e6 View commit details
    Browse the repository at this point in the history
  97. simplified handling events from openglwindow, removed unneeded layer …

    …wglwaveformwidget, avoid infinite recursion with drag move and drag leave events
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    7c078ca View commit details
    Browse the repository at this point in the history
  98. removed unnecessary windowExposed, as we can rely on initializeGL to …

    …know when the context is available
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    968b279 View commit details
    Browse the repository at this point in the history
  99. use local var

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    c45043e View commit details
    Browse the repository at this point in the history
  100. Configuration menu
    Copy the full SHA
    61589ed View commit details
    Browse the repository at this point in the history
  101. Revert "set openglwindow event target to waveformviewer"

    This reverts commit 2b41420.
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    5c6c774 View commit details
    Browse the repository at this point in the history
  102. fixes post-rebase

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    b3f0ed8 View commit details
    Browse the repository at this point in the history
  103. Configuration menu
    Copy the full SHA
    18378e4 View commit details
    Browse the repository at this point in the history
  104. formatting

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    c4093c6 View commit details
    Browse the repository at this point in the history
  105. fixed bug in Paintable::toImage

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    6d033dd View commit details
    Browse the repository at this point in the history
  106. Configuration menu
    Copy the full SHA
    3111e6b View commit details
    Browse the repository at this point in the history
  107. Configuration menu
    Copy the full SHA
    e25f0f4 View commit details
    Browse the repository at this point in the history
  108. remove unnecessary includes

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    298033e View commit details
    Browse the repository at this point in the history
  109. use p prefix for pointers

    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    60132d5 View commit details
    Browse the repository at this point in the history
  110. call WGLWidget resizeGL with devicePixelRatio applied, to mimic QGLWi…

    …dget, use the argument to resizeGL when resizing the waveformrendermark
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    bf72f07 View commit details
    Browse the repository at this point in the history
  111. Configuration menu
    Copy the full SHA
    1631d50 View commit details
    Browse the repository at this point in the history
  112. removed spurious makeCurrentIfNeeded, postpone call to slotLoadTrack …

    …for initial player to setup, to avoid calling a virtual (indirectly) from the constructor
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    e10dab9 View commit details
    Browse the repository at this point in the history
  113. Configuration menu
    Copy the full SHA
    0fbf597 View commit details
    Browse the repository at this point in the history
  114. apply devicePixelRatio when scaling images to widget size (reducing c…

    …ode duplication with helper scaleToSize), regenerate the textures after the images have been resized
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    4ec3fba View commit details
    Browse the repository at this point in the history
  115. Configuration menu
    Copy the full SHA
    a606587 View commit details
    Browse the repository at this point in the history
  116. Configuration menu
    Copy the full SHA
    d01787c View commit details
    Browse the repository at this point in the history
  117. fix for style not being applied correctly to WWidgetGroup when the vi…

    …sible property has a binding which resulted in wrong sized children, e.g wspinny inside LateNights SpinnyCoverContainer_Small
    m0dB committed May 26, 2023
    Configuration menu
    Copy the full SHA
    63cdb15 View commit details
    Browse the repository at this point in the history
  118. Configuration menu
    Copy the full SHA
    27d9a79 View commit details
    Browse the repository at this point in the history
  119. Configuration menu
    Copy the full SHA
    67a59af View commit details
    Browse the repository at this point in the history

Commits on May 27, 2023

  1. clear WInitialGLWidget

    m0dB committed May 27, 2023
    Configuration menu
    Copy the full SHA
    63a626d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5a69bc3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    670d4dd View commit details
    Browse the repository at this point in the history