GLM... radians pls.
This commit is contained in:
@@ -1,13 +1,7 @@
|
||||
#ifndef Camera_h__
|
||||
#define Camera_h__
|
||||
|
||||
#define GLM_FORCE_RADIANS
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/constants.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
#include <glm/gtx/rotate_vector.hpp>
|
||||
#include <glm/gtc/quaternion.hpp>
|
||||
#include <glm/gtx/quaternion.hpp>
|
||||
#include "GLM.h"
|
||||
|
||||
class Camera
|
||||
{
|
||||
@@ -55,7 +49,6 @@ private:
|
||||
float m_AspectRatio;
|
||||
float m_NearClip;
|
||||
float m_FarClip;
|
||||
|
||||
|
||||
glm::vec3 m_Position;
|
||||
glm::quat m_Orientation;
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
#ifndef Component_h__
|
||||
#define Component_h__
|
||||
|
||||
#include "GLM.h"
|
||||
|
||||
#include "Factory.h"
|
||||
#include "Entity.h"
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
#define Components_Bounds_h__
|
||||
|
||||
#include "Component.h"
|
||||
#include <glm/common.hpp>
|
||||
|
||||
namespace Components
|
||||
{
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
#define Components_Transform_h__
|
||||
|
||||
#include "Component.h"
|
||||
#include <glm/gtc/quaternion.hpp>
|
||||
|
||||
namespace Components
|
||||
{
|
||||
|
||||
@@ -144,6 +144,7 @@
|
||||
<ClInclude Include="Frame.h" />
|
||||
<ClInclude Include="GameFrame.h" />
|
||||
<ClInclude Include="GameWorld.h" />
|
||||
<ClInclude Include="GLM.h" />
|
||||
<ClInclude Include="GUIManager.h" />
|
||||
<ClInclude Include="logging.h" />
|
||||
<ClInclude Include="glerror.h" />
|
||||
|
||||
@@ -154,6 +154,7 @@
|
||||
<ClInclude Include="Systems\TransformSystem.h">
|
||||
<Filter>Systems</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="GLM.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Shaders\Fragment.glsl">
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
#define GLM_FORCE_RADIANS
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/common.hpp>
|
||||
#include <glm/gtc/constants.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
#include <glm/gtx/rotate_vector.hpp>
|
||||
#include <glm/gtc/quaternion.hpp>
|
||||
#include <glm/gtx/quaternion.hpp>
|
||||
#include <glm/gtc/type_ptr.hpp>
|
||||
@@ -9,10 +9,7 @@
|
||||
#include <memory>
|
||||
|
||||
#include "OpenGL.h"
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/constants.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
#include <glm/gtc/type_ptr.hpp>
|
||||
#include "GLM.h"
|
||||
|
||||
#include <cstdlib>
|
||||
#include <stack>
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#include <GL/glew.h>
|
||||
#define GLFW_INCLUDE_GLU
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <glext.h>
|
||||
#define GLM_FORCE_RADIANS
|
||||
#include <glext.h>
|
||||
@@ -8,12 +8,7 @@
|
||||
#include <vector>
|
||||
|
||||
#include "OpenGL.h"
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/constants.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
#include <glm/gtc/type_ptr.hpp>
|
||||
#include <glm/gtc/quaternion.hpp>
|
||||
#include <glm/gtx/quaternion.hpp>
|
||||
#include "GLM.h"
|
||||
|
||||
#include "glerror.h"
|
||||
#include "Camera.h"
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
#include <AL/al.h>
|
||||
#include <AL/alc.h>
|
||||
#include <vector>
|
||||
#include <glm/gtx/quaternion.hpp>
|
||||
|
||||
namespace Systems
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user