Entity Classes: Provide a data table

Author: rasikhq

VCMP-LUA/vcmpWrap/Classes/Bind.cpp

@@ -11,6 +11,7 @@ void Bind::clearAllBinds() {
 }
 
 void Bind::Register(Bind* bind) {
+	bind->m_LuaData = Lua.create_table();
 	s_Binds.emplace_back(bind);
 }
 
@@ -106,4 +107,7 @@ void Bind::Init(sol::state* L) {
 
 	/*** PROPERTIES ***/
 	userdata["tag"] = sol::property(&Bind::getTag, &Bind::setTag);
+
+	/*** COMMON PROPERTIES AMONGST ENTITIES ***/
+	userdata["data"] = &Bind::m_LuaData;
 }

VCMP-LUA/vcmpWrap/Classes/Bind.h

@@ -16,6 +16,10 @@ class Bind
 	static inline const char* getStaticType() { return "Bind"; }
 	static void clearAllBinds();
 
+	/*** @Lua meta-functions & extra ***/
+	bool operator==(const Bind& other) { return this->m_ID == other.m_ID; }
+	int32_t operator()() { return this->m_ID; }
+
 	/*** CONSTRUCTORS ***/
 	Bind(bool, int32_t, int32_t = 0, int32_t = 0);
 
@@ -40,4 +44,5 @@ class Bind
 private:
 	int32_t m_ID;
 	std::string m_Tag = "";
+	sol::table m_LuaData;
 };

VCMP-LUA/vcmpWrap/Classes/Checkpoint.cpp

@@ -7,6 +7,7 @@ extern sol::state Lua;
 std::vector<Checkpoint*> Checkpoint::s_Checkpoints;
 
 void Checkpoint::Register(Checkpoint* inst) {
+	inst->m_LuaData = Lua.create_table();
 	s_Checkpoints.emplace_back(inst);
 }
 
@@ -177,5 +178,6 @@ void Checkpoint::Init(sol::state* L) {
 	userdata["alpha"] = sol::property(&Checkpoint::getAlpha, &Checkpoint::setAlpha);
 
 	/*** COMMON PROPERTIES AMONGST ENTITIES ***/
+	userdata["data"] = &Checkpoint::m_LuaData;
 	userdata["position"] = sol::property(&Checkpoint::getPosition, &Checkpoint::setPosition);
 }

VCMP-LUA/vcmpWrap/Classes/Checkpoint.h

@@ -18,6 +18,10 @@ class Checkpoint
 	static inline const char* getStaticType() { return "Checkpoint"; }
 	static sol::table getActive();
 
+	/*** @Lua meta-functions & extra ***/
+	bool operator==(const Checkpoint& other) { return this->m_ID == other.m_ID; }
+	int32_t operator()() { return this->m_ID; }
+
 	/*** CONSTRUCTORS ***/
 	Checkpoint(Player*, int32_t, bool, sol::table, sol::table, float);
 	Checkpoint(Player*, int32_t, bool, float, float, float, sol::table, float);
@@ -52,4 +56,5 @@ class Checkpoint
 	void setPosition(sol::table);
 private:
 	int32_t m_ID;
+	sol::table m_LuaData;
 };

VCMP-LUA/vcmpWrap/Classes/Object.cpp

@@ -7,6 +7,7 @@ extern sol::state Lua;
 std::vector<Object*> Object::s_Objects;
 
 void Object::Register(Object* inst) {
+	inst->m_LuaData = Lua.create_table();
 	s_Objects.emplace_back(inst);
 }
 
@@ -260,6 +261,7 @@ void Object::Init(sol::state* L) {
 	userdata["trackTouch"] = sol::property(&Object::getBumpReports, &Object::setBumpReports);
 
 	/*** COMMON PROPERTIES AMONGST ENTITIES ***/
+	userdata["data"] = &Object::m_LuaData;
 	userdata["position"] = sol::property(&Object::getPosition, &Object::setPosition);
 	userdata["angle"] = sol::property(&Object::getRotation, &Object::setRotation);
 }

VCMP-LUA/vcmpWrap/Classes/Object.h

@@ -20,6 +20,10 @@ class Object
 	static inline const char* getStaticType() { return "Object"; }
 	static sol::table getActive();
 
+	/*** @Lua meta-functions & extra ***/
+	bool operator==(const Object& other) { return this->m_ID == other.m_ID; }
+	int32_t operator()() { return this->m_ID; }
+
 	/*** CONSTRUCTORS ***/
 	Object(int32_t, int32_t, float, float, float, int32_t = 255);
 	Object(int32_t, int32_t, sol::table);
@@ -73,5 +77,6 @@ class Object
 	/******/
 private:
 	int32_t m_ID;
+	sol::table m_LuaData;
 };
 

VCMP-LUA/vcmpWrap/Classes/Pickup.cpp

@@ -7,6 +7,7 @@ extern sol::state Lua;
 std::vector<Pickup*> Pickup::s_Pickups;
 
 void Pickup::Register(Pickup* inst) {
+	inst->m_LuaData = Lua.create_table();
 	s_Pickups.emplace_back(inst);
 }
 
@@ -181,5 +182,6 @@ void Pickup::Init(sol::state* L) {
 	userdata["autoTimer"] = sol::property(&Pickup::getAutoTimer, &Pickup::setAutoTimer);
 
 	/*** COMMON PROPERTIES AMONGST ENTITIES ***/
+	userdata["data"] = &Pickup::m_LuaData;
 	userdata["position"] = sol::property(&Pickup::getPosition, &Pickup::setPosition);
 }

VCMP-LUA/vcmpWrap/Classes/Pickup.h

@@ -17,6 +17,10 @@ class Pickup
 	static inline const char* getStaticType() { return "Pickup"; }
 	static sol::table getActive();
 
+	/*** @Lua meta-functions & extra ***/
+	bool operator==(const Pickup& other) { return this->m_ID == other.m_ID; }
+	int32_t operator()() { return this->m_ID; }
+
 	/*** CONSTRUCTORS ***/
 	Pickup(int32_t, int32_t, int32_t, sol::table, int32_t, bool);
 	Pickup(int32_t, int32_t, int32_t, float, float, float, int32_t, bool);
@@ -53,4 +57,5 @@ class Pickup
 	void setPosition(sol::table);
 private:
 	int32_t m_ID;
+	sol::table m_LuaData;
 };

VCMP-LUA/vcmpWrap/Classes/Player.cpp

@@ -46,7 +46,7 @@ void Player::msgAll(const std::string& msg, sol::variadic_args args)
 }
 
 Player::Player(int32_t id)
-	: m_ID(id) {
+	: m_ID(id), m_LuaData(Lua.create_table()) {
 
 	g_Funcs->GetPlayerName(id, m_Name, sizeof(m_Name));
 }
@@ -559,6 +559,7 @@ void Player::Init(sol::state* L) {
 	userdata["aimPosition"] = sol::property(&Player::getAimPos);
 
 	/*** COMMON PROPERTIES AMONGST ENTITIES ***/
+	userdata["data"] = &Player::m_LuaData;
 	userdata["position"] = sol::property(&Player::getPosition, &Player::setPosition);
 	userdata["angle"] = sol::property(&Player::getRotation, &Player::setRotation);
 }

VCMP-LUA/vcmpWrap/Classes/Player.h

@@ -17,6 +17,10 @@ class Player {
 	static inline const char* getStaticType() { return "Player"; }
 	static sol::table getActive(bool spawned = false);
 	static void msgAll(const std::string& msg, sol::variadic_args args);
+	
+	/*** @Lua meta-functions & extra ***/
+	bool operator==(const Player& other) { return this->m_ID == other.m_ID; }
+	int32_t operator()() { return this->m_ID; }
 
 	/*** CONSTRUCTORS ***/
 	Player(int32_t id);
@@ -127,4 +131,5 @@ class Player {
 private:
 	int32_t m_ID;
 	char m_Name[24];
+	sol::table m_LuaData;
 };