From 208d1785f25cc88ac50d52dd0ac90c5a65d8ba29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0toura=C4=8D?= <525032@mail.muni.cz>
Date: Tue, 8 Aug 2023 22:04:35 +0200
Subject: [PATCH] new branch
---
src/studio/src/simulator.cpp | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/studio/src/simulator.cpp b/src/studio/src/simulator.cpp
index 4ee105f..1bdd05b 100644
--- a/src/studio/src/simulator.cpp
+++ b/src/studio/src/simulator.cpp
@@ -274,17 +274,21 @@ void Simulator::create_scene()
Object cube(lit_cube_vertices, lit_cube_indices, lit_cube_normals);
scene.emplace_back(std::make_shared<Node>(std::make_shared<Frame>(Frame{})));
scene.back()->addObject(std::make_shared<Object>(std::move(cube)));
+ auto cube_ptr = scene.back()->getObjects()[0];
- // AXIS OBJECT
- Object axis(axis_obj_vertices, axis_obj_indices, axis_obj_normals);
- axis.setShaderType("basic");
- scene.emplace_back(std::make_shared<Node>(std::make_shared<Frame>(Frame{glm::vec3(3, 2, 0)})));
- scene.back()->addObject(std::make_shared<Object>(std::move(axis)));
+ // // AXIS OBJECT
+ // Object axis(axis_obj_vertices, axis_obj_indices, axis_obj_normals);
+ // axis.setShaderType("basic");
+ // scene.emplace_back(std::make_shared<Node>(std::make_shared<Frame>(Frame{glm::vec3(3, 2, 0)})));
+ // scene.back()->addObject(std::make_shared<Object>(std::move(axis)));
+ scene.emplace_back(std::make_shared<Node>(std::make_shared<Frame>(Frame{glm::vec3(5, 1, -4)})));
+ scene.back()->addObject(cube_ptr);
// TRIANGLE
Object triangle(triangle_vertices, triangle_indices);
triangle.setShaderType("basic");
- scene.emplace_back(std::make_shared<Node>(std::make_shared<Frame>(Frame{glm::vec3(-2, 1, 0)})));
+ //scene.emplace_back(std::make_shared<Node>(std::make_shared<Frame>(Frame{glm::vec3(-2, 1, 0)})));
+ scene.emplace_back(std::make_shared<Node>(std::make_shared<Frame>(Frame{glm::vec3(0, -0.5f, 0)})));
scene.back()->addObject(std::make_shared<Object>(std::move(triangle)));
/* ADD LIGHT CUBE AND ITS LIGHT */
--
GitLab