X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.cpp;h=57651e3b754370602eca2d92706dd000573df1fb;hb=e53a0e2e711a7d8bd9b0ddacd1360aa14370643f;hp=0f1277535367ca060caffbcf018dd4a356630623;hpb=374843f5b3ae60c0d02704a8da5100ac8abe7f1a;p=blank.git

diff --git a/src/app.cpp b/src/app.cpp
index 0f12775..57651e3 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -1,42 +1,40 @@
 #include "app.hpp"
 
-#include "geometry.hpp"
-
 #include <iostream>
 #include <stdexcept>
 
 
 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()
-, hud()
-, world()
-, controller(world.Player())
-, outline()
-, outline_visible(false)
-, outline_transform(1.0f)
-, running(false)
-, place(false)
-, remove(false)
-, pick(false)
-, remove_id(0)
-, place_id(1) {
-	GLContext::EnableVSync();
-
-	hud.Viewport(960, 600);
-	hud.Display(*world.BlockTypes()[place_id]);
+, world(config.world)
+, interface(config.interface, world)
+, test_controller(MakeTestEntity(world))
+, running(false) {
+	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();
@@ -90,34 +88,40 @@ void Application::HandleEvents() {
 	while (SDL_PollEvent(&event)) {
 		switch (event.type) {
 			case SDL_KEYDOWN:
+				interface.HandlePress(event.key);
+				break;
 			case SDL_KEYUP:
-				controller.HandleKeyboard(event.key);
+				interface.HandleRelease(event.key);
 				break;
 			case SDL_MOUSEBUTTONDOWN:
-				if (event.button.button == 1) {
-					// left
-					remove = true;
-				} else if (event.button.button == 2) {
-					// middle
-					pick = true;
-				} else if (event.button.button == 3) {
-					// right
-					place = true;
-				}
+				interface.HandlePress(event.button);
+				break;
+			case SDL_MOUSEBUTTONUP:
+				interface.HandleRelease(event.button);
 				break;
 			case SDL_MOUSEMOTION:
-				controller.HandleMouse(event.motion);
+				interface.Handle(event.motion);
+				break;
+			case SDL_MOUSEWHEEL:
+				interface.Handle(event.wheel);
 				break;
 			case SDL_QUIT:
 				running = false;
 				break;
 			case SDL_WINDOWEVENT:
 				switch (event.window.event) {
+					case SDL_WINDOWEVENT_FOCUS_GAINED:
+						window.GrabMouse();
+						break;
+					case SDL_WINDOWEVENT_FOCUS_LOST:
+						window.ReleaseMouse();
+						break;
 					case SDL_WINDOWEVENT_RESIZED:
 						cam.Viewport(event.window.data1, event.window.data2);
-						hud.Viewport(event.window.data1, event.window.data2);
+						interface.Handle(event.window);
 						break;
 					default:
+						interface.Handle(event.window);
 						break;
 				}
 				break;
@@ -128,68 +132,20 @@ void Application::HandleEvents() {
 }
 
 void Application::Update(int dt) {
-	controller.Update(dt);
+	interface.Update(dt);
+	test_controller.Update(dt);
 	world.Update(dt);
-
-	Ray aim = controller.Aim();
-	Chunk *chunk;
-	int blkid;
-	float dist;
-	glm::vec3 normal;
-	if (world.Intersection(aim, glm::mat4(1.0f), &chunk, &blkid, &dist, &normal)) {
-		glm::vec3 pos = Chunk::ToCoords(blkid);
-		outline_visible = true;
-		outline.Clear();
-		chunk->Type(chunk->BlockAt(blkid)).FillOutlineModel(outline);
-		outline_transform = glm::translate(chunk->Transform(world.Player().ChunkCoords()), pos);
-		outline_transform = glm::scale(outline_transform, glm::vec3(1.0001f));
-	} else {
-		outline_visible = false;
-	}
-
-	if (pick) {
-		if (chunk) {
-			place_id = chunk->BlockAt(blkid).type;
-			hud.Display(*world.BlockTypes()[place_id]);
-		}
-		pick = false;
-	}
-	if (remove) {
-		if (chunk) {
-			chunk->BlockAt(blkid).type = remove_id;
-			chunk->Invalidate();
-		}
-		remove = false;
-	}
-	if (place) {
-		if (chunk) {
-			Chunk *mod_chunk = chunk;
-			glm::vec3 next_pos = Chunk::ToCoords(blkid) + normal;
-			if (!Chunk::InBounds(next_pos)) {
-				mod_chunk = &world.Next(*chunk, normal);
-				next_pos -= normal * glm::vec3(Chunk::Extent());
-			}
-			mod_chunk->BlockAt(next_pos).type = place_id;
-			mod_chunk->Invalidate();
-		}
-		place = false;
-	}
 }
 
 void Application::Render() {
 	GLContext::Clear();
 
-	program.Activate();
+	chunk_prog.SetProjection(cam.Projection());
+	entity_prog.SetProjection(cam.Projection());
 
-	program.SetProjection(cam.Projection());
-	world.Render(program);
-
-	if (outline_visible) {
-		program.SetM(outline_transform);
-		outline.Draw();
-	}
+	world.Render(chunk_prog, entity_prog);
 
-	hud.Render(program);
+	interface.Render(entity_prog);
 
 	window.Flip();
 }