sem/SDBA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[EDIT] code style guide - toolbox & main

Browse Source
This commit is contained in:
Menno
2021-05-18 11:31:25 +02:00
parent 5047467206
commit 0517f9e897
10 changed files with 20 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/toolbox/Toolbox.cpp → src/toolbox/math.cpp
View File

@@ -1,8 +1,8 @@
#include "Toolbox.h"
#include "math.h"
namespace toolbox
{
glm::mat4 createModelMatrix(glm::vec3 translation, glm::vec3 rotation, float scale)
glm::mat4 CreateModelMatrix(glm::vec3 translation, glm::vec3 rotation, float scale)
{
glm::mat4 matrix(1.0f);
matrix = glm::translate(matrix, translation);
@@ -13,14 +13,14 @@ namespace toolbox
return matrix;
}
glm::mat4 createViewMatrix(entities::Camera& camera)
glm::mat4 CreateViewMatrix(entities::Camera& camera)
{
glm::mat4 matrix(1.0f);
matrix = glm::rotate(matrix, glm::radians(camera.getRotation().x), glm::vec3(1, 0, 0));
matrix = glm::rotate(matrix, glm::radians(camera.getRotation().y), glm::vec3(0, 1, 0));
matrix = glm::rotate(matrix, glm::radians(camera.getRotation().z), glm::vec3(0, 0, 1));
const glm::vec3 negativeCamPos = glm::vec3(-camera.getPosition().x, -camera.getPosition().y, -camera.getPosition().z);
matrix = glm::translate(matrix, negativeCamPos);
const glm::vec3 negative_cam_pos = glm::vec3(-camera.getPosition().x, -camera.getPosition().y, -camera.getPosition().z);
matrix = glm::translate(matrix, negative_cam_pos);
return matrix;
}
}

4
src/toolbox/Toolbox.h → src/toolbox/math.h
View File

@@ -8,7 +8,7 @@ namespace toolbox
#define WINDOW_WIDTH 1400.0f
#define WINDOW_HEIGT 800.0f
glm::mat4 createModelMatrix(glm::vec3 translation, glm::vec3 rotation, float scale);
glm::mat4 CreateModelMatrix(glm::vec3 translation, glm::vec3 rotation, float scale);
glm::mat4 createViewMatrix(entities::Camera& camera);
glm::mat4 CreateViewMatrix(entities::Camera& camera);
}