Use Mesh class in PresetTransition class

Author: kblaschke

src/libprojectM/Renderer/PresetTransition.cpp

@@ -13,26 +13,24 @@ namespace Renderer {
 constexpr double PI = 3.14159265358979323846;
 
 PresetTransition::PresetTransition(const std::shared_ptr<Shader>& transitionShader, double durationSeconds, double transitionStartTime)
-    : m_transitionShader(transitionShader)
+    : m_mesh(VertexBufferUsage::StaticDraw)
+    , m_transitionShader(transitionShader)
     , m_durationSeconds(durationSeconds)
     , m_transitionStartTime(transitionStartTime)
 {
-    std::mt19937 rand32(m_randomDevice());
-    m_staticRandomValues = {rand32(), rand32(), rand32(), rand32()};
+    m_mesh.SetRenderPrimitiveType(Mesh::PrimitiveType::TriangleStrip);
 
-    RenderItem::Init();
-}
+    m_mesh.Vertices().Set({{-1.0f, 1.0f},
+                           {1.0f, 1.0f},
+                           {-1.0f, -1.0f},
+                           {1.0f, -1.0f}});
 
-void PresetTransition::InitVertexAttrib()
-{
-    static const std::array<RenderItem::Point, 4> points{{{-1.0f, 1.0f},
-                                                          {1.0f, 1.0f},
-                                                          {-1.0f, -1.0f},
-                                                          {1.0f, -1.0f}}};
-
-    glEnableVertexAttribArray(0);
-    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(Point), reinterpret_cast<void*>(offsetof(Point, x))); // Position
-    glBufferData(GL_ARRAY_BUFFER, sizeof(points), points.data(), GL_STATIC_DRAW);
+    m_mesh.Indices().Set({0, 1, 2, 3});
+
+    m_mesh.Update();
+
+    std::mt19937 rand32(m_randomDevice());
+    m_staticRandomValues = {rand32(), rand32(), rand32(), rand32()};
 }
 
 auto PresetTransition::IsDone(double currentFrameTime) const -> bool
@@ -120,9 +118,7 @@ void PresetTransition::Draw(const Preset& oldPreset,
     }
 
     // Render the transition quad
-    glBindVertexArray(m_vaoID);
-    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-    glBindVertexArray(0);
+    m_mesh.Draw();
 
     // Clean up
     oldPreset.OutputTexture()->Unbind(0);
@@ -133,6 +129,7 @@ void PresetTransition::Draw(const Preset& oldPreset,
         noiseDescriptors[i - 2].Unbind(textureUnit);
     }
 
+    Mesh::Unbind();
     Shader::Unbind();
 
     // Update last frame time.

src/libprojectM/Renderer/PresetTransition.hpp

@@ -1,8 +1,7 @@
 #pragma once
 
-#include "Renderer/RenderItem.hpp"
+#include "Renderer/Mesh.hpp"
 #include "Renderer/Shader.hpp"
-#include "Renderer/TextureSamplerDescriptor.hpp"
 
 #include <Preset.hpp>
 
@@ -16,7 +15,7 @@ namespace Renderer {
 /**
  * @brief Implements the shader and rendering logic to blend two presets into each other.
  */
-class PresetTransition : public RenderItem
+class PresetTransition
 {
 public:
     PresetTransition() = delete;
@@ -31,8 +30,6 @@ class PresetTransition : public RenderItem
                               double durationSeconds,
                               double transitionStartTime);
 
-    void InitVertexAttrib() override;
-
     /**
      * @brief Returns true if the transition is done.
      * @param currentFrameTime The time in seconds since start of the current frame.
@@ -58,7 +55,7 @@ class PresetTransition : public RenderItem
     void Draw(const Preset& oldPreset,
               const Preset& newPreset,
               const RenderContext& context,
-              const libprojectM::Audio::FrameAudioData& audioData,
+              const Audio::FrameAudioData& audioData,
               double currentFrameTime);
 
 private:
@@ -73,6 +70,7 @@ class PresetTransition : public RenderItem
                                                  "noisevol_hq",
                                                  "pw_noisevol_hq"}; //!< Names of noise textures to retrieve from TextureManager.
 
+    Mesh m_mesh;                                                                                      //!< The mesh used to draw the transition effect.
     std::shared_ptr<Shader> m_transitionShader;                                                       //!< The compiled shader used for this transition.
     std::shared_ptr<Sampler> m_presetSampler{std::make_shared<Sampler>(GL_CLAMP_TO_EDGE, GL_LINEAR)}; //!< Sampler for preset textures. Uses bilinear interpolation and no repeat.