X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Finterface.cpp;h=dddb7324f965fc7fe2a4f90810837b7e3e6598c2;hb=c877ddd21f402381d88a6bebdd5c7c0b4ac28ba9;hp=03c059f7301dfb644b2ef7ddbebce72a91ad3eb5;hpb=5a8964bc8bc4108febe8eca3b03cb901824ac90b;p=blank.git

diff --git a/src/interface.cpp b/src/interface.cpp
index 03c059f..dddb732 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -11,7 +11,7 @@
 
 namespace blank {
 
-Interface::Interface(World &world)
+Interface::Interface(const Config &config, World &world)
 : world(world)
 , ctrl(world.Player())
 , hud(world.BlockTypes())
@@ -20,9 +20,7 @@ Interface::Interface(World &world)
 , aim_normal()
 , outline()
 , outline_transform(1.0f)
-, move_velocity(0.005f)
-, pitch_sensitivity(-0.0025f)
-, yaw_sensitivity(-0.001f)
+, config(config)
 , remove(0)
 , selection(1)
 , front(false)
@@ -37,6 +35,8 @@ Interface::Interface(World &world)
 
 
 void Interface::Handle(const SDL_KeyboardEvent &event) {
+	if (config.keyboard_disabled) return;
+
 	switch (event.keysym.sym) {
 		case SDLK_w:
 			front = event.state == SDL_PRESSED;
@@ -73,6 +73,16 @@ void Interface::Handle(const SDL_KeyboardEvent &event) {
 				PrintBlockInfo();
 			}
 			break;
+		case SDLK_c:
+			if (event.state == SDL_PRESSED) {
+				PrintChunkInfo();
+			}
+			break;
+		case SDLK_l:
+			if (event.state == SDL_PRESSED) {
+				PrintLightInfo();
+			}
+			break;
 		case SDLK_p:
 			if (event.state == SDL_PRESSED) {
 				PrintSelectionInfo();
@@ -104,6 +114,45 @@ void Interface::PrintBlockInfo() {
 	Print(aim_chunk->BlockAt(aim_block));
 }
 
+void Interface::PrintChunkInfo() {
+	std::cout << std::endl;
+	if (!aim_chunk) {
+		std::cout << "not looking at any block" << std::endl;
+		return;
+	}
+	std::cout << "looking at chunk "
+		<< aim_chunk->Position()
+		<< std::endl;
+
+	std::cout << "  neighbors:";
+	if (aim_chunk->HasNeighbor(Block::FACE_LEFT)) {
+		std::cout << " left";
+	}
+	if (aim_chunk->HasNeighbor(Block::FACE_RIGHT)) {
+		std::cout << " right";
+	}
+	if (aim_chunk->HasNeighbor(Block::FACE_UP)) {
+		std::cout << " up";
+	}
+	if (aim_chunk->HasNeighbor(Block::FACE_DOWN)) {
+		std::cout << " down";
+	}
+	if (aim_chunk->HasNeighbor(Block::FACE_FRONT)) {
+		std::cout << " front";
+	}
+	if (aim_chunk->HasNeighbor(Block::FACE_BACK)) {
+		std::cout << " back";
+	}
+	std::cout << std::endl;
+}
+
+void Interface::PrintLightInfo() {
+	std::cout
+		<< "light level " << world.PlayerChunk().GetLight(world.Player().Position())
+		<< " at position " << world.Player().Position()
+		<< std::endl;
+}
+
 void Interface::PrintSelectionInfo() {
 	std::cout << std::endl;
 	Print(selection);
@@ -118,11 +167,14 @@ void Interface::Print(const Block &block) {
 
 
 void Interface::Handle(const SDL_MouseMotionEvent &event) {
-	ctrl.RotateYaw(event.xrel * yaw_sensitivity);
-	ctrl.RotatePitch(event.yrel * pitch_sensitivity);
+	if (config.mouse_disabled) return;
+	ctrl.RotateYaw(event.xrel * config.yaw_sensitivity);
+	ctrl.RotatePitch(event.yrel * config.pitch_sensitivity);
 }
 
 void Interface::Handle(const SDL_MouseButtonEvent &event) {
+	if (config.mouse_disabled) return;
+
 	if (event.state != SDL_PRESSED) return;
 
 	if (event.button == 1) {
@@ -148,18 +200,20 @@ void Interface::PlaceBlock() {
 		mod_chunk = &world.Next(*aim_chunk, aim_normal);
 		next_pos -= aim_normal * glm::vec3(Chunk::Extent());
 	}
-	mod_chunk->BlockAt(next_pos) = selection;
+	mod_chunk->SetBlock(next_pos, selection);
 	mod_chunk->Invalidate();
 }
 
 void Interface::RemoveBlock() {
 	if (!aim_chunk) return;
-	aim_chunk->BlockAt(aim_block) = remove;
+	aim_chunk->SetBlock(aim_block, remove);
 	aim_chunk->Invalidate();
 }
 
 
 void Interface::Handle(const SDL_MouseWheelEvent &event) {
+	if (config.mouse_disabled) return;
+
 	if (event.y < 0) {
 		SelectNext();
 	} else if (event.y > 0) {
@@ -193,19 +247,19 @@ void Interface::Handle(const SDL_WindowEvent &event) {
 void Interface::Update(int dt) {
 	glm::vec3 vel;
 	if (right && !left) {
-		vel.x = move_velocity;
+		vel.x = config.move_velocity;
 	} else if (left && !right) {
-		vel.x = -move_velocity;
+		vel.x = -config.move_velocity;
 	}
 	if (up && !down) {
-		vel.y = move_velocity;
+		vel.y = config.move_velocity;
 	} else if (down && !up) {
-		vel.y = -move_velocity;
+		vel.y = -config.move_velocity;
 	}
 	if (back && !front) {
-		vel.z = move_velocity;
+		vel.z = config.move_velocity;
 	} else if (front && !back) {
-		vel.z = -move_velocity;
+		vel.z = -config.move_velocity;
 	}
 	ctrl.Velocity(vel);
 	ctrl.Update(dt);
@@ -226,6 +280,8 @@ void Interface::Update(int dt) {
 
 
 void Interface::Render(DirectionalLighting &program) {
+	if (config.visual_disabled) return;
+
 	if (aim_chunk) {
 		program.SetM(outline_transform);
 		outline.Draw();