Fixed compilation on Mac env

MafiaHub · Dec 26, 2024 · f14ea23 · f14ea23
1 parent 91d4985
commit f14ea23
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/code/framework/src/integrations/server/scripting/builtins/node/entity.h b/code/framework/src/integrations/server/scripting/builtins/node/entity.h
@@ -195,9 +195,9 @@ namespace Framework::Integrations::Scripting {
 
         static void Register(sol::state &luaEngine) {
             sol::usertype<Entity> cls = luaEngine.new_usertype<Entity>("Entity", sol::constructors<Entity(uint64_t)>());
-            cls.set("id", sol::readonly(&Entity::GetID));
-            cls.set("name", sol::readonly(&Entity::GetName));
-            cls.set("nickname", sol::readonly(&Entity::GetNickname));
+            cls["id"] = sol::property([](const Entity& self) { return self.GetID(); });
+            cls["name"] = sol::property([](const Entity& self) { return self.GetName(); });
+            cls["nickname"] = sol::property([](const Entity& self) { return self.GetNickname(); });
 
             cls["destroy"] = &Entity::Destroy;
             cls["getAlwaysVisible"] = &Entity::IsAlwaysVisible;

diff --git a/code/framework/src/scripting/builtins/color_rgb.h b/code/framework/src/scripting/builtins/color_rgb.h
@@ -85,9 +85,9 @@ namespace Framework::Scripting::Builtins {
 
         static void Register(sol::state &luaEngine) {
             sol::usertype<ColorRGB> cls = luaEngine.new_usertype<ColorRGB>("RGB", sol::constructors<ColorRGB(int, int, int)>());
-            cls.set("r", sol::readonly(&ColorRGB::GetR));
-            cls.set("g", sol::readonly(&ColorRGB::GetG));
-            cls.set("b", sol::readonly(&ColorRGB::GetB));
+            cls["r"] = sol::property([](const ColorRGB& self) { return self.GetR(); });
+            cls["g"] = sol::property([](const ColorRGB& self) { return self.GetG(); });
+            cls["b"] = sol::property([](const ColorRGB& self) { return self.GetB(); });
             cls["toString"] = &ColorRGB::ToString;
             cls["toArray"]  = &ColorRGB::ToArray;
             cls["add"]     = &ColorRGB::Add;

diff --git a/code/framework/src/scripting/builtins/color_rgba.h b/code/framework/src/scripting/builtins/color_rgba.h
@@ -93,10 +93,10 @@ namespace Framework::Scripting::Builtins {
 
         static void Register(sol::state &luaEngine) {
             sol::usertype<ColorRGBA> cls = luaEngine.new_usertype<ColorRGBA>("RGBA", sol::constructors<ColorRGBA(int, int, int, int)>());
-            cls.set("r", sol::readonly(&ColorRGBA::GetR));
-            cls.set("g", sol::readonly(&ColorRGBA::GetG));
-            cls.set("b", sol::readonly(&ColorRGBA::GetB));
-            cls.set("a", sol::readonly(&ColorRGBA::GetA));
+            cls["r"] = sol::property([](const ColorRGBA& self) { return self.GetR(); });
+            cls["g"] = sol::property([](const ColorRGBA& self) { return self.GetG(); });
+            cls["b"] = sol::property([](const ColorRGBA& self) { return self.GetB(); });
+            cls["a"] = sol::property([](const ColorRGBA& self) { return self.GetA(); });
             cls["toString"] = &ColorRGBA::ToString;
             cls["toArray"]  = &ColorRGBA::ToArray;
             cls["add"]     = &ColorRGBA::Add;

diff --git a/code/framework/src/scripting/builtins/quaternion.h b/code/framework/src/scripting/builtins/quaternion.h
@@ -111,11 +111,11 @@ namespace Framework::Scripting::Builtins {
 
         static void Register(sol::state &luaEngine) {
             sol::usertype<Quaternion> cls = luaEngine.new_usertype<Quaternion>("Quaternion", sol::constructors<Quaternion(float, float, float, float)>());
-            cls.set("w", sol::readonly(&Quaternion::GetW));
-            cls.set("x", sol::readonly(&Quaternion::GetX));
-            cls.set("y", sol::readonly(&Quaternion::GetY));
-            cls.set("z", sol::readonly(&Quaternion::GetZ));
-            cls.set("length", sol::readonly(&Quaternion::GetLength));
+            cls["w"] = sol::property([](const Quaternion& self) { return self.GetW(); });
+            cls["x"] = sol::property([](const Quaternion& self) { return self.GetX(); });
+            cls["y"] = sol::property([](const Quaternion& self) { return self.GetY(); });
+            cls["z"] = sol::property([](const Quaternion& self) { return self.GetZ(); });
+            cls["length"] = sol::property([](const Quaternion& self) { return self.GetLength(); });
             cls["toString"] = &Quaternion::ToString;
             cls["toArray"]  = &Quaternion::ToArray;
             cls["add"]     = &Quaternion::Add;

diff --git a/code/framework/src/scripting/builtins/vector_2.h b/code/framework/src/scripting/builtins/vector_2.h
@@ -74,9 +74,9 @@ namespace Framework::Scripting::Builtins {
 
         static void Register(sol::state &luaEngine) {
             sol::usertype<Vector2> cls = luaEngine.new_usertype<Vector2>("Vector2", sol::constructors<Vector2(double, double)>());
-            cls.set("x", sol::readonly(&Vector2::GetX));
-            cls.set("y", sol::readonly(&Vector2::GetY));
-            cls.set("length", sol::readonly(&Vector2::GetLength));
+            cls["x"] = sol::property([](const Vector2& self) { return self.GetX(); });
+            cls["y"] = sol::property([](const Vector2& self) { return self.GetY(); });
+            cls["length"] = sol::property([](const Vector2& self) { return self.GetLength(); });
             cls["toString"] = &Vector2::ToString;
             cls["toArray"]  = &Vector2::ToArray;
             cls["add"]     = &Vector2::Add;

diff --git a/code/framework/src/scripting/builtins/vector_3.h b/code/framework/src/scripting/builtins/vector_3.h
@@ -78,10 +78,10 @@ namespace Framework::Scripting::Builtins {
 
         static void Register(sol::state &luaEngine) {
             sol::usertype<Vector3> cls = luaEngine.new_usertype<Vector3>("Vector3", sol::constructors<Vector3(double, double, double)>());
-            cls.set("x", sol::readonly(&Vector3::GetX));
-            cls.set("y", sol::readonly(&Vector3::GetY));
-            cls.set("z", sol::readonly(&Vector3::GetZ));
-            cls.set("length", sol::readonly(&Vector3::GetLength));
+            cls["x"] = sol::property([](const Vector3& self) { return self.GetX(); });
+            cls["y"] = sol::property([](const Vector3& self) { return self.GetY(); });
+            cls["z"] = sol::property([](const Vector3& self) { return self.GetZ(); });
+            cls["length"] = sol::property([](const Vector3& self) { return self.GetLength(); });
             cls["toString"] = &Vector3::ToString;
             cls["toArray"]  = &Vector3::ToArray;
             cls["add"]     = &Vector3::Add;