Добавлен пункт 2 лабы 2

lab2/CMakeLists.txt

@@ -32,4 +32,5 @@ 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})
 
-
+add_executable(${PROJECT_NAME}_2 ${CORE_SOURCES} src/render/render-2.cpp)
+target_link_libraries(${PROJECT_NAME}_2 ${LIBS})

lab2/src/render/render-2.cpp

@@ -0,0 +1,94 @@
+//
+// Created by vlad on 23.03.23.
+//
+
+#include "render.h"
+#include "../graphics/MeshLoader.h"
+#include "../graphics/Shader.h"
+
+#include <glm/ext/matrix_transform.hpp>
+
+static Mesh* mesh_xyz;
+static Mesh* mesh_sphere;
+static Mesh* mesh_cone;
+
+static Shader* shader;
+
+
+static void drawSnowman() {
+    // снеговик, типа собран
+
+    // нижний шар
+    shader->uniformMatrix("model", glm::mat4(1.0f));
+    mesh_sphere->draw();
+
+    // шар 2
+    auto translate = glm::translate(glm::mat4(1.0f), glm::vec3(0, 1.5,0));
+    auto scale = glm::scale(glm::mat4(1.0f), glm::vec3(0.5, 0.5 ,0.5));
+    shader->uniformMatrix("model", translate * scale);
+    mesh_sphere->draw();
+
+    // глаз X- (со смещением по Z)
+    translate = glm::translate(glm::mat4(1.0f), glm::vec3(-0.25, 1.75, 0.25));
+    scale = glm::scale(glm::mat4(1.0f), glm::vec3(0.25, 0.25,0.25));
+    shader->uniformMatrix("model", translate * scale);
+    mesh_sphere->draw();
+
+    // глаз X+ (со смещением по Z)
+    translate = glm::translate(glm::mat4(1.0f), glm::vec3(0.25, 1.75, 0.25));
+    shader->uniformMatrix("model", translate * scale);
+    mesh_sphere->draw();
+
+    // нос, (со смещением по Z)
+    translate = glm::translate(glm::mat4(1.0f), glm::vec3(0, 1.5, 0.5));
+    auto rotate = glm::rotate(glm::mat4(1.0f), glm::radians(90.0f), glm::vec3(1, 0, 0));
+    shader->uniformMatrix("model",  translate * scale * rotate);
+    mesh_cone->draw();
+}
+
+
+void renderScene(Camera& cam) {
+    auto projview = cam.getProjection() * cam.getView();
+    shader->use();
+    shader->uniformMatrix("projview", projview);
+
+    // мировой центр
+    shader->uniformMatrix("model", glm::mat4(1.0f));
+    mesh_xyz->draw();
+
+    drawSnowman();
+}
+
+int loadResources() {
+    mesh_xyz = MeshLoader::loadMesh("res/xyz");
+    if (mesh_xyz == nullptr) {
+        std::cerr << "Failed to load 'xyz' mesh!" << std::endl;
+        return -1;
+    }
+
+    mesh_sphere = MeshLoader::loadMesh("res/sphere");
+    if (mesh_sphere == nullptr) {
+        std::cerr << "Failed to load 'sphere' mesh!" << std::endl;
+        return -1;
+    }
+
+    mesh_cone = MeshLoader::loadMesh("res/cone");
+    if (mesh_cone == nullptr) {
+        std::cerr << "Failed to load 'cone' mesh!" << std::endl;
+        return -1;
+    }
+
+    shader = Shader::loadShader("res/main-colored.vsh", "res/main-colored.fsh");
+    if (shader == nullptr) {
+        return -1;
+    }
+
+    return 0;
+}
+
+void unloadResources() {
+    delete mesh_xyz;
+    delete mesh_cone;
+    delete mesh_sphere;
+    delete shader;
+}