#include "HUD.hpp"
#include "Interface.hpp"
+#include "../app/Assets.hpp"
+#include "../app/Environment.hpp"
+#include "../app/FrameCounter.hpp"
#include "../app/init.hpp"
-#include "../graphics/DirectionalLighting.hpp"
+#include "../audio/Audio.hpp"
+#include "../graphics/Font.hpp"
+#include "../graphics/Viewport.hpp"
#include "../model/shapes.hpp"
#include "../world/World.hpp"
+#include <algorithm>
+#include <cmath>
#include <iostream>
+#include <sstream>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtx/io.hpp>
namespace blank {
-HUD::HUD(const BlockTypeRegistry &types)
+HUD::HUD(const BlockTypeRegistry &types, const Font &font)
: types(types)
+, font(font)
, block()
, block_buf()
, block_transform(1.0f)
+, block_label()
, block_visible(false)
-, crosshair()
-, crosshair_transform(1.0f)
-, near(100.0f)
-, far(-100.0f)
-, projection(glm::ortho(0.0f, 1.0f, 1.0f, 0.0f, near, far))
-, view(glm::translate(glm::mat4(1.0f), glm::vec3(-0.5f, -0.5f, 0))) {
+, crosshair() {
block_transform = glm::translate(block_transform, glm::vec3(50.0f, 50.0f, 0.0f));
block_transform = glm::scale(block_transform, glm::vec3(50.0f));
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();
-}
-
-
-void HUD::Viewport(float width, float height) noexcept {
- Viewport(0, 0, width, height);
-}
-
-void HUD::Viewport(float x, float y, float width, float height) noexcept {
- projection = glm::ortho(x, width, height, y, near, far);
- crosshair_transform = glm::translate(glm::mat4(1.0f), glm::vec3(width * 0.5f, height * 0.5f, 0.0f));
+ buf.colors.resize(4, { 10.0f, 10.0f, 10.0f });
+ crosshair.Update(buf);
+
+ block_label.Position(
+ glm::vec3(50.0f, 85.0f, 0.0f),
+ Gravity::NORTH_WEST,
+ Gravity::NORTH
+ );
+ block_label.Foreground(glm::vec4(1.0f));
+ block_label.Background(glm::vec4(0.5f));
}
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);
+
block_visible = type.visible;
}
-void HUD::Render(DirectionalLighting &program) noexcept {
+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);
+
+ viewport.EnableInvertBlending();
+ viewport.SetCursor(glm::vec3(0.0f), Gravity::CENTER);
+ world_prog.SetM(viewport.Cursor());
+ crosshair.Draw();
+
if (block_visible) {
- program.SetLightDirection({ 1.0f, 3.0f, 5.0f });
- // disable distance fog
- program.SetFogDensity(0.0f);
- GLContext::ClearDepthBuffer();
- program.SetMVP(block_transform, view, projection);
+ viewport.DisableBlending();
+ world_prog.SetM(block_transform);
block.Draw();
- program.SetM(crosshair_transform);
- crosshair.Draw();
+ block_label.Render(viewport);
}
}
-Interface::Interface(const Config &config, World &world)
-: world(world)
+Interface::Interface(
+ const Config &config,
+ Environment &env,
+ World &world)
+: env(env)
+, world(world)
, ctrl(world.Player())
-, hud(world.BlockTypes())
+, font(env.assets.LoadFont("DejaVuSans", 16))
+, hud(world.BlockTypes(), font)
, aim{{ 0, 0, 0 }, { 0, 0, -1 }}
, aim_chunk(nullptr)
, aim_block(0)
, aim_normal()
, outline()
, outline_transform(1.0f)
+, counter_text()
+, messages(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) {
- hud.Viewport(960, 600);
+ counter_text.Hide();
+ 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.Hide();
+ position_text.Position(glm::vec3(-25.0f, 25.0f + font.LineSkip(), 0.0f), Gravity::NORTH_EAST);
+ position_text.Foreground(glm::vec4(1.0f));
+ position_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));
hud.Display(selection);
}
TurnBlock();
break;
+ case SDLK_n:
+ ToggleCollision();
+ break;
+
case SDLK_b:
PrintBlockInfo();
break;
case SDLK_p:
PrintSelectionInfo();
break;
+
+ case SDLK_F1:
+ ToggleVisual();
+ break;
+ case SDLK_F3:
+ ToggleDebug();
+ break;
+ case SDLK_F4:
+ ToggleAudio();
+ break;
}
}
hud.Display(selection);
}
+void Interface::ToggleCollision() {
+ ctrl.Controlled().WorldCollidable(!ctrl.Controlled().WorldCollidable());
+ if (ctrl.Controlled().WorldCollidable()) {
+ PostMessage("collision on");
+ } else {
+ PostMessage("collision off");
+ }
+}
+
void Interface::PrintBlockInfo() {
std::cout << std::endl;
if (!aim_chunk) {
- std::cout << "not looking at any block" << std::endl;
+ PostMessage("not looking at any block");
Ray aim = ctrl.Aim();
- std::cout << "aim ray: " << aim.orig << ", " << aim.dir << std::endl;
+ std::stringstream s;
+ s << "aim ray: " << aim.orig << ", " << aim.dir;
+ PostMessage(s.str());
return;
}
- std::cout << "looking at block " << aim_block
+ std::stringstream s;
+ s << "looking at block " << aim_block
<< " " << Chunk::ToCoords(aim_block)
<< " of chunk " << aim_chunk->Position()
- << std::endl;
+ ;
+ PostMessage(s.str());
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;
+ PostMessage("not looking at any block");
return;
}
- std::cout << "looking at chunk "
- << aim_chunk->Position()
- << std::endl;
+ std::stringstream s;
+ s << "looking at chunk " << aim_chunk->Position();
+ PostMessage(s.str());
- std::cout << " neighbors:" << std::endl;
+ PostMessage(" neighbors:");
if (aim_chunk->HasNeighbor(Block::FACE_LEFT)) {
- std::cout << " left " << aim_chunk->GetNeighbor(Block::FACE_LEFT).Position() << std::endl;
+ s.str("");
+ s << " left " << aim_chunk->GetNeighbor(Block::FACE_LEFT).Position();
+ PostMessage(s.str());
}
if (aim_chunk->HasNeighbor(Block::FACE_RIGHT)) {
- std::cout << " right " << aim_chunk->GetNeighbor(Block::FACE_RIGHT).Position() << std::endl;
+ s.str("");
+ s << " right " << aim_chunk->GetNeighbor(Block::FACE_RIGHT).Position();
+ PostMessage(s.str());
}
if (aim_chunk->HasNeighbor(Block::FACE_UP)) {
- std::cout << " up " << aim_chunk->GetNeighbor(Block::FACE_UP).Position() << std::endl;
+ s.str("");
+ s << " up " << aim_chunk->GetNeighbor(Block::FACE_UP).Position();
+ PostMessage(s.str());
}
if (aim_chunk->HasNeighbor(Block::FACE_DOWN)) {
- std::cout << " down " << aim_chunk->GetNeighbor(Block::FACE_DOWN).Position() << std::endl;
+ s.str("");
+ s << " down " << aim_chunk->GetNeighbor(Block::FACE_DOWN).Position();
+ PostMessage(s.str());
}
if (aim_chunk->HasNeighbor(Block::FACE_FRONT)) {
- std::cout << " front " << aim_chunk->GetNeighbor(Block::FACE_FRONT).Position() << std::endl;
+ s.str("");
+ s << " front " << aim_chunk->GetNeighbor(Block::FACE_FRONT).Position();
+ PostMessage(s.str());
}
if (aim_chunk->HasNeighbor(Block::FACE_BACK)) {
- std::cout << " back " << aim_chunk->GetNeighbor(Block::FACE_BACK).Position() << std::endl;
+ s.str("");
+ s << " back " << aim_chunk->GetNeighbor(Block::FACE_BACK).Position();
+ PostMessage(s.str());
}
std::cout << std::endl;
}
void Interface::PrintLightInfo() {
- std::cout
+ std::stringstream s;
+ s
<< "light level " << world.PlayerChunk().GetLight(world.Player().Position())
<< " at position " << world.Player().Position()
- << std::endl;
+ ;
+ PostMessage(s.str());
}
void Interface::PrintSelectionInfo() {
}
void Interface::Print(const Block &block) {
- std::cout << "type: " << block.type
+ std::stringstream s;
+ s << "type: " << block.type
<< ", face: " << block.GetFace()
<< ", turn: " << block.GetTurn()
- << std::endl;
+ ;
+ PostMessage(s.str());
+}
+
+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() {
+ counter_text.Toggle();
+ position_text.Toggle();
+ if (counter_text.Visible()) {
+ UpdateCounter();
+ UpdatePosition();
+ }
+}
+
+void Interface::UpdateCounter() {
+ std::stringstream s;
+ s << std::setprecision(3) <<
+ "avg: " << env.counter.Average().running << "ms, "
+ "peak: " << env.counter.Peak().running << "ms";
+ std::string text = s.str();
+ counter_text.Set(font, text);
+}
+
+void Interface::UpdatePosition() {
+ std::stringstream s;
+ s << std::setprecision(3) << "pos: " << ctrl.Controlled().AbsolutePosition();
+ position_text.Set(font, s.str());
}
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))
+ );
}
hud.Display(selection);
}
-void Interface::Handle(const SDL_WindowEvent &event) noexcept {
- if (event.event == SDL_WINDOWEVENT_RESIZED) {
- hud.Viewport(event.data1, event.data2);
- }
+
+void Interface::PostMessage(const char *msg) {
+ messages.PushLine(msg);
+ msg_timer.Reset();
+ msg_timer.Start();
+ std::cout << msg << std::endl;
}
ctrl.Velocity(glm::vec3(fwd - rev) * config.move_velocity);
ctrl.Update(dt);
+ msg_timer.Update(dt);
place_timer.Update(dt);
remove_timer.Update(dt);
aim = ctrl.Aim();
CheckAim();
+ if (msg_timer.HitOnce()) {
+ msg_timer.Stop();
+ }
+
if (remove_timer.Hit()) {
RemoveBlock();
CheckAim();
PlaceBlock();
CheckAim();
}
+
+ if (counter_text.Visible() && env.counter.Changed()) {
+ UpdateCounter();
+ }
+ if (position_text.Visible()) {
+ UpdatePosition();
+ }
+}
+
+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);
+ if (world.Intersection(aim, glm::mat4(1.0f), aim_chunk, aim_block, dist, aim_normal)) {
+ outl_buf.Clear();
+ aim_chunk->Type(aim_chunk->BlockAt(aim_block)).FillOutlineModel(outl_buf);
+ outline.Update(outl_buf);
outline_transform = glm::scale(glm::vec3(1.0002f));
outline_transform *= aim_chunk->Transform(world.Player().ChunkCoords());
outline_transform *= aim_chunk->ToTransform(Chunk::ToPos(aim_block), aim_block);
}
-void Interface::Render(DirectionalLighting &program) noexcept {
+void Interface::Render(Viewport &viewport) noexcept {
if (config.visual_disabled) return;
if (aim_chunk) {
- program.SetM(outline_transform);
+ DirectionalLighting &world_prog = viewport.EntityProgram();
+ world_prog.SetM(outline_transform);
outline.Draw();
}
- hud.Render(program);
+ if (counter_text.Visible()) {
+ counter_text.Render(viewport);
+ }
+ if (position_text.Visible()) {
+ position_text.Render(viewport);
+ }
+
+ if (msg_timer.Running()) {
+ messages.Render(viewport);
+ }
+
+ hud.Render(viewport);
}
}
projects / blank.git / blobdiff