comparison: src/canvas.cpp
src/canvas.cpp
- changeset 1404
- 16eb4257e662
- parent 1392
- 0541d9b21968
- child 1405
- d2bf2e59a3ef
equal
deleted
inserted
replaced
| 1403:7a2d84112983 | 1404:16eb4257e662 |
|---|---|
| 187 glDisable(GL_LINE_STIPPLE); | 187 glDisable(GL_LINE_STIPPLE); |
| 188 | 188 |
| 189 if (this->camera() < Camera::Free) | 189 if (this->camera() < Camera::Free) |
| 190 { | 190 { |
| 191 GLfloat cullz = this->cullValues[static_cast<int>(this->camera())]; | 191 GLfloat cullz = this->cullValues[static_cast<int>(this->camera())]; |
| 192 GLRotationMatrix matrix = { | 192 QMatrix4x4 matrix = { |
| 193 1, 0, 0, cullz, | 193 1, 0, 0, cullz, |
| 194 0, 1, 0, 0, | 194 0, 1, 0, 0, |
| 195 0, 0, 1, 0, | 195 0, 0, 1, 0, |
| 196 0, 0, 0, 1, | 196 0, 0, 0, 1, |
| 197 }; | 197 }; |
| 198 glMultMatrixf(matrix); | 198 glMultMatrixf(matrix.constData()); |
| 199 } | 199 } |
| 200 } | 200 } |
| 201 | 201 |
| 202 bool Canvas::freeCameraAllowed() const | 202 bool Canvas::freeCameraAllowed() const |
| 203 { | 203 { |
