X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.cpp;h=9ec9384f9ce749198af886d8fb16cff93c5d5ac3;hb=8881c507009521d08648560984c0f50166224542;hp=c418660ec48d209be4fef8ba2074c3aa1bb192ee;hpb=2d8c7c015478a4528c0909f11d43998b1393948d;p=blank.git

diff --git a/src/app.cpp b/src/app.cpp
index c418660..9ec9384 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -41,7 +41,12 @@ Application::Application()
 , left(false)
 , right(false)
 , up(false)
-, down(false) {
+, down(false)
+, place(false)
+, remove(false)
+, pick(false)
+, remove_id(0)
+, place_id(1) {
 	GLContext::EnableVSync();
 	GLContext::EnableDepthTest();
 	GLContext::EnableBackfaceCulling();
@@ -163,10 +168,6 @@ Application::Application()
 	glClearColor(0.0, 0.0, 0.0, 1.0);
 }
 
-Application::~Application() {
-
-}
-
 
 void Application::Run() {
 	running = true;
@@ -214,6 +215,18 @@ void Application::HandleEvents() {
 						break;
 				}
 				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;
+				}
+				break;
 			case SDL_MOUSEMOTION:
 				cam.RotateYaw(event.motion.xrel * yaw_sensitivity);
 				cam.RotatePitch(event.motion.yrel * pitch_sensitivity);
@@ -260,13 +273,36 @@ void Application::Update(int dt) {
 	Ray aim = cam.Aim();
 	int blkid;
 	float dist;
-	if (chunk.Intersection(aim, glm::mat4(1.0f), &blkid, &dist)) {
+	glm::vec3 normal;
+	if (chunk.Intersection(aim, glm::mat4(1.0f), &blkid, &dist, &normal)) {
 		glm::vec3 pos = Chunk::ToCoords(blkid);
 		outline_visible = true;
 		outline_transform = glm::translate(glm::mat4(1.0f), pos);
 	} else {
 		outline_visible = false;
 	}
+
+	if (pick) {
+		if (outline_visible) {
+			place_id = chunk.BlockAt(blkid).type->id;
+		}
+		pick = false;
+	}
+	if (remove) {
+		chunk.BlockAt(blkid).type = blockType[remove_id];
+		chunk.Invalidate();
+		remove = false;
+	}
+	if (place) {
+		if (outline_visible) {
+			int next_blkid = Chunk::ToIndex(Chunk::ToCoords(blkid) + normal);
+			if (next_blkid >= 0 && next_blkid < Chunk::Size()) {
+				chunk.BlockAt(next_blkid).type = blockType[place_id];
+				chunk.Invalidate();
+			}
+		}
+		place = false;
+	}
 }
 
 void Application::Render() {