baked more textures
This commit is contained in:
parent
8f0b7b7dd4
commit
eb996250ea
|
@ -72,7 +72,7 @@ void window::create()
|
||||||
shader::init_program();
|
shader::init_program();
|
||||||
|
|
||||||
MeshScene.bind();
|
MeshScene.bind();
|
||||||
MeshScene.load_model("../assets", "scene.obj");
|
MeshScene.load_model("../assets/scene", "scene.obj");
|
||||||
|
|
||||||
glm::mat4 mat = glm::mat4(1);
|
glm::mat4 mat = glm::mat4(1);
|
||||||
mat = glm::translate(mat, glm::vec3(-2.949, -1.7778 + 0.05, 3 - 0.05));
|
mat = glm::translate(mat, glm::vec3(-2.949, -1.7778 + 0.05, 3 - 0.05));
|
||||||
|
|
17
src/main.cpp
17
src/main.cpp
|
@ -1,6 +1,20 @@
|
||||||
|
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
|
||||||
|
#include <random>
|
||||||
|
#include <iostream>
|
||||||
|
#include <cmath>
|
||||||
|
|
||||||
|
#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/window.hpp"
|
||||||
#include "graphics/camera.hpp"
|
#include "graphics/camera.hpp"
|
||||||
|
|
||||||
|
@ -15,6 +29,9 @@ unsigned long get_now()
|
||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
|
std::random_device rd;
|
||||||
|
std::mt19937 rand(rd());
|
||||||
|
|
||||||
graphics::window::create();
|
graphics::window::create();
|
||||||
|
|
||||||
long clock = get_now();
|
long clock = get_now();
|
||||||
|
|
Loading…
Reference in New Issue