X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.cpp;h=6a87042cffe553f621939e944bd6d81c37b5a39c;hb=4485397da18a25dfd1a51e864814887b66ba0f2e;hp=4a890d56a61f0cdc10bf5b7a7d9b5cfc3661d256;hpb=c3c5045f06327db2a3c97eae77a072bc06677286;p=blank.git

diff --git a/src/app.cpp b/src/app.cpp
index 4a890d5..6a87042 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -6,23 +6,35 @@
 
 namespace blank {
 
-Application::Application()
+Application::Application(const Config &config)
 : init_sdl()
 , init_img()
-, init_gl()
+, init_gl(config.doublebuf, config.multisampling)
 , window()
 , ctx(window.CreateContext())
 , init_glew()
-, program()
+, chunk_prog()
+, entity_prog()
 , cam()
-, world()
-, interface(world)
+, world(config.world)
+, interface(config.interface, world)
+, test_controller(MakeTestEntity(world))
 , running(false) {
-	GLContext::EnableVSync();
+	if (config.vsync) {
+		GLContext::EnableVSync();
+	}
 
 	glClearColor(0.0, 0.0, 0.0, 1.0);
 }
 
+Entity &Application::MakeTestEntity(World &world) {
+	Entity &e = world.AddEntity();
+	e.Position({ 0.0f, 0.0f, 0.0f });
+	e.SetShape(world.BlockTypes()[1]->shape, { 1.0f, 1.0f, 0.0f });
+	e.AngularVelocity(glm::quat(glm::vec3{ 0.00001f, 0.000006f, 0.000013f }));
+	return e;
+}
+
 
 void Application::RunN(size_t n) {
 	Uint32 last = SDL_GetTicks();
@@ -116,18 +128,19 @@ void Application::HandleEvents() {
 
 void Application::Update(int dt) {
 	interface.Update(dt);
+	test_controller.Update(dt);
 	world.Update(dt);
 }
 
 void Application::Render() {
 	GLContext::Clear();
 
-	program.Activate();
+	chunk_prog.SetProjection(cam.Projection());
+	entity_prog.SetProjection(cam.Projection());
 
-	program.SetProjection(cam.Projection());
-	world.Render(program);
+	world.Render(chunk_prog, entity_prog);
 
-	interface.Render(program);
+	interface.Render(entity_prog);
 
 	window.Flip();
 }