X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2Fui.cpp;h=048aed1ac81559e21e2eee740d90a195bf5df22b;hb=33b37e7242e4cbfa76e4a0d6e5bb54223b541162;hp=96386195e57803c4aa8fcd498072caa229df768f;hpb=d38be21d103052761505d58a6d13e30a896dde01;p=blank.git

diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp
index 9638619..048aed1 100644
--- a/src/ui/ui.cpp
+++ b/src/ui/ui.cpp
@@ -37,8 +37,6 @@ PlayerController::PlayerController(World &world, Player &player)
 : world(world)
 , player(player)
 , move_dir(0.0f)
-, pitch(0.0f)
-, yaw(0.0f)
 , dirty(true)
 , aim_world()
 , aim_entity() {
@@ -55,19 +53,15 @@ void PlayerController::SetMovement(const glm::vec3 &m) noexcept {
 }
 
 void PlayerController::TurnHead(float dp, float dy) noexcept {
-	pitch += dp;
-	if (pitch > PI / 2) {
-		pitch = PI / 2;
-	} else if (pitch < -PI / 2) {
-		pitch = -PI / 2;
-	}
-	yaw += dy;
-	if (yaw > PI) {
-		yaw -= PI * 2;
-	} else if (yaw < -PI) {
-		yaw += PI * 2;
-	}
-	Invalidate();
+	player.GetEntity().TurnHead(dp, dy);
+}
+
+float PlayerController::GetPitch() const noexcept {
+	return player.GetEntity().Pitch();
+}
+
+float PlayerController::GetYaw() const noexcept {
+	return player.GetEntity().Yaw();
 }
 
 void PlayerController::SelectInventory(int i) noexcept {
@@ -83,10 +77,9 @@ void PlayerController::Invalidate() noexcept {
 }
 
 void PlayerController::UpdatePlayer() noexcept {
-	constexpr float max_vel = 0.005f;
+	constexpr float max_vel = 5.0f; // in m/s
 	if (dirty) {
-		player.GetEntity().Orientation(glm::quat(glm::vec3(pitch, yaw, 0.0f)));
-		player.GetEntity().TargetVelocity(glm::rotateY(move_dir * max_vel, yaw));
+		player.GetEntity().TargetVelocity(glm::rotateY(move_dir * max_vel, player.GetEntity().Yaw()));
 
 		Ray aim = player.Aim();
 		if (!world.Intersection(aim, glm::mat4(1.0f), player.GetEntity().ChunkCoords(), aim_world)) {
@@ -211,8 +204,11 @@ HUD::HUD(Environment &env, Config &config, const Player &player)
 // message box
 , messages(env.assets.small_ui_font)
 , msg_timer(5000)
+, msg_keep(false)
 // crosshair
 , crosshair() {
+	const float ls = env.assets.small_ui_font.LineSkip();
+
 	// "inventory"
 	block_transform = glm::translate(block_transform, glm::vec3(50.0f, 50.0f, 0.0f));
 	block_transform = glm::scale(block_transform, glm::vec3(50.0f));
@@ -230,42 +226,42 @@ HUD::HUD(Environment &env, Config &config, const Player &player)
 	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.Position(glm::vec3(-25.0f, 25.0f + ls, 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.Position(glm::vec3(-25.0f, 25.0f + 2 * ls, 0.0f), Gravity::NORTH_EAST);
 	orientation_text.Foreground(glm::vec4(1.0f));
 	orientation_text.Background(glm::vec4(0.5f));
-	block_text.Position(glm::vec3(-25.0f, 25.0f + 4 * env.assets.small_ui_font.LineSkip(), 0.0f), Gravity::NORTH_EAST);
+	block_text.Position(glm::vec3(-25.0f, 25.0f + 4 * ls, 0.0f), Gravity::NORTH_EAST);
 	block_text.Foreground(glm::vec4(1.0f));
 	block_text.Background(glm::vec4(0.5f));
 	block_text.Set(env.assets.small_ui_font, "Block: none");
-	entity_text.Position(glm::vec3(-25.0f, 25.0f + 4 * env.assets.small_ui_font.LineSkip(), 0.0f), Gravity::NORTH_EAST);
+	entity_text.Position(glm::vec3(-25.0f, 25.0f + 4 * ls, 0.0f), Gravity::NORTH_EAST);
 	entity_text.Foreground(glm::vec4(1.0f));
 	entity_text.Background(glm::vec4(0.5f));
 	entity_text.Set(env.assets.small_ui_font, "Entity: none");
 
 	// message box
-	messages.Position(glm::vec3(25.0f, -25.0f, 0.0f), Gravity::SOUTH_WEST);
+	messages.Position(glm::vec3(25.0f, -25.0f - 2 * ls, 0.0f), Gravity::SOUTH_WEST);
 	messages.Foreground(glm::vec4(1.0f));
 	messages.Background(glm::vec4(0.5f));
 
 	// crosshair
-	OutlineMesh::Buffer buf;
+	PrimitiveMesh::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 },
 	});
-	buf.indices = std::vector<OutlineMesh::Index>({
+	buf.indices = std::vector<PrimitiveMesh::Index>({
 		0, 1, 2, 3
 	});
-	buf.colors.resize(4, { 10.0f, 10.0f, 10.0f });
+	buf.colors.resize(4, { 10.0f, 10.0f, 10.0f, 1.0f });
 	crosshair.Update(buf);
 }
 
 namespace {
 
-OutlineMesh::Buffer outl_buf;
+PrimitiveMesh::Buffer outl_buf;
 
 }
 
@@ -273,7 +269,7 @@ void HUD::FocusBlock(const Chunk &chunk, int index) {
 	const Block &block = chunk.BlockAt(index);
 	const BlockType &type = chunk.Type(index);
 	outl_buf.Clear();
-	type.FillOutlineMesh(outl_buf);
+	type.OutlinePrimitiveMesh(outl_buf);
 	outline.Update(outl_buf);
 	outline_transform = chunk.Transform(player.GetEntity().ChunkCoords());
 	outline_transform *= chunk.ToTransform(Chunk::ToPos(index), index);
@@ -376,9 +372,9 @@ void HUD::Update(int dt) {
 void HUD::Render(Viewport &viewport) noexcept {
 	// block focus
 	if (outline_visible && config.video.world) {
-		PlainColor &outline_prog = viewport.WorldOutlineProgram();
+		PlainColor &outline_prog = viewport.WorldColorProgram();
 		outline_prog.SetM(outline_transform);
-		outline.Draw();
+		outline.DrawLines();
 	}
 
 	// clear depth buffer so everything renders above the world
@@ -399,16 +395,16 @@ void HUD::Render(Viewport &viewport) noexcept {
 		}
 
 		// message box
-		if (msg_timer.Running()) {
+		if (msg_keep || msg_timer.Running()) {
 			messages.Render(viewport);
 		}
 
 		// crosshair
-		PlainColor &outline_prog = viewport.HUDOutlineProgram();
+		PlainColor &outline_prog = viewport.HUDColorProgram();
 		viewport.EnableInvertBlending();
 		viewport.SetCursor(glm::vec3(0.0f), Gravity::CENTER);
 		outline_prog.SetM(viewport.Cursor());
-		crosshair.Draw();
+		crosshair.DrawLines();
 	}
 
 	// debug overlay