fix: ensure all Init() calls invoke base class methods for proper init

Author: revmischa

src/libprojectM/MilkdropPreset/CustomWaveform.hpp

@@ -25,19 +25,56 @@ class CustomWaveform : public libprojectM::Renderer::Backend::OpenGL::OpenGLRend
 
     void InitVertexAttrib() override;
 
+    /**
+     * @brief Loads the initial values and code from the preset file.
+     * @param parsedFile The file parser with the preset data.
+     * @param index The waveform index.
+     */
     void Initialize(::libprojectM::PresetFileParser& parsedFile, int index);
 
+    /**
+     * @brief Compiles all code blocks and runs the init expression.
+     * @throws MilkdropCompileException Thrown if one of the code blocks couldn't be compiled.
+     * @param presetPerFrameContext The per-frame context to retrieve the init Q vars from.
+     */
     void CompileCodeAndRunInitExpressions(const PerFrameContext& presetPerFrameContext);
 
+    /**
+     * @brief Renders the waveform.
+     * @param presetPerFrameContext The per-frame context to retrieve the init Q vars from.
+     */
     void Draw(const PerFrameContext& presetPerFrameContext);
 
 private:
+    /**
+     * @brief Initializes the per-frame context with the preset per-frame state.
+     * @param presetPerFrameContext The preset per-frame context to pull q vars from.
+     */
     void LoadPerFrameEvaluationVariables(const PerFrameContext& presetPerFrameContext);
 
+    /**
+     * @brief Loads the Q and T variables from the per-frame code into the per-point context.
+     */
     void InitPerPointEvaluationVariables();
 
+    /**
+     * @brief Loads the variables for each point into the per-point evaluation context.
+     * @param sample The sample index being rendered.
+     * @param value1 The left channel value.
+     * @param value2 The right channel value.
+     */
     void LoadPerPointEvaluationVariables(float sample, float value1, float value2);
 
+    /**
+     * @brief Does a better-than-linear smooth on a wave.
+     *
+     * Roughly doubles the number of points.
+     *
+     * @param inputVertices Array of input vertices to be smoothed.
+     * @param vertexCount Number of vertices in the input array.
+     * @param outputVertices Array to store the smoothed vertices.
+     * @return The number of vertices in the output array.
+     */
     static int SmoothWave(const ColoredPoint* inputVertices, int vertexCount, ColoredPoint* outputVertices);
 
     int m_index{0}; //!< Custom waveform index in the preset.

src/libprojectM/MilkdropPreset/FinalComposite.hpp

@@ -22,16 +22,36 @@ class FinalComposite : public libprojectM::Renderer::Backend::OpenGL::OpenGLRend
 
     void InitVertexAttrib() override;
 
+    /**
+     * @brief Loads the composite shader, if the preset uses one.
+     * @param presetState The preset state to retrieve the shader from.
+     */
     void LoadCompositeShader(const PresetState& presetState);
 
+    /**
+     * @brief Loads the required textures and compiles the composite shader.
+     * @param presetState The preset state to retrieve the configuration values from.
+     */
     void CompileCompositeShader(PresetState& presetState);
 
+    /**
+     * @brief Renders the composite quad with the appropriate effects or shaders.
+     * @param presetState The preset state to retrieve the configuration values from.
+     * @param presetPerFrameContext The per-frame context to retrieve the initial vars from.
+     */
     void Draw(const PresetState& presetState,
               const PerFrameContext& perFrameContext);
 
+    /**
+     * @brief Returns if the final composite is using a shader or classic filters.
+     * @return true if the final composite is done via a shader, false if not.
+     */
     auto HasCompositeShader() const -> bool;
 
 private:
+    /**
+     * Composite mesh vertex with all required attributes.
+     */
     struct MeshVertex {
         float x{}; //!< Vertex X coordinate.
         float y{}; //!< Vertex Y coordinate.
@@ -45,13 +65,24 @@ class FinalComposite : public libprojectM::Renderer::Backend::OpenGL::OpenGLRend
         float angle{};
     };
 
+    /**
+     * @brief Initializes the vertex array and fills in static data if needed.
+     *
+     * The vertices will only be reinitialized if the viewport size changed.
+     *
+     * @param presetState The preset state to retrieve the configuration values from.
+     */
     void InitializeMesh(const PresetState& presetState);
 
     static float SquishToCenter(float x, float exponent);
 
     static void UvToMathSpace(float aspectX, float aspectY,
                               float u, float v, float& rad, float& ang);
 
+    /**
+     * @brief Calculates the randomized, slowly changing diffuse colors.
+     * @param presetState The preset state to retrieve the configuration values from.
+     */
     void ApplyHueShaderColors(const PresetState& presetState);
 
     static constexpr int compositeGridWidth{32};

src/libprojectM/Renderer/Backend/OpenGL/OpenGLCopyTexture.hpp

@@ -22,7 +22,9 @@ class OpenGLCopyTexture : public CopyTexture, public OpenGLRenderItem
     // Mark override for clarity and to avoid hiding warnings
     void Init() override
     {
+        // Call both base class Init() to ensure proper initialization
         OpenGLRenderItem::Init();
+        CopyTexture::Init();
     }
 
     using OpenGLRenderItem::Init; // Unhide base Init() to avoid -Woverloaded-virtual warning

src/libprojectM/Renderer/Backend/OpenGL/OpenGLPresetTransition.hpp

@@ -24,7 +24,9 @@ class OpenGLPresetTransition : public PresetTransition, public OpenGLRenderItem
     // Mark override for clarity and to avoid hiding warnings
     void Init() override
     {
+        // Call both base class Init() to ensure proper initialization
         OpenGLRenderItem::Init();
+        PresetTransition::Init();
     }
 
     using OpenGLRenderItem::Init; // Unhide base Init() to avoid -Woverloaded-virtual warning

src/libprojectM/Renderer/Backend/OpenGL/OpenGLRenderItem.hpp

@@ -25,7 +25,8 @@ class OpenGLRenderItem : public ::libprojectM::Renderer::RenderItem
     void Init() override;
 
 protected:
-    using ::libprojectM::Renderer::RenderItem::Init; // Unhide base Init() to avoid -Woverloaded-virtual warning
+    // Unhide base Init() to avoid -Woverloaded-virtual warning and allow calling base from derived
+    using ::libprojectM::Renderer::RenderItem::Init;
     GLuint m_vboID{0};
     GLuint m_vaoID{0};
 };