Browse Source

SceneGraph: default Camera aspect ratio policy is to not preserve.

I thought and believed it was like that since forever, but I was wrong.
pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
af8b01da88
  1. 2
      src/SceneGraph/Camera.cpp
  2. 2
      src/SceneGraph/Camera.h

2
src/SceneGraph/Camera.cpp

@ -46,7 +46,7 @@ template Matrix4 aspectRatioFix<Matrix4>(AspectRatioPolicy, const Vector2&, cons
} }
#endif #endif
template<class MatrixType, class VectorType, class ObjectType, class SceneType, class CameraType> Camera<MatrixType, VectorType, ObjectType, SceneType, CameraType>::Camera(ObjectType* parent): ObjectType(parent), projectionAspectRatio(1.0f), _aspectRatioPolicy(AspectRatioPolicy::Extend) {} template<class MatrixType, class VectorType, class ObjectType, class SceneType, class CameraType> Camera<MatrixType, VectorType, ObjectType, SceneType, CameraType>::Camera(ObjectType* parent): ObjectType(parent), projectionAspectRatio(1.0f), _aspectRatioPolicy(AspectRatioPolicy::NotPreserved) {}
template<class MatrixType, class VectorType, class ObjectType, class SceneType, class CameraType> void Camera<MatrixType, VectorType, ObjectType, SceneType, CameraType>::setViewport(const Math::Vector2<GLsizei>& size) { template<class MatrixType, class VectorType, class ObjectType, class SceneType, class CameraType> void Camera<MatrixType, VectorType, ObjectType, SceneType, CameraType>::setViewport(const Math::Vector2<GLsizei>& size) {
Framebuffer::setViewport({0, 0}, size); Framebuffer::setViewport({0, 0}, size);

2
src/SceneGraph/Camera.h

@ -59,7 +59,7 @@ template<class MatrixType, class VectorType, class ObjectType, class SceneType,
typedef Implementation::AspectRatioPolicy AspectRatioPolicy; typedef Implementation::AspectRatioPolicy AspectRatioPolicy;
#else #else
enum class AspectRatioPolicy { enum class AspectRatioPolicy {
NotPreserved, /**< Don't preserve aspect ratio */ NotPreserved, /**< Don't preserve aspect ratio (default) */
Extend, /**< Extend on larger side of view */ Extend, /**< Extend on larger side of view */
Clip /**< Clip on smaller side of view */ Clip /**< Clip on smaller side of view */
}; };

Loading…
Cancel
Save