trying to fix the initial aiming issue

[blank.git] / src / interface.cpp

diff --git a/src/interface.cpp b/src/interface.cpp
index f4b13b015d6d69fcbf6adbfc6e0a92d6c3d6454e..b5aac9641061038a294fa5dea4a541ba8d19a546 100644 (file)
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -11,7 +11,7 @@
 
 namespace blank {
 
-Interface::Interface(World &world)
+Interface::Interface(const Config &config, World &world)
 : world(world)
 , ctrl(world.Player())
 , hud(world.BlockTypes())
@@ -20,9 +20,7 @@ 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)
@@ -37,6 +35,8 @@ Interface::Interface(World &world)
 
 
 void Interface::Handle(const SDL_KeyboardEvent &event) {
+       if (config.keyboard_disabled) return;
+
        switch (event.keysym.sym) {
                case SDLK_w:
                        front = event.state == SDL_PRESSED;
@@ -73,6 +73,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 +105,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 +116,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 +169,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) {
@@ -172,6 +214,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) {
@@ -205,19 +249,19 @@ void Interface::Handle(const SDL_WindowEvent &event) {
 void Interface::Update(int dt) {
        glm::vec3 vel;
        if (right && !left) {
-               vel.x = move_velocity;
+               vel.x = config.move_velocity;
        } else if (left && !right) {
-               vel.x = -move_velocity;
+               vel.x = -config.move_velocity;
        }
        if (up && !down) {
-               vel.y = move_velocity;
+               vel.y = config.move_velocity;
        } else if (down && !up) {
-               vel.y = -move_velocity;
+               vel.y = -config.move_velocity;
        }
        if (back && !front) {
-               vel.z = move_velocity;
+               vel.z = config.move_velocity;
        } else if (front && !back) {
-               vel.z = -move_velocity;
+               vel.z = -config.move_velocity;
        }
        ctrl.Velocity(vel);
        ctrl.Update(dt);
@@ -238,6 +282,8 @@ void Interface::Update(int dt) {
 
 
 void Interface::Render(DirectionalLighting &program) {
+       if (config.visual_disabled) return;
+
        if (aim_chunk) {
                program.SetM(outline_transform);
                outline.Draw();