VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-03 06:24:48 -04:00
Code Issues Projects Releases Wiki Activity

Simply matrix calcs. Fix for clang

Browse Source
This commit is contained in:
Jon Beniston
2022-06-18 13:07:10 +01:00
parent d441e6d475
commit c135affb6a
3 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrgui/gui/glshaderspectrogram.cpp
+12 -17
View File
@@ -310,7 +310,7 @@ void GLShaderSpectrogram::subTextureMutable(int xOffset, int yOffset, int width,
glTexSubImage2D(GL_TEXTURE_2D, 0, xOffset, yOffset, width, height, GL_LUMINANCE, GL_UNSIGNED_BYTE, pixels);
}
void GLShaderSpectrogram::drawSurface(SpectrumSettings::SpectrogramStyle style, float textureOffset, bool invert)
void GLShaderSpectrogram::drawSurface(SpectrumSettings::SpectrogramStyle style, const QMatrix4x4& vertexTransform, float textureOffset, bool invert)
{
if ((m_useImmutableStorage && !m_texture) || (!m_useImmutableStorage && !m_textureId))
{
@@ -325,17 +325,6 @@ void GLShaderSpectrogram::drawSurface(SpectrumSettings::SpectrogramStyle style,
program = m_programSimple;
}
// Note that translation to the origin and rotation
// needs to be performed in reverse order to what you
// might normally expect
// See: https://bugreports.qt.io/browse/QTBUG-20752
QMatrix4x4 vertexTransform;
vertexTransform.translate(0.0f, 0.0f, -1.65f);
applyScaleRotate(vertexTransform);
vertexTransform.translate(-0.5f, -0.5f, 0.0f);
applyPerspective(vertexTransform);
float rot = invert ? 1.0 : -1.0;
QMatrix4x4 textureTransform(
1.0, 0.0, 0.0, 0.0,
@@ -652,14 +641,20 @@ void GLShaderSpectrogram::lightRotateZ(float degrees)
m_lightRotZ += degrees;
}
void GLShaderSpectrogram::applyScaleRotate(QMatrix4x4 &matrix)
void GLShaderSpectrogram::applyTransform(QMatrix4x4 &matrix)
{
// As above, this is in reverse
matrix.translate(m_translateX, m_translateY, m_translateZ);
matrix.rotate(m_rotX, 1.0f, 0.0f, 0.0f);
// Note that translation to the origin and rotation
// needs to be performed in reverse order to what you
// might normally expect
// See: https://bugreports.qt.io/browse/QTBUG-20752
matrix.translate(0.0f, 0.0f, -1.65f); // Camera position
matrix.translate(m_translateX, m_translateY, m_translateZ); // User camera position adjustment
matrix.rotate(m_rotX, 1.0f, 0.0f, 0.0f); // User rotation
matrix.rotate(m_rotY, 0.0f, 1.0f, 0.0f);
matrix.rotate(m_rotZ, 0.0f, 0.0f, 1.0f);
matrix.scale(m_scaleX, m_scaleY, m_scaleZ * m_userScaleZ);
matrix.scale(m_scaleX, m_scaleY, m_scaleZ * m_userScaleZ); // Scaling
matrix.translate(-0.5f, -0.5f, 0.0f); // Centre at origin for correct rotation
applyPerspective(matrix);
}
void GLShaderSpectrogram::applyPerspective(QMatrix4x4 &matrix)