From a74d81b25b3714dfeeefa72032ae0f7dba590c7f Mon Sep 17 00:00:00 2001 From: Jay Robson Date: Thu, 25 Jan 2024 00:35:39 +1100 Subject: [PATCH] baked more textures --- src/graphics/window.cpp | 2 +- src/main.cpp | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/graphics/window.cpp b/src/graphics/window.cpp index e9a3c54..32bdfba 100644 --- a/src/graphics/window.cpp +++ b/src/graphics/window.cpp @@ -72,7 +72,7 @@ void window::create() shader::init_program(); MeshScene.bind(); - MeshScene.load_model("../assets", "scene.obj"); + MeshScene.load_model("../assets/scene", "scene.obj"); glm::mat4 mat = glm::mat4(1); mat = glm::translate(mat, glm::vec3(-2.949, -1.7778 + 0.05, 3 - 0.05)); diff --git a/src/main.cpp b/src/main.cpp index 339c057..2a6c134 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,20 @@ #include +#include +#include +#include + +#include "reactor/builder.hpp" +#include "reactor/control/control_rod.hpp" +#include "reactor/fuel/fuel_rod.hpp" +#include "reactor/coolant/pipe.hpp" +#include "reactor/coolant/heater.hpp" +#include "reactor/coolant/vessel.hpp" +#include "coolant/fluid_t.hpp" +#include "coolant/valve.hpp" +#include "coolant/pump.hpp" + #include "graphics/window.hpp" #include "graphics/camera.hpp" @@ -15,6 +29,9 @@ unsigned long get_now() int main() { + std::random_device rd; + std::mt19937 rand(rd()); + graphics::window::create(); long clock = get_now();