Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mixed intrinsic and extrinsic camera parameters in OpenGL projection matrix #1485

Merged
merged 2 commits into from
Aug 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
* Fixed refresh of LineSegmentShapeNode: [#1381](https://github.com/dartsim/dart/pull/1381)
* Fixed OSG transparent object sorting: [#1414](https://github.com/dartsim/dart/pull/1414)
* Added modifier key support to ImGuiHandler: [#1436](https://github.com/dartsim/dart/pull/1436)
* Fixed mixed intrinsic and extrinsic camera parameters in OpenGL projection matrix: [#1485](https://github.com/dartsim/dart/pull/1485)

* Parser

Expand Down Expand Up @@ -78,6 +79,10 @@
* Allowed to set CMAKE_INSTALL_PREFIX on Windows: [#1478](https://github.com/dartsim/dart/pull/1478)
* Enforced to use OpenSceneGraph 3.7.0 or greater on macOS Catalina: [#1479](https://github.com/dartsim/dart/pull/1479)

* Documentation

* Updated tutorial documentation and code to reflect new APIs: [#1481](https://github.com/dartsim/dart/pull/1481)

### [DART 6.9.2 (2019-08-16)](https://github.com/dartsim/dart/milestone/60?closed=1)

* Dynamics
Expand Down
8 changes: 4 additions & 4 deletions dart/gui/glut/MotionBlurSimWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ void MotionBlurSimWindow::render()
static_cast<double>(mWinWidth) / static_cast<double>(mWinHeight),
0.1,
10.0);
gluLookAt(
mEye[0], mEye[1], mEye[2], 0.0, 0.0, -1.0, mUp[0], mUp[1], mUp[2]);

glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
gluLookAt(
mEye[0], mEye[1], mEye[2], 0.0, 0.0, -1.0, mUp[0], mUp[1], mUp[2]);
initGL();

mTrackBall.applyGLRotation();
Expand Down Expand Up @@ -165,11 +165,11 @@ void MotionBlurSimWindow::render()
static_cast<double>(mWinWidth) / static_cast<double>(mWinHeight),
0.1,
10.0);
gluLookAt(
mEye[0], mEye[1], mEye[2], 0.0, 0.0, -1.0, mUp[0], mUp[1], mUp[2]);

glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
gluLookAt(
mEye[0], mEye[1], mEye[2], 0.0, 0.0, -1.0, mUp[0], mUp[1], mUp[2]);
initGL();

mTrackBall.applyGLRotation();
Expand Down
2 changes: 1 addition & 1 deletion dart/gui/glut/Win3D.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@ void Win3D::render()
static_cast<double>(mWinWidth) / static_cast<double>(mWinHeight),
0.1,
10.0);
gluLookAt(mEye[0], mEye[1], mEye[2], 0.0, 0.0, -1.0, mUp[0], mUp[1], mUp[2]);

glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
gluLookAt(mEye[0], mEye[1], mEye[2], 0.0, 0.0, -1.0, mUp[0], mUp[1], mUp[2]);
initGL();

mTrackBall.applyGLRotation();
Expand Down