lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-30 20:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Solve merge conflict

Browse Source 
Conflicts:
	CMakeLists.txt
This commit is contained in:
Joey de Vries
2015-03-31 17:02:36 +02:00
parent 3321b60f79 5fa7656460
commit 7efd3c1e40
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/learnopengl/camera.h
View File

@@ -4,7 +4,7 @@
#include <vector> #include <vector>
// GL Includes // GL Includes
#include <GL\glew.h> #include <GL/glew.h>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
@@ -130,4 +130,4 @@ private:
this->Right = glm::normalize(glm::cross(this->Front, this->WorldUp)); // Normalize the vectors, because their length gets closer to 0 the more you look up or down which results in slower movement. this->Right = glm::normalize(glm::cross(this->Front, this->WorldUp)); // Normalize the vectors, because their length gets closer to 0 the more you look up or down which results in slower movement.
this->Up = glm::normalize(glm::cross(this->Right, this->Front)); this->Up = glm::normalize(glm::cross(this->Right, this->Front));
} }
}; };

4
includes/learnopengl/model.h
View File

@@ -16,7 +16,7 @@ using namespace std;
#include <assimp/scene.h> #include <assimp/scene.h>
#include <assimp/postprocess.h> #include <assimp/postprocess.h>
#include "Mesh.h" #include <learnopengl/mesh.h>
GLint TextureFromFile(const char* path, string directory); GLint TextureFromFile(const char* path, string directory);
@@ -208,4 +208,4 @@ GLint TextureFromFile(const char* path, string directory)
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
SOIL_free_image_data(image); SOIL_free_image_data(image);
return textureID; return textureID;
} }