Рефакторинг лабы 2, добавлен пункт 1 по методичке

lab2/CMakeLists.txt

@@ -8,9 +8,9 @@ find_package(GLEW REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(glm REQUIRED)
 
-add_executable(
+set(LIBS glfw GLEW::GLEW OpenGL::GL)
-        ${PROJECT_NAME}
 
+set(CORE_SOURCES
         src/main.cpp
         src/window/Camera.cpp
         src/window/Camera.h
@@ -22,8 +22,14 @@ add_executable(
         src/graphics/Mesh.cpp
         src/graphics/Shader.h
         src/graphics/Shader.cpp
-        src/graphics/MeshLoader.cpp src/graphics/MeshLoader.h src/render.cpp src/render.h)
+        src/graphics/MeshLoader.cpp
+        src/graphics/MeshLoader.h
+        src/render/render.h)
+
+add_executable(${PROJECT_NAME}_main ${CORE_SOURCES} src/render/render.cpp)
+target_link_libraries(${PROJECT_NAME}_main ${LIBS})
+
+add_executable(${PROJECT_NAME}_1 ${CORE_SOURCES} src/render/render-1.cpp)
+target_link_libraries(${PROJECT_NAME}_1 ${LIBS})
+
 
-target_link_libraries(${PROJECT_NAME} glfw)
-target_link_libraries(${PROJECT_NAME} GLEW::GLEW)
-target_link_libraries(${PROJECT_NAME} OpenGL::GL)

lab2/src/main.cpp

@@ -18,7 +18,7 @@
 #include "window/Events.h"
 #include "graphics/Mesh.h"
 #include "graphics/Shader.h"
-#include "render.h"
+#include "render/render.h"
 
 
 #define SPEED_FACTOR 2.5f

lab2/src/render/render.cpp

@@ -3,14 +3,15 @@
 //
 
 #include "render.h"
-#include "graphics/MeshLoader.h"
+#include "../graphics/MeshLoader.h"
-#include "graphics/Shader.h"
+#include "../graphics/Shader.h"
 
 #include <glm/ext/matrix_transform.hpp>
 
 static Mesh* mesh_xyz;
 static Mesh* mesh_snowman;
 static Mesh* mesh_three;
+static Mesh* mesh_table;
 
 static Shader* shader;
 
@@ -58,6 +59,8 @@ void renderScene(Camera& cam) {
     shader->uniformMatrix("model", glm::mat4(1.0f));
     mesh_xyz->draw();
 
+    mesh_table->draw();
+
     drawStaticSnowman();
     drawThree();
 }
@@ -81,6 +84,12 @@ int loadResources() {
         return -1;
     }
 
+    mesh_table = MeshLoader::loadMesh("res/table");
+    if (mesh_table == nullptr) {
+        std::cerr << "Failed to load 'table' mesh!" << std::endl;
+        return -1;
+    }
+
     shader = Shader::loadShader("res/main-colored.vsh", "res/main-colored.fsh");
     if (shader == nullptr) {
         return -1;
@@ -90,6 +99,7 @@ int loadResources() {
 }
 
 void unloadResources() {
+    delete mesh_table;
     delete mesh_xyz;
     delete mesh_snowman;
     delete mesh_three;

lab2/src/render/render.h

@@ -5,11 +5,10 @@
 #ifndef GRAPHICS_LABS_RENDER_H
 #define GRAPHICS_LABS_RENDER_H
 
-#include "window/Camera.h"
+#include "../window/Camera.h"
 
 int loadResources();
 void unloadResources();
-
 void renderScene(Camera& cam);
 
 #endif //GRAPHICS_LABS_RENDER_H