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

OpenGL modernization: draw histogram grid frequency lines the new way. Added missing transformation matrices

This commit is contained in:
f4exb
2016-03-03 19:56:54 +01:00
parent c7b1bb3912
commit 56df03ef29
2 changed files with 122 additions and 30 deletions
+4 -3
View File
@@ -129,6 +129,8 @@ private:
QRectF m_glLeftScaleRect;
QRectF m_glFrequencyScaleRect;
QRect m_frequencyScaleRect;
QMatrix4x4 m_glFrequencyScaleBoxMatrix;
QMatrix4x4 m_glLeftScaleBoxMatrix;
QRgb m_waterfallPalette[240];
QImage* m_waterfallBuffer;
@@ -138,6 +140,7 @@ private:
int m_waterfallTextureHeight;
int m_waterfallTexturePos;
QRectF m_glWaterfallRect;
QMatrix4x4 m_glWaterfallBoxMatrix;
bool m_displayWaterfall;
bool m_ssbSpectrum;
@@ -154,13 +157,11 @@ private:
QRectF m_glHistogramRect;
QMatrix4x4 m_glHistogramSpectrumMatrix;
QMatrix4x4 m_glHistogramBoxMatrix;
GLShaderSimple m_glShaderSimple;
bool m_displayHistogram;
bool m_displayChanged;
//QOpenGLVertexArrayObject m_vao; don't know what to do with this shit
//QOpenGLBuffer m_vbo;
GLShaderSimple m_glShaderSimple;
QOpenGLShaderProgram *m_program;
int m_matrixLoc;
int m_colorLoc;