Fix non_walkable_areas

Clean up imports
pinguin999 · Dec 17, 2024 · 9445eb2 · 9445eb2
1 parent de57e01
commit 9445eb2
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 17 deletions.
diff --git a/src/background.cpp b/src/background.cpp
@@ -423,7 +423,7 @@ bool Background::is_walkable(jngl::Vec2 position) const
     {
         for (const auto &obj : _game->gameObjects)
         {
-            auto *non_walkable = spine::spSkeletonBounds_containsPointMatchingName(obj->bounds, "non_walkable_area", static_cast<float>(position.x), static_cast<float>(position.y));
+            auto *non_walkable = spine::spSkeletonBounds_containsPointMatchingName(obj->bounds, "non_walkable_area", static_cast<float>(position.x) - static_cast<float>(obj->getPosition().x), static_cast<float>(position.y) - static_cast<float>(obj->getPosition().y));
             if (non_walkable)
             {
                 return false;

diff --git a/src/background.hpp b/src/background.hpp
@@ -2,10 +2,7 @@
 
 #include "spine_object.hpp"
 
-#include <array>
 #include <jngl.hpp>
-#include <list>
-#include <map>
 #include <deque>
 
 struct Node

diff --git a/src/game.cpp b/src/game.cpp
@@ -2,15 +2,13 @@
 
 #include <algorithm>
 #include <cmath>
-#include <map>
 #include <string>
 #include <iostream>
 #include <chrono>
 #include <thread>
 
 #include <spine/spine.h>
 #include "pointer.hpp"
-#include "interactable_object.hpp"
 #include "scene_fade.hpp"
 
 #if (!defined(NDEBUG) && !defined(ANDROID) && (!defined(TARGET_OS_IOS) || TARGET_OS_IOS == 0) && !defined(EMSCRIPTEN))

diff --git a/src/game.hpp b/src/game.hpp
@@ -2,7 +2,6 @@
 
 #include <filesystem>
 #include <jngl.hpp>
-#include <set>
 #include <vector>
 #include <sol/sol.hpp>
 #if (!defined(NDEBUG) && !defined(ANDROID) && (!defined(TARGET_OS_IOS) || TARGET_OS_IOS == 0) && !defined(EMSCRIPTEN))

diff --git a/src/interactable_object.cpp b/src/interactable_object.cpp
@@ -66,7 +66,7 @@ bool InteractableObject::step(bool force)
             jngl::Vec2 click_position = _game->pointer->getWorldPosition();
             if (abs_position)
             {
-                click_position -= _game->getCameraPosition();
+                click_position = _game->pointer->getPosition();
             }
 
             auto *collision = spSkeletonBounds_containsPoint(bounds, static_cast<float>(click_position.x) - static_cast<float>(position.x), static_cast<float>(click_position.y) - static_cast<float>(position.y));

diff --git a/src/interactable_object.hpp b/src/interactable_object.hpp
@@ -2,7 +2,6 @@
 
 #include "spine_object.hpp"
 
-#include <array>
 #include <jngl.hpp>
 #include <sol/sol.hpp>
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -1,8 +1,6 @@
 #include <jngl/init.hpp>
 #include "game.hpp"
 
-#include <fstream>
-
 #ifndef NDEBUG
 void pac_unload_file(const char* path)
 {

diff --git a/src/player.hpp b/src/player.hpp
@@ -2,7 +2,6 @@
 
 #include "spine_object.hpp"
 
-#include <array>
 #include <deque>
 #include <jngl.hpp>
 #include <sol/sol.hpp>

diff --git a/src/pointer.cpp b/src/pointer.cpp
@@ -7,7 +7,6 @@
 #include "game.hpp"
 
 #include <cmath>
-#include <cassert>
 #include <spine/spine.h>
 
 Pointer::Pointer(std::shared_ptr<Game> game, const std::string &spine_file) : SpineObject(game, spine_file, "Pointer", .5)

diff --git a/src/pointer.hpp b/src/pointer.hpp
@@ -3,7 +3,6 @@
 #include "spine_object.hpp"
 #include "input/control.hpp"
 
-#include <array>
 #include <jngl.hpp>
 #include <memory>
 

diff --git a/src/scene.cpp b/src/scene.cpp
@@ -1,7 +1,6 @@
 #include "scene.hpp"
 
 #include <fstream>
-#include <streambuf>
 #include "interactable_object.hpp"
 #include "game.hpp"
 #include "player.hpp"

diff --git a/src/skeleton_drawable.cpp b/src/skeleton_drawable.cpp
@@ -1,5 +1,4 @@
 #include "skeleton_drawable.hpp"
-#include "game.hpp"
 
 #ifndef SPINE_MESH_VERTEX_COUNT_MAX
 #define SPINE_MESH_VERTEX_COUNT_MAX 1000
@@ -185,7 +184,8 @@ void SkeletonDrawable::draw(const jngl::Mat3& modelview) const {
 				bbname.setText(box->super.super.name);
 				bbname.setAlign(jngl::Alignment::CENTER);
 				bbname.setCenter(bbvertices[0], bbvertices[1]);
-				bbname.draw();
+				jngl::setFontColor(jngl::Rgba(0,1,0,1));
+				bbname.draw(modelview);
 			}
 #endif
         }