X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Finterface.cpp;h=12117f7d28632342b9746dddf588debe89caf38f;hb=76b3ec0f6aa0dacf6d4944a2787991f3585299e8;hp=f4b13b015d6d69fcbf6adbfc6e0a92d6c3d6454e;hpb=3072e2cd49ad1614100d1a1c73afe6a4888fb875;p=blank.git diff --git a/src/interface.cpp b/src/interface.cpp index f4b13b0..12117f7 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -4,14 +4,13 @@ #include "world.hpp" #include -#include #include #include namespace blank { -Interface::Interface(World &world) +Interface::Interface(const Config &config, World &world) : world(world) , ctrl(world.Player()) , hud(world.BlockTypes()) @@ -20,41 +19,37 @@ 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) -, back(false) -, left(false) -, right(false) -, up(false) -, down(false) { +, fwd(0) +, rev(0) { hud.Viewport(960, 600); hud.Display(selection); } void Interface::Handle(const SDL_KeyboardEvent &event) { + if (config.keyboard_disabled) return; + switch (event.keysym.sym) { case SDLK_w: - front = event.state == SDL_PRESSED; + rev.z = event.state == SDL_PRESSED; break; case SDLK_s: - back = event.state == SDL_PRESSED; + fwd.z = event.state == SDL_PRESSED; break; case SDLK_a: - left = event.state == SDL_PRESSED; + rev.x = event.state == SDL_PRESSED; break; case SDLK_d: - right = event.state == SDL_PRESSED; + fwd.x = event.state == SDL_PRESSED; break; case SDLK_SPACE: - up = event.state == SDL_PRESSED; + fwd.y = event.state == SDL_PRESSED; break; case SDLK_LSHIFT: - down = event.state == SDL_PRESSED; + rev.y = event.state == SDL_PRESSED; break; case SDLK_q: @@ -73,6 +68,11 @@ 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(); @@ -100,6 +100,8 @@ void Interface::PrintBlockInfo() { std::cout << std::endl; if (!aim_chunk) { std::cout << "not looking at any block" << std::endl; + Ray aim = ctrl.Aim(); + std::cout << "aim ray: " << aim.orig << ", " << aim.dir << std::endl; return; } std::cout << "looking at block " << aim_block @@ -109,6 +111,38 @@ 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:" << std::endl; + if (aim_chunk->HasNeighbor(Block::FACE_LEFT)) { + std::cout << " left " << aim_chunk->GetNeighbor(Block::FACE_LEFT).Position() << std::endl; + } + if (aim_chunk->HasNeighbor(Block::FACE_RIGHT)) { + std::cout << " right " << aim_chunk->GetNeighbor(Block::FACE_RIGHT).Position() << std::endl; + } + if (aim_chunk->HasNeighbor(Block::FACE_UP)) { + std::cout << " up " << aim_chunk->GetNeighbor(Block::FACE_UP).Position() << std::endl; + } + if (aim_chunk->HasNeighbor(Block::FACE_DOWN)) { + std::cout << " down " << aim_chunk->GetNeighbor(Block::FACE_DOWN).Position() << std::endl; + } + if (aim_chunk->HasNeighbor(Block::FACE_FRONT)) { + std::cout << " front " << aim_chunk->GetNeighbor(Block::FACE_FRONT).Position() << std::endl; + } + if (aim_chunk->HasNeighbor(Block::FACE_BACK)) { + std::cout << " back " << aim_chunk->GetNeighbor(Block::FACE_BACK).Position() << std::endl; + } + std::cout << std::endl; +} + void Interface::PrintLightInfo() { std::cout << "light level " << world.PlayerChunk().GetLight(world.Player().Position()) @@ -130,11 +164,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) { @@ -164,7 +201,7 @@ void Interface::PlaceBlock() { mod_chunk->Invalidate(); } -void Interface::RemoveBlock() { +void Interface::RemoveBlock() noexcept { if (!aim_chunk) return; aim_chunk->SetBlock(aim_block, remove); aim_chunk->Invalidate(); @@ -172,6 +209,8 @@ void Interface::RemoveBlock() { void Interface::Handle(const SDL_MouseWheelEvent &event) { + if (config.mouse_disabled) return; + if (event.y < 0) { SelectNext(); } else if (event.y > 0) { @@ -195,7 +234,7 @@ void Interface::SelectPrevious() { hud.Display(selection); } -void Interface::Handle(const SDL_WindowEvent &event) { +void Interface::Handle(const SDL_WindowEvent &event) noexcept { if (event.event == SDL_WINDOWEVENT_RESIZED) { hud.Viewport(event.data1, event.data2); } @@ -203,23 +242,7 @@ void Interface::Handle(const SDL_WindowEvent &event) { void Interface::Update(int dt) { - glm::vec3 vel; - if (right && !left) { - vel.x = move_velocity; - } else if (left && !right) { - vel.x = -move_velocity; - } - if (up && !down) { - vel.y = move_velocity; - } else if (down && !up) { - vel.y = -move_velocity; - } - if (back && !front) { - vel.z = move_velocity; - } else if (front && !back) { - vel.z = -move_velocity; - } - ctrl.Velocity(vel); + ctrl.Velocity(glm::vec3(fwd - rev) * config.move_velocity); ctrl.Update(dt); Ray aim = ctrl.Aim(); @@ -237,7 +260,9 @@ void Interface::Update(int dt) { } -void Interface::Render(DirectionalLighting &program) { +void Interface::Render(DirectionalLighting &program) noexcept { + if (config.visual_disabled) return; + if (aim_chunk) { program.SetM(outline_transform); outline.Draw();