From 33523ffe6316095f9d8eb0ee6dff920fe340b139 Mon Sep 17 00:00:00 2001 From: Kai Blaschke Date: Mon, 6 Jun 2022 17:27:54 +0200 Subject: [PATCH] Class Renderer: Made internally used member private, removed a few unused members. --- src/libprojectM/KeyHandler.cpp | 10 --- src/libprojectM/Renderer/Renderer.cpp | 2 - src/libprojectM/Renderer/Renderer.hpp | 125 +++++++++++++------------- 3 files changed, 61 insertions(+), 76 deletions(-) diff --git a/src/libprojectM/KeyHandler.cpp b/src/libprojectM/KeyHandler.cpp index 2c15c7651..81dadb1c9 100755 --- a/src/libprojectM/KeyHandler.cpp +++ b/src/libprojectM/KeyHandler.cpp @@ -187,14 +187,6 @@ void ProjectM::DefaultKeyHandler(projectMEvent event, projectMKeycode keycode) { case PROJECTM_K_F2: m_renderer->showtitle = !m_renderer->showtitle; break; -#ifndef MACOS - case PROJECTM_K_F9: -#else - case PROJECTM_K_F8: -#endif - - m_renderer->studio = !m_renderer->studio; - break; case PROJECTM_K_ESCAPE: { m_renderer->showsearch = false; // hide input menu @@ -258,8 +250,6 @@ void ProjectM::DefaultKeyHandler(projectMEvent event, projectMKeycode keycode) { if (TextInputActive(true)) break; // disable when searching. SetPresetLocked(!PresetLocked()); break; - case PROJECTM_K_s: - m_renderer->studio = !m_renderer->studio; case PROJECTM_K_i: break; case PROJECTM_K_d: // d stands for write DEBUG output. diff --git a/src/libprojectM/Renderer/Renderer.cpp b/src/libprojectM/Renderer/Renderer.cpp index 5e35b7a3f..122475ad2 100644 --- a/src/libprojectM/Renderer/Renderer.cpp +++ b/src/libprojectM/Renderer/Renderer.cpp @@ -584,7 +584,6 @@ void Renderer::touch(float x, float y, int pressure, int type = 0) touchx = x; touchy = y; - touchp = pressure; // Randomly select colours on touch touchr = ((double)rand() / (RAND_MAX)); @@ -630,7 +629,6 @@ void Renderer::touchDrag(float x, float y, int pressure) waveformList[i].y = y; } } - touchp = pressure; } // Remove waveform at X Y diff --git a/src/libprojectM/Renderer/Renderer.hpp b/src/libprojectM/Renderer/Renderer.hpp index b3860408b..136c3aa3d 100644 --- a/src/libprojectM/Renderer/Renderer.hpp +++ b/src/libprojectM/Renderer/Renderer.hpp @@ -48,76 +48,12 @@ class Renderer { public: - /* touchx(float) x for touch waveform to start displaying(scale of 0 - 1 and not the exact coordinates) - touchy(float) y for touch waveform to start displaying(scale of 0 - 1 and not the exact coordinates) - touchp(int) touch pressure - @TODO not implemented yet! - touchtype(int) Waveform type (bias to Circle). 1 = Circle; 2 = RadialBlob; 3 = Blob2; 4 = Blob 3; 5 = DerivativeLine; 6 = Blob5; 7 = Line; 8 DoubleLine; - touchr(double) Red - touchb(double) Blue - touchg(double) Green - toucha(double) Alpha - */ - float touchx{ 0.0 }; - float touchy{ 0.0 }; - int touchp{ 0 }; // Touch Pressure. - int touchtype{ 0 }; // Touch Type - double touchr{ 0.0 }; - double touchg{ 0.0 }; - double touchb{ 0.0 }; - double toucha{ 0.0 }; - - bool showtoast{ false }; - bool showfps{ false }; - bool showtitle{ false }; - bool showpreset{ false }; - bool showhelp{ false }; - bool showsearch{ false }; - bool showmenu{ false }; - bool showstats{ false }; - - bool shuffletrack{ false }; - - bool studio{ false }; - bool correction{ true }; - - bool noSwitch{ false }; - bool writeNextFrameToFile; - struct preset { int id; std::string name; std::string presetPack; }; - - milliseconds lastTimeFPS{ nowMilliseconds() }; - milliseconds currentTimeFPS{ nowMilliseconds() }; - - milliseconds lastTimeToast{ nowMilliseconds() }; - milliseconds currentTimeToast{ nowMilliseconds() }; - - std::string m_helpText; - - std::vector waveformList; - - int totalframes{ 1 }; - float realfps{ 0.0 }; - - std::string title; - int m_activePresetID{ 0 }; - std::vector m_presetList; - - int drawtitle{ 0 }; - int texsizeX{ 0 }; - int texsizeY{ 0 }; - int textMenuPageSize{ 10 }; - int textMenuLineHeight{ 25 }; - int textMenuYOffset{ 60 }; - float m_fAspectX{ 1.0 }; - float m_fAspectY{ 1.0 }; - float m_fInvAspectX{ 1.0 }; - float m_fInvAspectY{ 1.0 }; - Renderer() = delete; Renderer(int width, int height, int gx, int gy, BeatDetect *_beatDetect, std::string presetURL, std::string title_fontURL, std::string menu_fontURL, const std::string& datadir = ""); ~Renderer(); @@ -188,6 +124,34 @@ public: void UpdateContext(PipelineContext& context); + bool showfps{ false }; + bool showtitle{ false }; + bool showpreset{ false }; + bool showhelp{ false }; + bool showsearch{ false }; + bool showmenu{ false }; + bool showstats{ false }; + + bool shuffletrack{ false }; + + bool correction{ true }; + + bool noSwitch{ false }; + bool writeNextFrameToFile; + + milliseconds lastTimeFPS{ nowMilliseconds() }; + milliseconds currentTimeFPS{ nowMilliseconds() }; + + int totalframes{ 1 }; + float realfps{ 0.0 }; + + std::string title; + int m_activePresetID{ 0 }; + std::vector m_presetList; + + int drawtitle{ 0 }; + int textMenuPageSize{ 10 }; + private: PerPixelMesh mesh; @@ -277,6 +241,39 @@ int nearestPower2( int value ); composite_shader_vertex m_comp_verts[FCGSX*FCGSY]; int m_comp_indices[(FCGSX-2)*(FCGSY-2)*6]; + /* touchx(float) x for touch waveform to start displaying(scale of 0 - 1 and not the exact coordinates) + touchy(float) y for touch waveform to start displaying(scale of 0 - 1 and not the exact coordinates) + touchr(double) Red + touchb(double) Blue + touchg(double) Green + toucha(double) Alpha + */ + float touchx{ 0.0 }; + float touchy{ 0.0 }; + double touchr{ 0.0 }; + double touchg{ 0.0 }; + double touchb{ 0.0 }; + double toucha{ 0.0 }; + + bool showtoast{ false }; + + milliseconds lastTimeToast{ nowMilliseconds() }; + milliseconds currentTimeToast{ nowMilliseconds() }; + + std::string m_helpText; + + std::vector waveformList; + + int texsizeX{ 0 }; + int texsizeY{ 0 }; + + int textMenuLineHeight{ 25 }; + const int textMenuYOffset{ 60 }; + + float m_fAspectX{ 1.0 }; + float m_fAspectY{ 1.0 }; + float m_fInvAspectX{ 1.0 }; + float m_fInvAspectY{ 1.0 }; }; #endif