1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-07 08:24:43 -04:00

OpenGL modernization: draw the frequency scale the new way

This commit is contained in:
f4exb
2016-03-05 08:53:56 +01:00
parent 2720969a84
commit 3aabeb4399
2 changed files with 22 additions and 29 deletions
+4 -3
View File
@@ -132,18 +132,18 @@ private:
Real m_waterfallShare;
QPixmap m_leftMarginPixmap;
QPixmap m_frequencyPixmap;
#ifdef GL_DEPRECATED
bool m_leftMarginTextureAllocated;
GLuint m_leftMarginTexture;
QRectF m_glLeftScaleRect;
#endif
QPixmap m_frequencyPixmap;
bool m_frequencyTextureAllocated;
GLuint m_frequencyTexture;
QRectF m_glFrequencyScaleRect;
#endif
ScaleEngine m_timeScale;
ScaleEngine m_powerScale;
ScaleEngine m_frequencyScale;
QRectF m_glFrequencyScaleRect;
QRect m_frequencyScaleRect;
QMatrix4x4 m_glFrequencyScaleBoxMatrix;
QMatrix4x4 m_glLeftScaleBoxMatrix;
@@ -179,6 +179,7 @@ private:
GLShaderSimple m_glShaderSimple;
GLShaderTextured m_glShaderLeftScale;
GLShaderTextured m_glShaderFrequencyScale;
int m_matrixLoc;
int m_colorLoc;