yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

QMatrix4x4 does no longer wrap qreal

Browse source
This commit is contained in:
Martin Gräßlin 2013-07-23 07:06:59 +02:00
parent 330d40f425
commit e32635fb2e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libkwineffects/kwinglutils.cpp
View file

@ -238,7 +238,7 @@ void multiplyMatrix(const QMatrix4x4 &matrix)
return; return;
} }
GLfloat m[16]; GLfloat m[16];
const qreal *data = matrix.constData(); const auto *data = matrix.constData();
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 4; ++j) { for (int j = 0; j < 4; ++j) {
m[i*4+j] = data[i*4+j]; m[i*4+j] = data[i*4+j];
@ -257,7 +257,7 @@ void loadMatrix(const QMatrix4x4 &matrix)
return; return;
} }
GLfloat m[16]; GLfloat m[16];
const qreal *data = matrix.constData(); const auto *data = matrix.constData();
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 4; ++j) { for (int j = 0; j < 4; ++j) {
m[i*4+j] = data[i*4+j]; m[i*4+j] = data[i*4+j];
@ -635,7 +635,7 @@ bool GLShader::setUniform(int location, const QMatrix4x4 &value)
{ {
if (location >= 0) { if (location >= 0) {
GLfloat m[16]; GLfloat m[16];
const qreal *data = value.constData(); const auto *data = value.constData();
// i is column, j is row for m // i is column, j is row for m
for (int i = 0; i < 16; ++i) { for (int i = 0; i < 16; ++i) {
m[i] = data[i]; m[i] = data[i];