X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.cpp;h=cfb16822897a01027da39d62c3624da6fe7fd52b;hb=46509f82dcea114b004c53a7f3a9608f2518077f;hp=e8f92689f2fe8cc4cda80cc987baf0aa79b89819;hpb=66d7cf56cfbb565dd4700d94e5f338a39a40edeb;p=blank.git

diff --git a/src/app.cpp b/src/app.cpp
index e8f9268..cfb1682 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -1,7 +1,5 @@
 #include "app.hpp"
 
-#include "geometry.hpp"
-
 #include <iostream>
 #include <stdexcept>
 
@@ -16,37 +14,50 @@ Application::Application()
 , ctx(window.CreateContext())
 , init_glew()
 , program()
-, move_velocity(0.003f)
-, pitch_sensitivity(-0.0025f)
-, yaw_sensitivity(-0.001f)
 , cam()
 , world()
-, outline()
-, outline_visible(false)
-, outline_transform(1.0f)
-, running(false)
-, front(false)
-, back(false)
-, left(false)
-, right(false)
-, up(false)
-, down(false)
-, place(false)
-, remove(false)
-, pick(false)
-, remove_id(0)
-, place_id(1) {
+, interface(world)
+, test_controller(MakeTestEntity(world))
+, running(false) {
 	GLContext::EnableVSync();
 
-	GLuint VertexArrayID;
-	glGenVertexArrays(1, &VertexArrayID);
-	glBindVertexArray(VertexArrayID);
+	glClearColor(0.0, 0.0, 0.0, 1.0);
+}
 
-	cam.Position(glm::vec3(0, 4, 4));
+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;
+}
 
-	world.Generate();
 
-	glClearColor(0.0, 0.0, 0.0, 1.0);
+void Application::RunN(size_t n) {
+	Uint32 last = SDL_GetTicks();
+	for (size_t i = 0; i < n; ++i) {
+		Uint32 now = SDL_GetTicks();
+		int delta = now - last;
+		Loop(delta);
+		last = now;
+	}
+}
+
+void Application::RunT(size_t t) {
+	Uint32 last = SDL_GetTicks();
+	Uint32 finish = last + t;
+	while (last < finish) {
+		Uint32 now = SDL_GetTicks();
+		int delta = now - last;
+		Loop(delta);
+		last = now;
+	}
+}
+
+void Application::RunS(size_t n, size_t t) {
+	for (size_t i = 0; i < n; ++i) {
+		Loop(t);
+	}
 }
 
 
@@ -75,54 +86,34 @@ void Application::HandleEvents() {
 		switch (event.type) {
 			case SDL_KEYDOWN:
 			case SDL_KEYUP:
-				switch (event.key.keysym.sym) {
-					case SDLK_w:
-						front = event.key.state == SDL_PRESSED;
-						break;
-					case SDLK_s:
-						back = event.key.state == SDL_PRESSED;
-						break;
-					case SDLK_a:
-						left = event.key.state == SDL_PRESSED;
-						break;
-					case SDLK_d:
-						right = event.key.state == SDL_PRESSED;
-						break;
-					case SDLK_q:
-					case SDLK_SPACE:
-						up = event.key.state == SDL_PRESSED;
-						break;
-					case SDLK_e:
-					case SDLK_LSHIFT:
-						down = event.key.state == SDL_PRESSED;
-						break;
-				}
+				interface.Handle(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.Handle(event.button);
 				break;
 			case SDL_MOUSEMOTION:
-				cam.RotateYaw(event.motion.xrel * yaw_sensitivity);
-				cam.RotatePitch(event.motion.yrel * pitch_sensitivity);
+				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);
+						interface.Handle(event.window);
 						break;
 					default:
+						interface.Handle(event.window);
 						break;
 				}
 				break;
@@ -133,67 +124,9 @@ void Application::HandleEvents() {
 }
 
 void Application::Update(int dt) {
-	glm::vec3 vel;
-	if (right && !left) {
-		vel.x = move_velocity;
-	} else if (left && !right) {
-		vel.x = -move_velocity;
-	}
-	if (up && !down) {
-		vel.y = move_velocity;
-	} else if (down && !up) {
-		vel.y = -move_velocity;
-	}
-	if (back && !front) {
-		vel.z = move_velocity;
-	} else if (front && !back) {
-		vel.z = -move_velocity;
-	}
-	cam.OrientationVelocity(vel);
-
-	cam.Update(dt);
-
-	Ray aim = cam.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->BlockAt(blkid).type->FillOutlineModel(outline);
-		outline_transform = glm::translate(chunk->Transform(), pos);
-	} else {
-		outline_visible = false;
-	}
-
-	if (pick) {
-		if (chunk) {
-			place_id = chunk->BlockAt(blkid).type->id;
-		}
-		pick = false;
-	}
-	if (remove) {
-		if (chunk) {
-			chunk->BlockAt(blkid).type = world.BlockTypes()[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 * Chunk::Extent();
-			}
-			mod_chunk->BlockAt(next_pos).type = world.BlockTypes()[place_id];
-			mod_chunk->Invalidate();
-		}
-		place = false;
-	}
+	interface.Update(dt);
+	test_controller.Update(dt);
+	world.Update(dt);
 }
 
 void Application::Render() {
@@ -201,17 +134,10 @@ void Application::Render() {
 
 	program.Activate();
 
-	program.SetVP(cam.View(), cam.Projection());
+	program.SetProjection(cam.Projection());
+	world.Render(program);
 
-	for (Chunk &chunk : world.LoadedChunks()) {
-		program.SetM(chunk.Transform());
-		chunk.Draw();
-	}
-
-	if (outline_visible) {
-		program.SetM(outline_transform);
-		outline.Draw();
-	}
+	interface.Render(program);
 
 	window.Flip();
 }