Browse Source

Scene::viewportWidth/viewportHeight were never set, got rid of them.

Caused setting viewport size to some random and possibly dangerous value
after assigning camera to the scene.
pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
e357f24e70
  1. 2
      src/Scene.cpp
  2. 2
      src/Scene.h

2
src/Scene.cpp

@ -54,7 +54,7 @@ void Scene::setCamera(Camera* camera) {
/* Set new camera active */ /* Set new camera active */
_camera = camera; _camera = camera;
if(_camera) { if(_camera) {
_camera->setViewport(viewportWidth, viewportHeight); if(oldCamera) _camera->setViewport(oldCamera->viewport());
_camera->setActive(this); _camera->setActive(this);
} }

2
src/Scene.h

@ -98,8 +98,6 @@ class Scene: public Object {
Camera* _camera; Camera* _camera;
GLuint vao; GLuint vao;
unsigned int viewportWidth, viewportHeight;
inline virtual void draw(const Magnum::Matrix4& transformationMatrix, const Magnum::Matrix4& projectionMatrix) {} inline virtual void draw(const Magnum::Matrix4& transformationMatrix, const Magnum::Matrix4& projectionMatrix) {}
void drawChildren(Object* object, const Matrix4& transformationMatrix); void drawChildren(Object* object, const Matrix4& transformationMatrix);
}; };

Loading…
Cancel
Save