X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2Fui.cpp;h=ef005f6dea778ec8f243a8087e7167c0368f59f1;hb=82ec71079e4763f2b2d66c0c210e37df40c89034;hp=43a5f5d1ca68ef5b44d9ad3766d99e1154dd5670;hpb=0e3f96ecb9ade07a7b831078fee025aff44d44d4;p=blank.git

diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp
index 43a5f5d..ef005f6 100644
--- a/src/ui/ui.cpp
+++ b/src/ui/ui.cpp
@@ -1,11 +1,15 @@
 #include "HUD.hpp"
 #include "Interface.hpp"
+#include "Keymap.hpp"
 
 #include "../app/Assets.hpp"
+#include "../app/Environment.hpp"
 #include "../app/FrameCounter.hpp"
 #include "../app/init.hpp"
+#include "../audio/Audio.hpp"
 #include "../graphics/Font.hpp"
 #include "../graphics/Viewport.hpp"
+#include "../io/TokenStreamReader.hpp"
 #include "../model/shapes.hpp"
 #include "../world/World.hpp"
 
@@ -33,15 +37,16 @@ HUD::HUD(const BlockTypeRegistry &types, const Font &font)
 	block_transform = glm::rotate(block_transform, 3.5f, glm::vec3(1.0f, 0.0f, 0.0f));
 	block_transform = glm::rotate(block_transform, 0.35f, glm::vec3(0.0f, 1.0f, 0.0f));
 
-	crosshair.vertices = std::vector<glm::vec3>({
+	OutlineModel::Buffer buf;
+	buf.vertices = std::vector<glm::vec3>({
 		{ -10.0f,   0.0f, 0.0f }, { 10.0f,  0.0f, 0.0f },
 		{   0.0f, -10.0f, 0.0f }, {  0.0f, 10.0f, 0.0f },
 	});
-	crosshair.indices = std::vector<OutlineModel::Index>({
+	buf.indices = std::vector<OutlineModel::Index>({
 		0, 1, 2, 3
 	});
-	crosshair.colors.resize(4, { 10.0f, 10.0f, 10.0f });
-	crosshair.Invalidate();
+	buf.colors.resize(4, { 10.0f, 10.0f, 10.0f });
+	crosshair.Update(buf);
 
 	block_label.Position(
 		glm::vec3(50.0f, 85.0f, 0.0f),
@@ -57,7 +62,7 @@ void HUD::Display(const Block &b) {
 	const BlockType &type = types.Get(b.type);
 
 	block_buf.Clear();
-	type.FillModel(block_buf, b.Transform());
+	type.FillEntityModel(block_buf, b.Transform());
 	block.Update(block_buf);
 
 	block_label.Set(font, type.label);
@@ -69,17 +74,18 @@ void HUD::Display(const Block &b) {
 void HUD::Render(Viewport &viewport) noexcept {
 	viewport.ClearDepth();
 
-	DirectionalLighting &world_prog = viewport.HUDProgram();
-	world_prog.SetLightDirection({ 1.0f, 3.0f, 5.0f });
-	// disable distance fog
-	world_prog.SetFogDensity(0.0f);
-
+	PlainColor &outline_prog = viewport.HUDOutlineProgram();
 	viewport.EnableInvertBlending();
 	viewport.SetCursor(glm::vec3(0.0f), Gravity::CENTER);
-	world_prog.SetM(viewport.Cursor());
+	outline_prog.SetM(viewport.Cursor());
 	crosshair.Draw();
 
 	if (block_visible) {
+		DirectionalLighting &world_prog = viewport.HUDProgram();
+		world_prog.SetLightDirection({ 1.0f, 3.0f, 5.0f });
+		// disable distance fog
+		world_prog.SetFogDensity(0.0f);
+
 		viewport.DisableBlending();
 		world_prog.SetM(block_transform);
 		block.Draw();
@@ -90,14 +96,12 @@ void HUD::Render(Viewport &viewport) noexcept {
 
 Interface::Interface(
 	const Config &config,
-	const Assets &assets,
-	const FrameCounter &counter,
+	Environment &env,
 	World &world)
-: counter(counter)
+: env(env)
 , world(world)
 , ctrl(world.Player())
-, font(assets.LoadFont("DejaVuSans", 16))
-, hud(world.BlockTypes(), font)
+, hud(world.BlockTypes(), env.assets.small_ui_font)
 , aim{{ 0, 0, 0 }, { 0, 0, -1 }}
 , aim_chunk(nullptr)
 , aim_block(0)
@@ -105,19 +109,29 @@ Interface::Interface(
 , outline()
 , outline_transform(1.0f)
 , counter_text()
-, messages(font)
+, position_text()
+, orientation_text()
+, messages(env.assets.small_ui_font)
 , msg_timer(5000)
 , config(config)
 , place_timer(256)
 , remove_timer(256)
 , remove(0)
 , selection(1)
+, place_sound(env.assets.LoadSound("thump"))
+, remove_sound(env.assets.LoadSound("plop"))
 , fwd(0)
-, rev(0) {
-	counter_text.Hide();
+, rev(0)
+, debug(false) {
 	counter_text.Position(glm::vec3(-25.0f, 25.0f, 0.0f), Gravity::NORTH_EAST);
 	counter_text.Foreground(glm::vec4(1.0f));
 	counter_text.Background(glm::vec4(0.5f));
+	position_text.Position(glm::vec3(-25.0f, 25.0f + env.assets.small_ui_font.LineSkip(), 0.0f), Gravity::NORTH_EAST);
+	position_text.Foreground(glm::vec4(1.0f));
+	position_text.Background(glm::vec4(0.5f));
+	orientation_text.Position(glm::vec3(-25.0f, 25.0f + 2 * env.assets.small_ui_font.LineSkip(), 0.0f), Gravity::NORTH_EAST);
+	orientation_text.Foreground(glm::vec4(1.0f));
+	orientation_text.Background(glm::vec4(0.5f));
 	messages.Position(glm::vec3(25.0f, -25.0f, 0.0f), Gravity::SOUTH_WEST);
 	messages.Foreground(glm::vec4(1.0f));
 	messages.Background(glm::vec4(0.5f));
@@ -128,52 +142,81 @@ Interface::Interface(
 void Interface::HandlePress(const SDL_KeyboardEvent &event) {
 	if (config.keyboard_disabled) return;
 
-	switch (event.keysym.sym) {
-		case SDLK_w:
+	switch (env.keymap.Lookup(event)) {
+		case Keymap::MOVE_FORWARD:
 			rev.z = 1;
 			break;
-		case SDLK_s:
+		case Keymap::MOVE_BACKWARD:
 			fwd.z = 1;
 			break;
-		case SDLK_a:
+		case Keymap::MOVE_LEFT:
 			rev.x = 1;
 			break;
-		case SDLK_d:
+		case Keymap::MOVE_RIGHT:
 			fwd.x = 1;
 			break;
-		case SDLK_SPACE:
+		case Keymap::MOVE_UP:
 			fwd.y = 1;
 			break;
-		case SDLK_LSHIFT:
+		case Keymap::MOVE_DOWN:
 			rev.y = 1;
 			break;
 
-		case SDLK_q:
+		case Keymap::BLOCK_FACE:
 			FaceBlock();
 			break;
-		case SDLK_e:
+		case Keymap::BLOCK_TURN:
 			TurnBlock();
 			break;
+		case Keymap::BLOCK_NEXT:
+			SelectNext();
+			break;
+		case Keymap::BLOCK_PREV:
+			SelectPrevious();
+			break;
 
-		case SDLK_n:
+		case Keymap::BLOCK_PLACE:
+			PlaceBlock();
+			break;
+		case Keymap::BLOCK_PICK:
+			PickBlock();
+			break;
+		case Keymap::BLOCK_REMOVE:
+			RemoveBlock();
+			break;
+
+		case Keymap::TOGGLE_COLLISION:
 			ToggleCollision();
 			break;
 
-		case SDLK_b:
+		case Keymap::PRINT_BLOCK:
 			PrintBlockInfo();
 			break;
-		case SDLK_c:
+		case Keymap::PRINT_CHUNK:
 			PrintChunkInfo();
 			break;
-		case SDLK_l:
+		case Keymap::PRINT_LIGHT:
 			PrintLightInfo();
 			break;
-		case SDLK_p:
+		case Keymap::PRINT_SELECTION:
 			PrintSelectionInfo();
 			break;
 
-		case SDLK_F3:
-			ToggleCounter();
+		case Keymap::TOGGLE_VISUAL:
+			ToggleVisual();
+			break;
+		case Keymap::TOGGLE_DEBUG:
+			ToggleDebug();
+			break;
+		case Keymap::TOGGLE_AUDIO:
+			ToggleAudio();
+			break;
+
+		case Keymap::EXIT:
+			env.state.Pop();
+			break;
+
+		default:
 			break;
 	}
 }
@@ -181,25 +224,28 @@ void Interface::HandlePress(const SDL_KeyboardEvent &event) {
 void Interface::HandleRelease(const SDL_KeyboardEvent &event) {
 	if (config.keyboard_disabled) return;
 
-	switch (event.keysym.sym) {
-		case SDLK_w:
+	switch (env.keymap.Lookup(event)) {
+		case Keymap::MOVE_FORWARD:
 			rev.z = 0;
 			break;
-		case SDLK_s:
+		case Keymap::MOVE_BACKWARD:
 			fwd.z = 0;
 			break;
-		case SDLK_a:
+		case Keymap::MOVE_LEFT:
 			rev.x = 0;
 			break;
-		case SDLK_d:
+		case Keymap::MOVE_RIGHT:
 			fwd.x = 0;
 			break;
-		case SDLK_SPACE:
+		case Keymap::MOVE_UP:
 			fwd.y = 0;
 			break;
-		case SDLK_LSHIFT:
+		case Keymap::MOVE_DOWN:
 			rev.y = 0;
 			break;
+
+		default:
+			break;
 	}
 }
 
@@ -308,20 +354,53 @@ void Interface::Print(const Block &block) {
 	PostMessage(s.str());
 }
 
-void Interface::ToggleCounter() {
-	counter_text.Toggle();
-	if (counter_text.Visible()) {
+void Interface::ToggleAudio() {
+	config.audio_disabled = !config.audio_disabled;
+	if (config.audio_disabled) {
+		PostMessage("audio off");
+	} else {
+		PostMessage("audio on");
+	}
+}
+
+void Interface::ToggleVisual() {
+	config.visual_disabled = !config.visual_disabled;
+	if (config.visual_disabled) {
+		PostMessage("visual off");
+	} else {
+		PostMessage("visual on");
+	}
+}
+
+void Interface::ToggleDebug() {
+	debug = !debug;
+	if (debug) {
 		UpdateCounter();
+		UpdatePosition();
+		UpdateOrientation();
 	}
 }
 
 void Interface::UpdateCounter() {
 	std::stringstream s;
 	s << std::setprecision(3) <<
-		"avg: " << counter.Average().running << "ms, "
-		"peak: " << counter.Peak().running << "ms";
+		"avg: " << env.counter.Average().running << "ms, "
+		"peak: " << env.counter.Peak().running << "ms";
 	std::string text = s.str();
-	counter_text.Set(font, text);
+	counter_text.Set(env.assets.small_ui_font, text);
+}
+
+void Interface::UpdatePosition() {
+	std::stringstream s;
+	s << std::setprecision(3) << "pos: " << ctrl.Controlled().AbsolutePosition();
+	position_text.Set(env.assets.small_ui_font, s.str());
+}
+
+void Interface::UpdateOrientation() {
+	std::stringstream s;
+	s << std::setprecision(3) << "pitch: " << rad2deg(ctrl.Pitch())
+		<< ", yaw: " << rad2deg(ctrl.Yaw());
+	orientation_text.Set(env.assets.small_ui_font, s.str());
 }
 
 
@@ -370,13 +449,25 @@ void Interface::PlaceBlock() {
 		next_pos -= aim_normal * glm::vec3(Chunk::Extent());
 	}
 	mod_chunk->SetBlock(next_pos, selection);
-	mod_chunk->Invalidate();
+
+	if (config.audio_disabled) return;
+	const Entity &player = ctrl.Controlled();
+	env.audio.Play(
+		place_sound,
+		mod_chunk->ToSceneCoords(player.ChunkCoords(), next_pos)
+	);
 }
 
 void Interface::RemoveBlock() noexcept {
 	if (!aim_chunk) return;
 	aim_chunk->SetBlock(aim_block, remove);
-	aim_chunk->Invalidate();
+
+	if (config.audio_disabled) return;
+	const Entity &player = ctrl.Controlled();
+	env.audio.Play(
+		remove_sound,
+		aim_chunk->ToSceneCoords(player.ChunkCoords(), Chunk::ToCoords(aim_block))
+	);
 }
 
 
@@ -440,19 +531,30 @@ void Interface::Update(int dt) {
 		CheckAim();
 	}
 
-	if (counter_text.Visible() && counter.Changed()) {
-		UpdateCounter();
+	if (debug) {
+		if (env.counter.Changed()) {
+			UpdateCounter();
+		}
+		UpdatePosition();
+		UpdateOrientation();
 	}
 }
 
+namespace {
+
+OutlineModel::Buffer outl_buf;
+
+}
+
 void Interface::CheckAim() {
 	float dist;
 	if (world.Intersection(aim, glm::mat4(1.0f), aim_chunk, aim_block, dist, aim_normal)) {
-		outline.Clear();
-		aim_chunk->Type(aim_chunk->BlockAt(aim_block)).FillOutlineModel(outline);
-		outline_transform = glm::scale(glm::vec3(1.0002f));
-		outline_transform *= aim_chunk->Transform(world.Player().ChunkCoords());
+		outl_buf.Clear();
+		aim_chunk->Type(aim_chunk->BlockAt(aim_block)).FillOutlineModel(outl_buf);
+		outline.Update(outl_buf);
+		outline_transform = aim_chunk->Transform(world.Player().ChunkCoords());
 		outline_transform *= aim_chunk->ToTransform(Chunk::ToPos(aim_block), aim_block);
+		outline_transform *= glm::scale(glm::vec3(1.005f));
 	} else {
 		aim_chunk = nullptr;
 	}
@@ -463,13 +565,15 @@ void Interface::Render(Viewport &viewport) noexcept {
 	if (config.visual_disabled) return;
 
 	if (aim_chunk) {
-		DirectionalLighting &world_prog = viewport.EntityProgram();
-		world_prog.SetM(outline_transform);
+		PlainColor &outline_prog = viewport.WorldOutlineProgram();
+		outline_prog.SetM(outline_transform);
 		outline.Draw();
 	}
 
-	if (counter_text.Visible()) {
+	if (debug) {
 		counter_text.Render(viewport);
+		position_text.Render(viewport);
+		orientation_text.Render(viewport);
 	}
 
 	if (msg_timer.Running()) {
@@ -479,4 +583,217 @@ void Interface::Render(Viewport &viewport) noexcept {
 	hud.Render(viewport);
 }
 
+
+Keymap::Keymap()
+: codemap{ NONE } {
+
+}
+
+void Keymap::Map(SDL_Scancode scancode, Action action) {
+	if (scancode > MAX_SCANCODE) {
+		throw std::runtime_error("refusing to map scancode: too damn high");
+	}
+	codemap[scancode] = action;
+}
+
+Keymap::Action Keymap::Lookup(SDL_Scancode scancode) {
+	if (scancode < NUM_SCANCODES) {
+		return codemap[scancode];
+	} else {
+		return NONE;
+	}
+}
+
+
+void Keymap::LoadDefault() {
+	Map(SDL_SCANCODE_UP, MOVE_FORWARD);
+	Map(SDL_SCANCODE_W, MOVE_FORWARD);
+	Map(SDL_SCANCODE_DOWN, MOVE_BACKWARD);
+	Map(SDL_SCANCODE_S, MOVE_BACKWARD);
+	Map(SDL_SCANCODE_LEFT, MOVE_LEFT);
+	Map(SDL_SCANCODE_A, MOVE_LEFT);
+	Map(SDL_SCANCODE_RIGHT, MOVE_RIGHT);
+	Map(SDL_SCANCODE_D, MOVE_RIGHT);
+	Map(SDL_SCANCODE_SPACE, MOVE_UP);
+	Map(SDL_SCANCODE_RSHIFT, MOVE_UP);
+	Map(SDL_SCANCODE_LSHIFT, MOVE_DOWN);
+	Map(SDL_SCANCODE_LCTRL, MOVE_DOWN);
+	Map(SDL_SCANCODE_RCTRL, MOVE_DOWN);
+
+	Map(SDL_SCANCODE_Q, BLOCK_FACE);
+	Map(SDL_SCANCODE_E, BLOCK_TURN);
+	Map(SDL_SCANCODE_TAB, BLOCK_NEXT);
+	Map(SDL_SCANCODE_RIGHTBRACKET, BLOCK_NEXT);
+	Map(SDL_SCANCODE_LEFTBRACKET, BLOCK_PREV);
+
+	Map(SDL_SCANCODE_INSERT, BLOCK_PLACE);
+	Map(SDL_SCANCODE_RETURN, BLOCK_PLACE);
+	Map(SDL_SCANCODE_MENU, BLOCK_PICK);
+	Map(SDL_SCANCODE_DELETE, BLOCK_REMOVE);
+	Map(SDL_SCANCODE_BACKSPACE, BLOCK_REMOVE);
+
+	Map(SDL_SCANCODE_N, TOGGLE_COLLISION);
+	Map(SDL_SCANCODE_F1, TOGGLE_VISUAL);
+	Map(SDL_SCANCODE_F3, TOGGLE_DEBUG);
+	Map(SDL_SCANCODE_F4, TOGGLE_AUDIO);
+
+	Map(SDL_SCANCODE_B, PRINT_BLOCK);
+	Map(SDL_SCANCODE_C, PRINT_CHUNK);
+	Map(SDL_SCANCODE_L, PRINT_LIGHT);
+	Map(SDL_SCANCODE_P, PRINT_SELECTION);
+
+	Map(SDL_SCANCODE_ESCAPE, EXIT);
+}
+
+
+void Keymap::Load(std::istream &is) {
+	TokenStreamReader in(is);
+	std::string key_name;
+	std::string action_name;
+	SDL_Scancode key;
+	Action action;
+	while (in.HasMore()) {
+		if (in.Peek().type == Token::STRING) {
+			in.ReadString(key_name);
+			key = SDL_GetScancodeFromName(key_name.c_str());
+		} else {
+			key = SDL_Scancode(in.GetInt());
+		}
+		in.Skip(Token::EQUALS);
+		in.ReadIdentifier(action_name);
+		action = StringToAction(action_name);
+		if (in.HasMore() && in.Peek().type == Token::SEMICOLON) {
+			in.Skip(Token::SEMICOLON);
+		}
+		Map(key, action);
+	}
+}
+
+void Keymap::Save(std::ostream &out) {
+	for (unsigned int i = 0; i < NUM_SCANCODES; ++i) {
+		if (codemap[i] == NONE) continue;
+
+		const char *str = SDL_GetScancodeName(SDL_Scancode(i));
+		if (str && *str) {
+			out << '"';
+			while (*str) {
+				if (*str == '"') {
+					out << "\\\"";
+				} else {
+					out << *str;
+				}
+				++str;
+			}
+			out << '"';
+		} else {
+			out << i;
+		}
+
+		out << " = " << ActionToString(codemap[i]) << std::endl;;
+	}
+}
+
+
+const char *Keymap::ActionToString(Action action) {
+	switch (action) {
+		default:
+		case NONE:
+			return "none";
+		case MOVE_FORWARD:
+			return "move_forward";
+		case MOVE_BACKWARD:
+			return "move_backward";
+		case MOVE_LEFT:
+			return "move_left";
+		case MOVE_RIGHT:
+			return "move_right";
+		case MOVE_UP:
+			return "move_up";
+		case MOVE_DOWN:
+			return "move_down";
+		case BLOCK_FACE:
+			return "block_face";
+		case BLOCK_TURN:
+			return "block_turn";
+		case BLOCK_NEXT:
+			return "block_next";
+		case BLOCK_PREV:
+			return "block_prev";
+		case BLOCK_PLACE:
+			return "block_place";
+		case BLOCK_PICK:
+			return "block_pick";
+		case BLOCK_REMOVE:
+			return "block_remove";
+		case TOGGLE_COLLISION:
+			return "toggle_collision";
+		case TOGGLE_AUDIO:
+			return "toggle_audio";
+		case TOGGLE_VISUAL:
+			return "toggle_visual";
+		case TOGGLE_DEBUG:
+			return "toggle_debug";
+		case PRINT_BLOCK:
+			return "print_block";
+		case PRINT_CHUNK:
+			return "print_chunk";
+		case PRINT_LIGHT:
+			return "print_light";
+		case PRINT_SELECTION:
+			return "print_selection";
+		case EXIT:
+			return "exit";
+	}
+}
+
+Keymap::Action Keymap::StringToAction(const std::string &str) {
+	if (str == "move_forward") {
+		return MOVE_FORWARD;
+	} else if (str == "move_backward") {
+		return MOVE_BACKWARD;
+	} else if (str == "move_left") {
+		return MOVE_LEFT;
+	} else if (str == "move_right") {
+		return MOVE_RIGHT;
+	} else if (str == "move_up") {
+		return MOVE_UP;
+	} else if (str == "move_down") {
+		return MOVE_DOWN;
+	} else if (str == "block_face") {
+		return BLOCK_FACE;
+	} else if (str == "block_turn") {
+		return BLOCK_TURN;
+	} else if (str == "block_next") {
+		return BLOCK_NEXT;
+	} else if (str == "block_prev") {
+		return BLOCK_PREV;
+	} else if (str == "block_place") {
+		return BLOCK_PLACE;
+	} else if (str == "block_pick") {
+		return BLOCK_PICK;
+	} else if (str == "block_remove") {
+		return BLOCK_REMOVE;
+	} else if (str == "toggle_collision") {
+		return TOGGLE_COLLISION;
+	} else if (str == "toggle_audio") {
+		return TOGGLE_AUDIO;
+	} else if (str == "toggle_visual") {
+		return TOGGLE_VISUAL;
+	} else if (str == "toggle_debug") {
+		return TOGGLE_DEBUG;
+	} else if (str == "print_block") {
+		return PRINT_BLOCK;
+	} else if (str == "print_chunk") {
+		return PRINT_CHUNK;
+	} else if (str == "print_light") {
+		return PRINT_LIGHT;
+	} else if (str == "print_selection") {
+		return PRINT_SELECTION;
+	} else if (str == "exit") {
+		return EXIT;
+	} else {
+		return NONE;
+	}
+}
+
 }