AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-18 17:35:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed dependencies on GLM

Browse Source
This commit is contained in:
Aruki
2017-03-31 23:33:11 -06:00
parent cd8f4147c2
commit e138cd7035
11 changed files with 24 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Core/Render/CCamera.cpp
View File

@@ -2,7 +2,6 @@
#include "CGraphics.h"
#include <Math/CQuaternion.h>
#include <Math/MathUtil.h>
#include <gtc/matrix_transform.hpp>
CCamera::CCamera()
: mMode(eFreeCamera)
@@ -243,15 +242,17 @@ void CCamera::UpdateTransform() const
void CCamera::UpdateView() const
{
// todo: don't use glm
UpdateTransform();
if (mViewDirty)
{
glm::vec3 glmpos(mPosition.X, mPosition.Y, mPosition.Z);
glm::vec3 glmdir(mDirection.X, mDirection.Y, mDirection.Z);
glm::vec3 glmup(mUpVector.X, mUpVector.Y, mUpVector.Z);
mViewMatrix = CMatrix4f::FromGlmMat4(glm::lookAt(glmpos, glmpos + glmdir, glmup)).Transpose();
mViewMatrix = CMatrix4f(
mRightVector.X, mRightVector.Y, mRightVector.Z, -mRightVector.Dot(mPosition),
mUpVector.X, mUpVector.Y, mUpVector.Z, -mUpVector.Dot(mPosition),
-mDirection.X, -mDirection.Y, -mDirection.Z, mDirection.Dot(mPosition),
0.f, 0.f, 0.f, 1.f
);
mViewDirty = false;
}
}