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

merge Develop into main after sprint 1 #1

Merged
SemvdH merged 55 commits from develop into main 2021-06-02 09:02:27 +00:00
Conversation 6 Commits 55 Files Changed 637 +2 -2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ad4075a826 - Show all commits

4
src/toolbox/toolbox.h
View File

@@ -5,8 +5,8 @@
namespace toolbox namespace toolbox
{ {
#define WINDOW_WIDTH 1400.0f #define WINDOW_WIDTH 1400
#define WINDOW_HEIGT 800.0f #define WINDOW_HEIGT 800
glm::mat4 CreateModelMatrix(glm::vec3 translation, glm::vec3 rotation, float scale); glm::mat4 CreateModelMatrix(glm::vec3 translation, glm::vec3 rotation, float scale);