#include "interface.hpp"
-#include "geometry.hpp"
#include "world.hpp"
#include <iostream>
-#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtx/io.hpp>
: 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:
- if (event.state == SDL_PRESSED) {
- PrintChunkInfo();
- }
+ 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;
}
}
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();
}
}
mod_chunk->Invalidate();
}
-void Interface::RemoveBlock() {
+void Interface::RemoveBlock() noexcept {
if (!aim_chunk) return;
aim_chunk->SetBlock(aim_block, remove);
aim_chunk->Invalidate();
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);
}
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 *= aim_chunk->ToTransform(aim_block);
+ 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);
} else {
aim_chunk = nullptr;
}
-
}
-void Interface::Render(DirectionalLighting &program) {
+void Interface::Render(DirectionalLighting &program) noexcept {
if (config.visual_disabled) return;
if (aim_chunk) {