remove a trailing print()
This commit is contained in:
parent
dfc97ba1f2
commit
0f2d864e05
|
|
@ -177,7 +177,7 @@ void Trackball::DrawPostApply() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void Trackball::Apply () {
|
void Trackball::Apply () {
|
||||||
glTranslate (center);track.Matrix().print();
|
glTranslate (center);
|
||||||
glMultMatrix (track.Matrix());
|
glMultMatrix (track.Matrix());
|
||||||
glTranslate (-center);
|
glTranslate (-center);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -134,30 +134,13 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
template <class T> void View<T>::GetView() {
|
template <class T> void View<T>::GetView() {
|
||||||
double m[16];
|
glGetv(GL_PROJECTION_MATRIX,proj);
|
||||||
|
glGetv(GL_MODELVIEW_MATRIX,model);
|
||||||
// Don't use GL_TRANSPOSE_*_MATRIX_ARB
|
|
||||||
// they are veeeery evil!
|
|
||||||
// On many OpenGL implementation they just don't work, causing endless hours of debugging!
|
|
||||||
|
|
||||||
/*
|
|
||||||
glGetDoublev(GL_TRANSPOSE_PROJECTION_MATRIX_ARB, m);
|
|
||||||
proj.Import(Matrix44d(m));
|
|
||||||
glGetDoublev(GL_TRANSPOSE_MODELVIEW_MATRIX_ARB, m);
|
|
||||||
model.Import(Matrix44d(m));
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Use standard routines, and transpose manually.
|
|
||||||
// some 10^-20 seconds slower, but a lot safer
|
|
||||||
|
|
||||||
glGetv(GL_PROJECTION_MATRIX,proj);
|
|
||||||
glGetv(GL_MODELVIEW_MATRIX,model);
|
|
||||||
|
|
||||||
glGetIntegerv(GL_VIEWPORT, (GLint*)viewport);
|
glGetIntegerv(GL_VIEWPORT, (GLint*)viewport);
|
||||||
|
|
||||||
matrix = proj*model;
|
matrix = proj*model;
|
||||||
inverse = matrix;
|
inverse = matrix;
|
||||||
Invert(inverse);
|
Invert(inverse);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <class T> void View<T>::SetView() {
|
template <class T> void View<T>::SetView() {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue