- save
This commit is contained in:
parent
ac22ea5e75
commit
a27c62f062
49 changed files with 1171 additions and 385 deletions
|
|
@ -7,56 +7,56 @@
|
|||
#include "../../../Core/Config.h"
|
||||
#include "../../../Fonts/Fonts.h"
|
||||
|
||||
SidebarLCD::SidebarLCD (const std::string& process_id) : BaseComponent (process_id)
|
||||
SidebarLCD::SidebarLCD (const std::string& process_id) : BaseComponent(process_id)
|
||||
{
|
||||
waveform = std::make_unique<Waveforms> (process_id);
|
||||
addAndMakeVisible (*waveform);
|
||||
waveform = std::make_unique<Waveforms>(process_id);
|
||||
addAndMakeVisible(*waveform);
|
||||
}
|
||||
|
||||
SidebarLCD::~SidebarLCD ()
|
||||
{
|
||||
waveform.reset (nullptr);
|
||||
waveform.reset(nullptr);
|
||||
}
|
||||
|
||||
void SidebarLCD::drawHeadline (Graphics& g)
|
||||
{
|
||||
float fontSize = VeNo::Utils::setFontSize (12.0f, g) + 2;
|
||||
float fontSize = VeNo::Utils::setFontSize(12.0f, g) + 2;
|
||||
int line = m_innerY + fontSize + 2;
|
||||
g.drawText (">>> VeNo <<<", 0, m_innerY, getWidth () - m_width, fontSize,
|
||||
Justification::centred,
|
||||
true);
|
||||
g.drawLine (0, line, getWidth (), line);
|
||||
g.drawText(">>> VeNo <<<", 0, m_innerY, getWidth() - m_width, fontSize,
|
||||
Justification::centred,
|
||||
true);
|
||||
g.drawLine(0, line, getWidth(), line);
|
||||
}
|
||||
|
||||
void SidebarLCD::drawFooter (Graphics& g)
|
||||
{
|
||||
float fontSize = VeNo::Utils::setFontSize (8.0f, g) + 4;
|
||||
float fontSize = VeNo::Utils::setFontSize(8.0f, g) + 4;
|
||||
int space = m_innerY + fontSize;
|
||||
int line = getHeight () - space;
|
||||
g.drawText ("by VersusTuneZ", 0, line, getWidth () - m_width, fontSize,
|
||||
Justification::horizontallyCentred,
|
||||
true);
|
||||
g.drawLine (0, line - 4, getWidth (), line - 4);
|
||||
int line = getHeight() - space;
|
||||
g.drawText("by VersusTuneZ", 0, line, getWidth() - m_width, fontSize,
|
||||
Justification::horizontallyCentred,
|
||||
true);
|
||||
g.drawLine(0, line - 4, getWidth(), line - 4);
|
||||
}
|
||||
|
||||
void SidebarLCD::resized ()
|
||||
{
|
||||
float topSpace = (12 * Config::getInstance ()->getScale ()) + 4 + m_innerY;
|
||||
float topSpace = (12 * Config::getInstance()->getScale()) + 4 + m_innerY;
|
||||
if (waveform != nullptr)
|
||||
{
|
||||
waveform->setBounds (0, topSpace * 2, getWidth (), getHeight () - (topSpace * 4));
|
||||
waveform->setBounds(0, topSpace * 2, getWidth(), getHeight() - (topSpace * 4));
|
||||
}
|
||||
}
|
||||
|
||||
void SidebarLCD::paint (Graphics& g)
|
||||
{
|
||||
std::shared_ptr<Theme> theme = Config::getInstance ()->getCurrentTheme ();
|
||||
auto colour = theme->getColour (ThemeColour::lcd_bg);
|
||||
g.fillAll (colour);
|
||||
std::shared_ptr<Theme> theme = Config::getInstance()->getCurrentTheme();
|
||||
auto colour = theme->getColour(ThemeColour::lcd_bg);
|
||||
g.fillAll(colour);
|
||||
// background
|
||||
auto accent = theme->getColour (ThemeColour::lcd);
|
||||
g.setColour (accent);
|
||||
g.setFont (*VenoFonts::getLCD ());
|
||||
drawHeadline (g);
|
||||
drawFooter (g);
|
||||
auto accent = theme->getColour(ThemeColour::lcd);
|
||||
g.setColour(accent);
|
||||
g.setFont(*VenoFonts::getLCD());
|
||||
drawHeadline(g);
|
||||
drawFooter(g);
|
||||
}
|
||||
|
|
@ -9,33 +9,30 @@
|
|||
#include "../../../VenoInstance.h"
|
||||
#include "../../../Fonts/Fonts.h"
|
||||
|
||||
Waveforms::Waveforms (const std::string& processId) : BaseComponent (processId)
|
||||
Waveforms::Waveforms (const std::string& processId) : BaseComponent(processId)
|
||||
{
|
||||
m_context.setOpenGLVersionRequired (OpenGLContext::OpenGLVersion::openGL3_2);
|
||||
m_context.setRenderer (this);
|
||||
m_context.setContinuousRepainting (false);
|
||||
m_context.setComponentPaintingEnabled (true);
|
||||
m_context.attachTo (*this);
|
||||
auto fps = Config::getInstance ()->getFps ();
|
||||
startTimerHz (Config::getInstance ()->getFps ());
|
||||
std::srand (unsigned (time (nullptr)));
|
||||
pickRandomText = (std::rand () % RANDOM_TEXT_COUNT);
|
||||
setMouseCursor(MouseCursor::PointingHandCursor);
|
||||
m_context.setOpenGLVersionRequired(OpenGLContext::OpenGLVersion::openGL3_2);
|
||||
m_context.setRenderer(this);
|
||||
m_context.setContinuousRepainting(false);
|
||||
m_context.setComponentPaintingEnabled(true);
|
||||
m_context.attachTo(*this);
|
||||
setFps();
|
||||
std::srand(unsigned(time(nullptr)));
|
||||
pickRandomText = (std::rand() % RANDOM_TEXT_COUNT);
|
||||
m_ticks = 0;
|
||||
// is something that
|
||||
m_time_needed = roundToInt (4000 / (1000 / fps));
|
||||
m_time_needed_startup = roundToInt (1000 / (1000 / fps));
|
||||
}
|
||||
|
||||
Waveforms::~Waveforms ()
|
||||
{
|
||||
stopTimer ();
|
||||
shaderProgram.reset ();
|
||||
m_context.detach ();
|
||||
stopTimer();
|
||||
shaderProgram.reset();
|
||||
m_context.detach();
|
||||
}
|
||||
|
||||
void Waveforms::newOpenGLContextCreated ()
|
||||
{
|
||||
compileOpenGLShaderProgram ();
|
||||
compileOpenGLShaderProgram();
|
||||
}
|
||||
|
||||
void Waveforms::openGLContextClosing ()
|
||||
|
|
@ -45,23 +42,23 @@ void Waveforms::openGLContextClosing ()
|
|||
|
||||
void Waveforms::renderOpenGL ()
|
||||
{
|
||||
if (!isShowing () || shaderProgram == nullptr || !shaderProgram->getLastError ().isEmpty ())
|
||||
if (!isShowing() || shaderProgram == nullptr || !shaderProgram->getLastError().isEmpty())
|
||||
{
|
||||
return;
|
||||
}
|
||||
auto theme = Config::getInstance ()->getCurrentTheme ();
|
||||
auto theme = Config::getInstance()->getCurrentTheme();
|
||||
if (theme == nullptr)
|
||||
{
|
||||
return;
|
||||
}
|
||||
glViewport (0, 0, getWidth (), getHeight ());
|
||||
OpenGLHelpers::clear (theme->getColour (ThemeColour::lcd_bg));
|
||||
glEnable (GL_BLEND);
|
||||
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
shaderProgram->use ();
|
||||
auto color = theme->getColour (ThemeColour::lcd);
|
||||
shaderProgram->setUniform ("color", color.getFloatRed (), color.getFloatGreen (), color.getFloatBlue (),
|
||||
color.getFloatAlpha ());
|
||||
glViewport(0, 0, getWidth(), getHeight());
|
||||
OpenGLHelpers::clear(theme->getColour(ThemeColour::lcd_bg));
|
||||
glEnable(GL_BLEND);
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
shaderProgram->use();
|
||||
auto color = theme->getColour(ThemeColour::lcd);
|
||||
shaderProgram->setUniform("color", color.getFloatRed(), color.getFloatGreen(), color.getFloatBlue(),
|
||||
color.getFloatAlpha());
|
||||
if (m_isWelcome || m_isStarting || m_isChangingData)
|
||||
{
|
||||
return;
|
||||
|
|
@ -69,33 +66,28 @@ void Waveforms::renderOpenGL ()
|
|||
switch (m_mode)
|
||||
{
|
||||
case 1:
|
||||
drawAudioOutput ();
|
||||
drawAudioOutput();
|
||||
break;
|
||||
case 2:
|
||||
drawWaveTable ();
|
||||
drawWaveTable();
|
||||
break;
|
||||
case 3:
|
||||
drawSpectrum ();
|
||||
drawSpectrum();
|
||||
break;
|
||||
default:
|
||||
drawPeakMeter ();
|
||||
drawPeakMeter();
|
||||
}
|
||||
}
|
||||
|
||||
void Waveforms::handleAsyncUpdate ()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void Waveforms::compileOpenGLShaderProgram ()
|
||||
{
|
||||
std::unique_ptr<OpenGLShaderProgram> shaderProgramAttempt
|
||||
= std::make_unique<OpenGLShaderProgram> (m_context);
|
||||
if (shaderProgramAttempt->addVertexShader ({BinaryData::WaveForm_vertex_glsl})
|
||||
&& shaderProgramAttempt->addFragmentShader ({BinaryData::WaveForm_fragment_glsl})
|
||||
&& shaderProgramAttempt->link ())
|
||||
= std::make_unique<OpenGLShaderProgram>(m_context);
|
||||
if (shaderProgramAttempt->addVertexShader({BinaryData::WaveForm_vertex_glsl})
|
||||
&& shaderProgramAttempt->addFragmentShader({BinaryData::WaveForm_fragment_glsl})
|
||||
&& shaderProgramAttempt->link())
|
||||
{
|
||||
shaderProgram = std::move (shaderProgramAttempt);
|
||||
shaderProgram = std::move(shaderProgramAttempt);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -121,15 +113,16 @@ void Waveforms::timerCallback ()
|
|||
{
|
||||
if (m_isWelcome || m_isStarting || m_isChangingData || needToClear)
|
||||
{
|
||||
repaint ();
|
||||
repaint();
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m_context.isAttached ())
|
||||
if (m_context.isAttached())
|
||||
{
|
||||
m_context.triggerRepaint ();
|
||||
m_context.triggerRepaint();
|
||||
}
|
||||
}
|
||||
setFps();
|
||||
}
|
||||
|
||||
void Waveforms::drawWaveTable ()
|
||||
|
|
@ -140,63 +133,61 @@ void Waveforms::drawWaveTable ()
|
|||
void Waveforms::drawAudioOutput ()
|
||||
{
|
||||
// draw audio from the oscillators
|
||||
auto instance = VenoInstance::getInstance (BaseComponent::m_processId);
|
||||
auto buffer = instance->audioBuffer->getBuffer ();
|
||||
glBegin (GL_LINE_STRIP);
|
||||
auto instance = VenoInstance::getInstance(BaseComponent::m_processId);
|
||||
auto buffer = instance->audioBuffer->getBuffer();
|
||||
glBegin(GL_LINE_STRIP);
|
||||
float posX = -1;
|
||||
float inc = 2.0f / buffer.size ();
|
||||
float inc = 2.0f / buffer.size();
|
||||
for (float i : buffer)
|
||||
{
|
||||
glVertex2f (posX, i);
|
||||
glVertex2f(posX, i);
|
||||
posX += inc;
|
||||
}
|
||||
glEnd ();
|
||||
glEnd();
|
||||
}
|
||||
|
||||
void Waveforms::drawPeakMeter ()
|
||||
{
|
||||
auto theme = Config::getInstance ()->getCurrentTheme ();
|
||||
auto theme = Config::getInstance()->getCurrentTheme();
|
||||
if (theme == nullptr)
|
||||
{
|
||||
return;
|
||||
}
|
||||
auto instance = VenoInstance::getInstance (BaseComponent::m_processId);
|
||||
instance->audioBuffer->calcPeak ();
|
||||
auto instance = VenoInstance::getInstance(BaseComponent::m_processId);
|
||||
instance->audioBuffer->calcPeak();
|
||||
// draw peak signal
|
||||
auto leftChannel = jmap (Decibels::gainToDecibels (instance->audioBuffer->leftPeak, -80.0f), -80.0f, 6.0f, -1.0f,
|
||||
1.0f);
|
||||
selectColourByPeak (leftChannel);
|
||||
glBegin (GL_TRIANGLES);
|
||||
glVertex2f (-0.9f, leftChannel);
|
||||
glVertex2f (-0.9f, -1.0f);
|
||||
glVertex2f (-0.01f, -1.0f);
|
||||
glVertex2f (-0.9f, leftChannel);
|
||||
glVertex2f (-0.01f, leftChannel);
|
||||
glVertex2f (-0.01f, -1.0f);
|
||||
glEnd ();
|
||||
auto rightChannel = jmap (Decibels::gainToDecibels (instance->audioBuffer->rightPeak, -80.0f), -80.0f, 6.0f, -1.0f,
|
||||
1.0f);
|
||||
selectColourByPeak (rightChannel);
|
||||
glBegin (GL_TRIANGLES);
|
||||
glVertex2f (0.9f, rightChannel);
|
||||
glVertex2f (0.9f, -1.0f);
|
||||
glVertex2f (0.01f, -1.0f);
|
||||
glVertex2f (0.9f, rightChannel);
|
||||
glVertex2f (0.01f, rightChannel);
|
||||
glVertex2f (0.01f, -1.0f);
|
||||
glEnd ();
|
||||
auto leftChannel = getdBForChannel(instance->audioBuffer->leftPeak);
|
||||
selectColourByPeak(leftChannel);
|
||||
glBegin(GL_TRIANGLES);
|
||||
glVertex2f(-0.9f, leftChannel);
|
||||
glVertex2f(-0.9f, -1.0f);
|
||||
glVertex2f(-0.01f, -1.0f);
|
||||
glVertex2f(-0.9f, leftChannel);
|
||||
glVertex2f(-0.01f, leftChannel);
|
||||
glVertex2f(-0.01f, -1.0f);
|
||||
glEnd();
|
||||
auto rightChannel = getdBForChannel(instance->audioBuffer->rightPeak);
|
||||
selectColourByPeak(rightChannel);
|
||||
glBegin(GL_TRIANGLES);
|
||||
glVertex2f(0.9f, rightChannel);
|
||||
glVertex2f(0.9f, -1.0f);
|
||||
glVertex2f(0.01f, -1.0f);
|
||||
glVertex2f(0.9f, rightChannel);
|
||||
glVertex2f(0.01f, rightChannel);
|
||||
glVertex2f(0.01f, -1.0f);
|
||||
glEnd();
|
||||
}
|
||||
|
||||
void Waveforms::paint (Graphics& g)
|
||||
{
|
||||
std::shared_ptr<Theme> theme = Config::getInstance ()->getCurrentTheme ();
|
||||
auto accent = theme->getColour (ThemeColour::lcd);
|
||||
g.setColour (accent);
|
||||
g.setFont (*VenoFonts::getLCD ());
|
||||
VeNo::Utils::setFontSize (16.0f, g);
|
||||
std::shared_ptr<Theme> theme = Config::getInstance()->getCurrentTheme();
|
||||
auto accent = theme->getColour(ThemeColour::lcd);
|
||||
g.setColour(accent);
|
||||
g.setFont(*VenoFonts::getLCD());
|
||||
VeNo::Utils::setFontSize(16.0f, g);
|
||||
if (m_isWelcome)
|
||||
{
|
||||
drawWelcome (g, getWidth (), getHeight (), 0, 0);
|
||||
drawWelcome(g, getWidth(), getHeight(), 0, 0);
|
||||
m_ticks++;
|
||||
if (m_ticks > m_time_needed_startup)
|
||||
{
|
||||
|
|
@ -207,8 +198,8 @@ void Waveforms::paint (Graphics& g)
|
|||
}
|
||||
else if (m_isStarting)
|
||||
{
|
||||
g.drawText (m_warmUpText[pickRandomText], 0, 0, getWidth (), getHeight (),
|
||||
Justification::centred, true);
|
||||
g.drawText(m_warmUpText[pickRandomText], 0, 0, getWidth(), getHeight(),
|
||||
Justification::centred, true);
|
||||
m_ticks++;
|
||||
if (m_ticks > m_time_needed_startup)
|
||||
{
|
||||
|
|
@ -219,7 +210,7 @@ void Waveforms::paint (Graphics& g)
|
|||
}
|
||||
else if (m_isChangingData)
|
||||
{
|
||||
drawChangedParameter (g, getWidth (), getHeight (), 0, 0);
|
||||
drawChangedParameter(g, getWidth(), getHeight(), 0, 0);
|
||||
m_ticks++;
|
||||
if (m_ticks > m_time_needed)
|
||||
{
|
||||
|
|
@ -230,7 +221,7 @@ void Waveforms::paint (Graphics& g)
|
|||
}
|
||||
else
|
||||
{
|
||||
g.resetToDefaultState ();
|
||||
g.resetToDefaultState();
|
||||
needToClear = false;
|
||||
}
|
||||
}
|
||||
|
|
@ -238,19 +229,19 @@ void Waveforms::paint (Graphics& g)
|
|||
void Waveforms::drawChangedParameter (Graphics& g, int w, int h, int x, int y) const
|
||||
{
|
||||
int halfHeight = h / 2;
|
||||
float font = VeNo::Utils::setFontSize (12, g);
|
||||
g.drawText (changingParameter, x, y + halfHeight - font, w, font, Justification::centred, true);
|
||||
g.drawText (std::to_string (changedValue), x, y + halfHeight + 4, w, font, Justification::centred,
|
||||
true);
|
||||
float font = VeNo::Utils::setFontSize(12, g);
|
||||
g.drawText(changingParameter, x, y + halfHeight - font, w, font, Justification::centred, true);
|
||||
g.drawText(std::to_string(changedValue), x, y + halfHeight + 4, w, font, Justification::centred,
|
||||
true);
|
||||
}
|
||||
|
||||
void Waveforms::drawWelcome (Graphics& g, int w, int h, int x, int y)
|
||||
{
|
||||
float font = VeNo::Utils::setFontSize (12, g);
|
||||
float font = VeNo::Utils::setFontSize(12, g);
|
||||
int halfHeight = h / 2;
|
||||
g.drawText (m_readyText, x, y + halfHeight - font, w, font, Justification::centred, true);
|
||||
g.drawText (SystemStats::getLogonName (), x, y + halfHeight + 4, w, font, Justification::centred,
|
||||
true);
|
||||
g.drawText(m_readyText, x, y + halfHeight - font, w, font, Justification::centred, true);
|
||||
g.drawText(SystemStats::getLogonName(), x, y + halfHeight + 4, w, font, Justification::centred,
|
||||
true);
|
||||
}
|
||||
|
||||
void Waveforms::drawSpectrum ()
|
||||
|
|
@ -259,20 +250,39 @@ void Waveforms::drawSpectrum ()
|
|||
|
||||
void Waveforms::selectColourByPeak (float value)
|
||||
{
|
||||
auto theme = Config::getInstance ()->getCurrentTheme ();
|
||||
auto theme = Config::getInstance()->getCurrentTheme();
|
||||
if (theme == nullptr)
|
||||
{
|
||||
return;
|
||||
}
|
||||
auto color = theme->getColour (ThemeColour::lcd);
|
||||
if (value > 0.8 && value < 0.9)
|
||||
{
|
||||
color = theme->getColour (ThemeColour::warning);
|
||||
}
|
||||
auto color = theme->getColour(ThemeColour::lcd);
|
||||
if (value > 0.9)
|
||||
{
|
||||
color = theme->getColour (ThemeColour::clip);
|
||||
color = theme->getColour(ThemeColour::clip);
|
||||
}
|
||||
else if (value > 0.8)
|
||||
{
|
||||
color = theme->getColour(ThemeColour::warning);
|
||||
}
|
||||
shaderProgram->setUniform("color", color.getFloatRed(), color.getFloatGreen(), color.getFloatBlue(),
|
||||
color.getFloatAlpha());
|
||||
}
|
||||
|
||||
float Waveforms::getdBForChannel (float value)
|
||||
{
|
||||
float v = VeNo::Utils::clamp(Decibels::gainToDecibels(value, -60.0f), -60.0f, 6.0f);
|
||||
return jmap(v, -60.0f, 6.0f, -1.0f,
|
||||
1.0f);
|
||||
}
|
||||
|
||||
void Waveforms::setFps ()
|
||||
{
|
||||
if(m_currentFps != Config::getInstance()->getFps()) {
|
||||
m_currentFps = Config::getInstance()->getFps();
|
||||
// is something that
|
||||
m_time_needed = roundToInt(4000 / (1000 / m_currentFps));
|
||||
m_time_needed_startup = roundToInt(1000 / (1000 / m_currentFps));
|
||||
stopTimer();
|
||||
startTimer(m_currentFps);
|
||||
}
|
||||
shaderProgram->setUniform ("color", color.getFloatRed (), color.getFloatGreen (), color.getFloatBlue (),
|
||||
color.getFloatAlpha ());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
// opengl context :D
|
||||
class Waveforms : public BaseComponent,
|
||||
private OpenGLRenderer,
|
||||
private AsyncUpdater,
|
||||
private Timer
|
||||
{
|
||||
protected:
|
||||
|
|
@ -34,7 +33,6 @@ public:
|
|||
void newOpenGLContextCreated () override;
|
||||
void openGLContextClosing () override;
|
||||
void renderOpenGL () override;
|
||||
void handleAsyncUpdate () override;
|
||||
void mouseDown (const MouseEvent& e) override;
|
||||
void mouseDrag (const MouseEvent& e) override;
|
||||
void paint (Graphics& g) override;
|
||||
|
|
@ -51,7 +49,10 @@ private:
|
|||
void drawWelcome (Graphics& g, int w, int h, int x, int y);
|
||||
void compileOpenGLShaderProgram ();
|
||||
void selectColourByPeak (float value);
|
||||
float getdBForChannel (float value);
|
||||
void setFps();
|
||||
OpenGLContext m_context;
|
||||
std::unique_ptr<OpenGLShaderProgram> shaderProgram;
|
||||
int m_currentFps = 0;
|
||||
};
|
||||
#endif //VENO_WAVEFORMS_H
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue