Added tangible_make to world
This commit is contained in:
@@ -5,6 +5,9 @@
|
||||
|
||||
LuaDefineType(World);
|
||||
|
||||
Tangible::Tangible() : world_(nullptr) {
|
||||
}
|
||||
|
||||
World::~World() {
|
||||
}
|
||||
|
||||
@@ -19,6 +22,9 @@ World::World() {
|
||||
// Initialize the userdata metatables.
|
||||
LuaStack::register_all_userdata(lua_state_);
|
||||
|
||||
// Initialize the ID allocator in master mode.
|
||||
id_global_pool_.init_master(10);
|
||||
|
||||
// Prepare to manipulate the lua state.
|
||||
LuaVar world;
|
||||
LuaStack LS(lua_state_, world);
|
||||
@@ -27,6 +33,9 @@ World::World() {
|
||||
LS.newpointer(world, this, false);
|
||||
LS.setfield(LuaRegistry, "world", world);
|
||||
|
||||
// Create the tangibles table in the registry.
|
||||
LS.setfield(LuaRegistry, "tangibles", LuaNewTable);
|
||||
|
||||
// Initialize the SourceDB
|
||||
source_db_.initialize(lua_state_);
|
||||
|
||||
@@ -38,6 +47,39 @@ World::World() {
|
||||
source_db_.run_unittests();
|
||||
}
|
||||
|
||||
Tangible *World::tangible_make(lua_State *L) {
|
||||
LuaVar tangibles, metatab;
|
||||
LuaRet database;
|
||||
LuaStack LS(L, tangibles, database, metatab);
|
||||
|
||||
// Get a fresh ID.
|
||||
int64_t id = id_global_pool_.alloc_id_for_thread(L);
|
||||
|
||||
// Create the C++ part of the structure.
|
||||
Tangible *t = &tangibles_[id];
|
||||
assert(t->world_ == nullptr);
|
||||
t->world_ = this;
|
||||
plane_map_.track(&t->plane_item_);
|
||||
|
||||
// Create the tangible's database and metatable.
|
||||
LS.set(database, LuaNewTable);
|
||||
LS.set(metatab, LuaNewTable);
|
||||
LS.setmetatable(database, metatab);
|
||||
|
||||
// Store the database into the tangibles table.
|
||||
LS.getfield(tangibles, LuaRegistry, "tangibles");
|
||||
LS.rawset(tangibles, id, database);
|
||||
|
||||
// Populate the database and metatable with initial stuff.
|
||||
LS.setfield(database, "inventory", LuaNewTable);
|
||||
LS.setfield(database, "id", id);
|
||||
LS.setfield(metatab, "id", id);
|
||||
// LS.setfield(metatab, "__metatable", LuaNil);
|
||||
|
||||
LS.result();
|
||||
return t;
|
||||
}
|
||||
|
||||
World *World::fetch(lua_State *L) {
|
||||
LuaVar world;
|
||||
LuaStack LS(L, world);
|
||||
@@ -47,3 +89,18 @@ World *World::fetch(lua_State *L) {
|
||||
return w;
|
||||
}
|
||||
|
||||
LuaDefine(tangible_get, "c") {
|
||||
LuaArg id;
|
||||
LuaRet database;
|
||||
LuaVar tangibles;
|
||||
LuaStack LS(L, id, database, tangibles);
|
||||
|
||||
LS.getfield(tangibles, LuaRegistry, "tangibles");
|
||||
LS.rawget(database, tangibles, id);
|
||||
return LS.result();
|
||||
}
|
||||
|
||||
LuaDefine(tangible_make, "c") {
|
||||
World::fetch(L)->tangible_make(L);
|
||||
return 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user