I think transformations should somewhat work now
This commit is contained in:
parent
a9f169deba
commit
83b5453088
7 changed files with 47 additions and 240 deletions
|
@ -1,83 +0,0 @@
|
|||
#include "camera.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
#include <glm/gtx/matrix_decompose.hpp>
|
||||
#include <glm/gtx/quaternion.hpp>
|
||||
#include <glm/gtc/type_ptr.hpp>
|
||||
|
||||
namespace oglu
|
||||
{
|
||||
Camera::Camera() :
|
||||
fov(45.0f), aspectRatio(0.0f), zNear(0.1f), zFar(100.0f), projection(new float[16]{ 0.0f })
|
||||
{
|
||||
GLint viewport[4];
|
||||
glGetIntegerv(GL_VIEWPORT, viewport);
|
||||
aspectRatio = (float)viewport[2] / (float)viewport[3];
|
||||
|
||||
memcpy(
|
||||
projection,
|
||||
glm::value_ptr(glm::perspective(glm::radians(fov), aspectRatio, zNear, zFar)),
|
||||
16 * sizeof(float)
|
||||
);
|
||||
}
|
||||
|
||||
Camera::Camera(const Camera& other) :
|
||||
fov(other.fov), aspectRatio(other.aspectRatio), zNear(other.zNear), zFar(other.zFar), projection(new float[16]{ 0.0f })
|
||||
{
|
||||
memcpy(
|
||||
projection,
|
||||
other.projection,
|
||||
16 * sizeof(float)
|
||||
);
|
||||
}
|
||||
|
||||
Camera::Camera(float fov, float aspectRatio, float zNear, float zFar) :
|
||||
fov(fov), aspectRatio(aspectRatio), zNear(zNear), zFar(zFar), projection(new float[16]{ 0.0f })
|
||||
{
|
||||
if (aspectRatio == 0.0f)
|
||||
{
|
||||
GLint viewport[4];
|
||||
glGetIntegerv(GL_VIEWPORT, viewport);
|
||||
aspectRatio = (float)viewport[2] / (float)viewport[3];
|
||||
}
|
||||
|
||||
memcpy(
|
||||
projection,
|
||||
glm::value_ptr(glm::perspective(glm::radians(fov), aspectRatio, zNear, zFar)),
|
||||
16 * sizeof(float)
|
||||
);
|
||||
}
|
||||
|
||||
Camera::~Camera()
|
||||
{
|
||||
}
|
||||
|
||||
void Camera::LookAt(GLfloat x, GLfloat y, GLfloat z)
|
||||
{
|
||||
LookAt(glm::vec3(x, y, z));
|
||||
}
|
||||
|
||||
void Camera::LookAt(const GLfloat* target)
|
||||
{
|
||||
LookAt(glm::make_vec3(target));
|
||||
}
|
||||
|
||||
void Camera::LookAt(const glm::vec3& target)
|
||||
{
|
||||
transformation = glm::lookAt(translation, target, glm::vec3(0.0f, 1.0f, 0.0f));
|
||||
glm::decompose(transformation, scale, orientation, translation, skew, perspective);
|
||||
}
|
||||
|
||||
void Camera::LookAt(const Transformable& target)
|
||||
{
|
||||
LookAt(target.GetPosition());
|
||||
}
|
||||
|
||||
const float* Camera::GetProjectionMatrix()
|
||||
{
|
||||
return projection;
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue