Merge pull request #20 from jcarlos0305/feature/release_hotfix

Moved shaders and updated the paths
jcarlos0305 · Nov 29, 2020 · ee5e85c · ee5e85c
2 parents a289825 + c31069c
commit ee5e85c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/fragment.glsl → Game/assets/fragment.glsl b/fragment.glsl → Game/assets/fragment.glsl
diff --git a/vertex.glsl → Game/assets/vertex.glsl b/vertex.glsl → Game/assets/vertex.glsl
diff --git a/Game/imgui.ini b/Game/imgui.ini
@@ -14,8 +14,8 @@ Size=450,333
 Collapsed=0
 
 [Window][About]
-Pos=85,141
-Size=321,180
+Pos=608,198
+Size=321,216
 Collapsed=0
 
 [Window][Configuration]

diff --git a/ModuleModel.cpp b/ModuleModel.cpp
@@ -35,7 +35,7 @@ void ModuleModel::Load(const char* file_path) {
 
 	if (strcmp(file_ext, ".fbx") == 0) {
 		LOG("Loading model %s", file_path);
-		Load(file_path, "../vertex.glsl", "../fragment.glsl");
+		Load(file_path, "assets/vertex.glsl", "assets/fragment.glsl");
 	}
 	else if (strcmp(file_ext, ".png") == 0 || strcmp(file_ext, ".dds") == 0 || strcmp(file_ext, ".jpg") == 0 || strcmp(file_ext, ".jpeg") == 0) {
 		LOG("Loading texture %s", file_path);
@@ -54,7 +54,6 @@ void ModuleModel::Load(const char* file_path) {
 
 void ModuleModel::Load(const char* model_path, const char* vertex_shader_path, const char* fragment_shader_path) {
 	unsigned int program = CreateProgram(vertex_shader_path, fragment_shader_path);
-
 	const aiScene* scene = aiImportFile(model_path, aiProcessPreset_TargetRealtime_MaxQuality);
 	if (program && scene) {
 		LOG("Shaders program created successfully!\n");

diff --git a/ModuleRender.cpp b/ModuleRender.cpp
@@ -31,7 +31,7 @@ bool ModuleRender::Init() {
 	glFrontFace(GL_CCW);
 
 	/* Load the baker's house with the shaders */
-	App->model->Load("assets/BakerHouse.fbx", "../vertex.glsl", "../fragment.glsl");
+	App->model->Load("assets/BakerHouse.fbx", "assets/vertex.glsl", "assets/fragment.glsl");
 
 	glGenFramebuffers(1, &fbo);