-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #68 from edunad/features/wrappers
Add missing lua wrappers
- Loading branch information
Showing
151 changed files
with
3,440 additions
and
614 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,7 +24,7 @@ list(PREPEND CONAN_GENERATORS_FOLDER ${CMAKE_BINARY_DIR}) | |
| # --- | ||
|
|
||
| # OPTIONS --- | ||
| option(BUILD_TESTING "Build tests" ON) | ||
| option(RAWRBOX_BUILD_TESTING "Build tests" ON) | ||
| option(RAWRBOX_USE_WAYLAND "Use Wayland for linux" OFF) | ||
|
|
||
| option(RAWRBOX_BUILD_SAMPLES "Build samples" ON) | ||
|
|
@@ -52,6 +52,7 @@ if(RAWRBOX_BUILD_RAWRBOX_3D_PHYSICS) | |
| endif() | ||
|
|
||
| option(RAWRBOX_ENABLE_QHULL "Include QHull on utils" ON) | ||
| option(RAWRBOX_ENABLE_HTTP_REQUEST "Include HTTP requests on utils" ON) | ||
| # ----- | ||
|
|
||
| # OTHER SETTINGS ---- | ||
|
|
@@ -97,11 +98,7 @@ set(CMAKE_SKIP_RPATH TRUE) | |
| set(CMAKE_SKIP_BUILD_RPATH TRUE) | ||
| # --------------------------------- | ||
|
|
||
| # SETUP CCACHE --- | ||
| CPMAddPackage("gh:TheLartians/[email protected]") | ||
| # -------------- | ||
|
|
||
| # PACKAGES ------ | ||
| # GLOBAL PACKAGES ------ | ||
| CPMAddPackage("gh:fmtlib/fmt#10.0.0") | ||
| if(fmt_ADDED) | ||
| set_lib_runtime_mt(fmt) | ||
|
|
@@ -115,6 +112,22 @@ endif() | |
| if(NOT WIN32 AND RAWRBOX_USE_WAYLAND) | ||
| CPMAddPackage("gl:wayland/[email protected]") | ||
| endif() | ||
|
|
||
| CPMAddPackage( | ||
| NAME | ||
| nlohmann_json | ||
| VERSION | ||
| 3.11.2 | ||
| # the git repo is incredibly large, so we download the archived include directory | ||
| URL | ||
| https://github.com/nlohmann/json/releases/download/v3.11.2/include.zip | ||
| URL_HASH | ||
| SHA256=e5c7a9f49a16814be27e4ed0ee900ecd0092bfb7dbfca65b5a421b774dccaaed) | ||
|
|
||
| if(nlohmann_json_ADDED) | ||
| add_library(nlohmann_json INTERFACE IMPORTED) | ||
| target_include_directories(nlohmann_json INTERFACE ${nlohmann_json_SOURCE_DIR}/include) | ||
| endif() | ||
| # -------------------- | ||
|
|
||
| add_subdirectory("math") | ||
|
|
@@ -164,6 +177,10 @@ if(RAWRBOX_BUILD_RAWRBOX_2D_PHYSICS) | |
| endif() | ||
|
|
||
| if(RAWRBOX_BUILD_SAMPLES) | ||
| message(STATUS "Enabled SAMPLES building") | ||
| add_subdirectory("samples") | ||
| if(NOT RAWRBOX_BUILD_RAWRBOX_RESOURCES) | ||
| message(WARNING "Samples require RAWRBOX.RESOURCES to be enabled") | ||
| else() | ||
| message(STATUS "Enabled SAMPLES building") | ||
| add_subdirectory("samples") | ||
| endif() | ||
| endif() | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| #pragma once | ||
| #include <rawrbox/scripting/plugin.hpp> | ||
|
|
||
| namespace rawrbox { | ||
| class BASSPlugin : public rawrbox::Plugin { | ||
| public: | ||
| void registerTypes(sol::state& lua) override { | ||
| } | ||
|
|
||
| void registerGlobal(rawrbox::Mod* mod) override { | ||
| if (mod == nullptr) throw std::runtime_error("[RawrBox-BASSPlugin] Tried to register plugin on invalid mod!"); | ||
| } | ||
|
|
||
| void loadLuaExtensions(rawrbox::Mod* mod) override { | ||
| if (mod == nullptr) throw std::runtime_error("[RawrBox-BASSPlugin] Tried to register plugin on invalid mod!"); | ||
| } | ||
| }; | ||
| } // namespace rawrbox |
Oops, something went wrong.
0b9ed43There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cpp-Linter Report⚠️
Some files did not pass the configured checks!
clang-tidy reports: 2 concern(s)
bass/src/sound/instance.cpp
/bass/src/sound/instance.cpp:30:8: error: [clang-analyzer-optin.cplusplus.VirtualCall,-warnings-as-errors]
render/src/scripting/wrappers/light/manager_wrapper.cpp
/render/src/scripting/wrappers/light/manager_wrapper.cpp:74:59: error: [misc-unused-parameters,-warnings-as-errors]
Have any feedback or feature suggestions? Share it here.