Skip to content

Commit

Permalink
- Update packages
Browse files Browse the repository at this point in the history
- Fix scripting addProperty
  • Loading branch information
edunad committed Oct 8, 2024
1 parent ed2781e commit 5b2ad3d
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ if(RAWRBOX_BUILD_RAWRBOX_RENDER)
endif()
endif()

CPMAddPackage("gh:stephenberry/glaze@3.5.0")
CPMAddPackage("gh:stephenberry/glaze@3.6.2")

# ---
if(RAWRBOX_BUILD_RAWRBOX_NETWORK)
Expand Down
2 changes: 1 addition & 1 deletion rawrbox.imgui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CPMAddPackage(
GIT_TAG
docking
VERSION
1.91.2
1.91.3
DOWNLOAD_ONLY
YES
)
Expand Down
2 changes: 1 addition & 1 deletion rawrbox.scripting/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ CPMAddPackage(
GITHUB_REPOSITORY
luau-lang/luau
GIT_TAG
0.645
0.646
OPTIONS
"LUAU_BUILD_CLI OFF"
"LUAU_BUILD_TESTS OFF"
Expand Down
8 changes: 4 additions & 4 deletions rawrbox.scripting/src/manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,12 @@ namespace rawrbox {
.endNamespace();
// -----------

// ENGINE ------
// ENGINE ------FRAME_ALPHA
luabridge::getGlobalNamespace(L)
.beginNamespace("engine", {})
.addProperty("deltaTime", &rawrbox::DELTA_TIME, false)
.addProperty("fixedDeltaTime", &rawrbox::FIXED_DELTA_TIME, false)
.addProperty("frameAlpha", &rawrbox::FRAME_ALPHA, false)
.addProperty<float*, float*>("deltaTime", &rawrbox::DELTA_TIME, nullptr)
.addProperty<float*, float*>("fixedDeltaTime", &rawrbox::FIXED_DELTA_TIME, nullptr)
.addProperty<float*, float*>("frameAlpha", &rawrbox::FRAME_ALPHA, nullptr)
.endNamespace();
// -------------

Expand Down
3 changes: 0 additions & 3 deletions rawrbox.ui/src/scripting/wrappers/graph_cat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ namespace rawrbox {
luabridge::getGlobalNamespace(L)
.beginClass<rawrbox::UIGraphCategory>("UIGraphCategory")

.addProperty("entries", &rawrbox::UIGraphCategory::entries, false)
.addProperty("smoothed", &rawrbox::UIGraphCategory::smoothed, false)

.addFunction("getName", &rawrbox::UIGraphCategory::getName)
.addFunction("setName", &rawrbox::UIGraphCategory::setName)

Expand Down
6 changes: 3 additions & 3 deletions rawrbox.ui/src/scripting/wrappers/tab.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ namespace rawrbox {
.beginClass<rawrbox::UITab>("UITab")
.addConstructor<void(rawrbox::UITab), void(const std::string&, const std::string&, rawrbox::UIGroup*)>()

.addProperty("id", &rawrbox::UITab::id, false)
.addProperty("name", &rawrbox::UITab::name, false)
.addProperty("group", &rawrbox::UITab::group, false)
.addProperty("id", &rawrbox::UITab::id, nullptr)
.addProperty("name", &rawrbox::UITab::name, nullptr)
.addProperty("group", &rawrbox::UITab::group, nullptr)

.endClass();
}
Expand Down
2 changes: 1 addition & 1 deletion rawrbox.utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ endif()

# DEPS ----
if(RAWRBOX_TRACE_EXCEPTIONS)
CPMAddPackage("gh:jeremy-rifkin/cpptrace@0.7.1")
CPMAddPackage("gh:jeremy-rifkin/cpptrace@0.7.2")
if(cpptrace_ADDED)
set_lib_runtime_mt(cpptrace-lib)
endif()
Expand Down

0 comments on commit 5b2ad3d

Please sign in to comment.