Merge pull request #3 from spectreseven1138/re

RE
toasterofbread · Aug 11, 2022 · db787c4 · db787c4
2 parents f1a30f5 + cf117fb
commit db787c4
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 16 deletions.
diff --git a/engine/compiler_settings.h b/engine/compiler_settings.h
@@ -10,8 +10,8 @@
 
 /* Available platforms */
 
-#define PLATFORM_RAYLIB 2
-#define PLATFORM_VITA 3
+#define PLATFORM_VITA 2
+#define PLATFORM_RAYLIB 3
 
 /* Platform in use */
 

diff --git a/engine/src/common/input.cpp b/engine/src/common/input.cpp
@@ -19,9 +19,9 @@ bool Input::isButtonPressed(GamepadButton button) {
 bool Input::isButtonPressed(MouseButton button) {
     switch (button) {
         case MouseButton::MOUSE_WHEEL_UP:
-            return GetMouseWheelMove() == 1.0f;
+            return GetMouseWheelMove() >= 1.0f;
         case MouseButton::MOUSE_WHEEL_DOWN:
-            return GetMouseWheelMove() == -1.0f;
+            return GetMouseWheelMove() <= -1.0f;
         default:
             return IsMouseButtonDown(button);
     }
@@ -36,9 +36,9 @@ bool Input::isButtonJustPressed(GamepadButton button) {
 bool Input::isButtonJustPressed(MouseButton button) {
     switch (button) {
         case MouseButton::MOUSE_WHEEL_UP:
-            return GetMouseWheelMove() == 1.0f;
+            return GetMouseWheelMove() >= 1.0f;
         case MouseButton::MOUSE_WHEEL_DOWN:
-            return GetMouseWheelMove() == -1.0f;
+            return GetMouseWheelMove() <= -1.0f;
         default:
             return IsMouseButtonPressed(button);
     }

diff --git a/engine/src/common/quaternion.h b/engine/src/common/quaternion.h
@@ -5,7 +5,7 @@
 #include "common/vector3.h"
 #include "raylib/raymath.h"
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include "common/raylib.h"
 #include <string>
 using namespace std;

diff --git a/engine/src/common/vector2.h b/engine/src/common/vector2.h
@@ -3,7 +3,7 @@
 
 #include "engine/compiler_settings.h"
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include "common/raylib.h"
 #include <box2d/box2d.h>
 #include <string>

diff --git a/engine/src/common/vector3.h b/engine/src/common/vector3.h
@@ -5,7 +5,7 @@
 #include "common/vector2.h"
 
 #include <raylib/raymath.h>
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include "common/raylib.h"
 #include <box2d/box2d.h>
 #include <string>

diff --git a/engine/src/core/os.h b/engine/src/core/os.h
@@ -10,7 +10,7 @@
 #include <any>
 using namespace std;
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 using json = nlohmann::json;
 
 // Forward declarations

diff --git a/engine/src/core/resource/sprite_animation.cpp b/engine/src/core/resource/sprite_animation.cpp
@@ -1,7 +1,7 @@
 #include "sprite_animation.h"
 
 #include <unordered_map>
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 using json = nlohmann::json;
 using namespace std;
 

diff --git a/engine/src/core/resource/sprite_animation.h b/engine/src/core/resource/sprite_animation.h
@@ -1,5 +1,5 @@
 #include <memory>
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 using json = nlohmann::json;
 
 #include "engine/src/engine.h"

diff --git a/engine/src/node/types/animated_sprite.cpp b/engine/src/node/types/animated_sprite.cpp
@@ -1,7 +1,7 @@
 #include "animated_sprite.h"
 
 #include <memory>
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 using json = nlohmann::json;
 
 #include "common/utils.h"

diff --git a/engine/src/platform/SConscript b/engine/src/platform/SConscript
@@ -5,8 +5,8 @@ from spectre7 import utils
 Import("env")
 
 env.Replace(
-    CPPPATH = [".", env.ENGINE_SRC, join(env.ENGINE_SRC, "platform", env.PLATFORM_NAME), "include"],
-    CCFLAGS = ["-std=c++17", "-g", "-fpermissive", "-Wundef", "-fdiagnostics-color=always", f"-DGIT_COMMIT_HASH='\"{env.getGitHash()}\"'", "-Linclude/lib/vita", "-Wl,-rpath include/lib/vita", "-lbox2d"],
+    CPPPATH = [".", env.ENGINE_SRC, join(env.ENGINE_SRC, "platform", env.PLATFORM_NAME), "include", "include/bullet"],
+    CCFLAGS = ["-std=c++17", "-g", "-fpermissive", "-fdiagnostics-color=always", f"-DGIT_COMMIT_HASH='\"{env.getGitHash()}\"'", "-Linclude/lib/vita", "-Wl,-rpath include/lib/vita", "-lbox2d"],
     LINKFLAGS = ["-g"],
     LIBPATH = [env.LIB_DIR],
     LIBS = [

diff --git a/project/src/nodes/world.cpp b/project/src/nodes/world.cpp
@@ -9,7 +9,7 @@
 
 #include "common/raylib.h"
 #include <btBulletCollisionCommon.h>
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 using json = nlohmann::json;
 
 World* World::singleton = NULL;