X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Finterface.cpp;h=f846cc88b826145b6685e2e9c9795fcf91168982;hb=83ed3de28841d1eecfca39ff540e804cf6809b32;hp=c0bfc02ce82c24f3bf23f2f976c4213a60ee5942;hpb=f90ec88e6728ce865bcf892c810a36abd90d9001;p=blank.git diff --git a/src/interface.cpp b/src/interface.cpp index c0bfc02..f846cc8 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -1,10 +1,8 @@ #include "interface.hpp" -#include "geometry.hpp" #include "world.hpp" #include -#include #include #include @@ -15,73 +13,90 @@ Interface::Interface(const Config &config, World &world) : world(world) , ctrl(world.Player()) , hud(world.BlockTypes()) +, aim{{ 0, 0, 0 }, { 0, 0, -1 }} , aim_chunk(nullptr) , aim_block(0) , aim_normal() , outline() , outline_transform(1.0f) , config(config) +, place_timer(256) +, remove_timer(256) , 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) { +void Interface::HandlePress(const SDL_KeyboardEvent &event) { if (config.keyboard_disabled) return; switch (event.keysym.sym) { case SDLK_w: - front = event.state == SDL_PRESSED; + rev.z = 1; break; case SDLK_s: - back = event.state == SDL_PRESSED; + fwd.z = 1; break; case SDLK_a: - left = event.state == SDL_PRESSED; + rev.x = 1; break; case SDLK_d: - right = event.state == SDL_PRESSED; + fwd.x = 1; break; case SDLK_SPACE: - up = event.state == SDL_PRESSED; + fwd.y = 1; break; case SDLK_LSHIFT: - down = event.state == SDL_PRESSED; + rev.y = 1; break; case SDLK_q: - if (event.state == SDL_PRESSED) { - FaceBlock(); - } + FaceBlock(); break; case SDLK_e: - if (event.state == SDL_PRESSED) { - TurnBlock(); - } + TurnBlock(); break; case SDLK_b: - if (event.state == SDL_PRESSED) { - PrintBlockInfo(); - } + PrintBlockInfo(); + break; + case SDLK_c: + PrintChunkInfo(); break; case SDLK_l: - if (event.state == SDL_PRESSED) { - PrintLightInfo(); - } + PrintLightInfo(); break; case SDLK_p: - if (event.state == SDL_PRESSED) { - PrintSelectionInfo(); - } + PrintSelectionInfo(); + break; + } +} + +void Interface::HandleRelease(const SDL_KeyboardEvent &event) { + if (config.keyboard_disabled) return; + + switch (event.keysym.sym) { + case SDLK_w: + rev.z = 0; + break; + case SDLK_s: + fwd.z = 0; + break; + case SDLK_a: + rev.x = 0; + break; + case SDLK_d: + fwd.x = 0; + break; + case SDLK_SPACE: + fwd.y = 0; + break; + case SDLK_LSHIFT: + rev.y = 0; break; } } @@ -100,6 +115,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 +126,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()) @@ -135,17 +184,27 @@ void Interface::Handle(const SDL_MouseMotionEvent &event) { ctrl.RotatePitch(event.yrel * config.pitch_sensitivity); } -void Interface::Handle(const SDL_MouseButtonEvent &event) { +void Interface::HandlePress(const SDL_MouseButtonEvent &event) { if (config.mouse_disabled) return; - if (event.state != SDL_PRESSED) return; - if (event.button == 1) { RemoveBlock(); + remove_timer.Start(); } else if (event.button == 2) { PickBlock(); } else if (event.button == 3) { PlaceBlock(); + place_timer.Start(); + } +} + +void Interface::HandleRelease(const SDL_MouseButtonEvent &event) { + if (config.mouse_disabled) return; + + if (event.button == 1) { + remove_timer.Stop(); + } else if (event.button == 3) { + place_timer.Stop(); } } @@ -167,7 +226,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(); @@ -200,7 +259,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); } @@ -208,41 +267,41 @@ void Interface::Handle(const SDL_WindowEvent &event) { void Interface::Update(int dt) { - glm::vec3 vel; - if (right && !left) { - vel.x = config.move_velocity; - } else if (left && !right) { - vel.x = -config.move_velocity; - } - if (up && !down) { - vel.y = config.move_velocity; - } else if (down && !up) { - vel.y = -config.move_velocity; + ctrl.Velocity(glm::vec3(fwd - rev) * config.move_velocity); + ctrl.Update(dt); + + place_timer.Update(dt); + remove_timer.Update(dt); + + aim = ctrl.Aim(); + CheckAim(); + + if (remove_timer.Hit()) { + RemoveBlock(); + CheckAim(); } - if (back && !front) { - vel.z = config.move_velocity; - } else if (front && !back) { - vel.z = -config.move_velocity; + + if (place_timer.Hit()) { + PlaceBlock(); + CheckAim(); } - ctrl.Velocity(vel); - ctrl.Update(dt); +} - Ray aim = ctrl.Aim(); +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::mat4(1.0f), glm::vec3(1.0002f)); - outline_transform = aim_chunk->Transform(world.Player().ChunkCoords()); + outline_transform = glm::scale(glm::vec3(1.0002f)); + outline_transform *= aim_chunk->Transform(world.Player().ChunkCoords()); outline_transform *= aim_chunk->ToTransform(aim_block); } else { aim_chunk = nullptr; } - } -void Interface::Render(DirectionalLighting &program) { +void Interface::Render(DirectionalLighting &program) noexcept { if (config.visual_disabled) return; if (aim_chunk) {