From 112517494847f0c86f58544cbf4c35c9b7712ab1 Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Thu, 1 Nov 2018 13:53:16 -0400 Subject: Refactored code and added library Physics code for models now lives in the shared directory. To get file loading without irrlicht, a single-file header library (lib/tinyobjloader-c) was added. Metatables for generics and physics generics have also been seperated out. --- src/client/lua_api/phys/cbphysbox.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/client/lua_api/phys/cbphysbox.cpp') diff --git a/src/client/lua_api/phys/cbphysbox.cpp b/src/client/lua_api/phys/cbphysbox.cpp index 578fc8d..86deacf 100644 --- a/src/client/lua_api/phys/cbphysbox.cpp +++ b/src/client/lua_api/phys/cbphysbox.cpp @@ -16,7 +16,7 @@ extern "C" { #include "../scene/igeneric.hpp" #include -#include "bphysgeneric.hpp" +#include using namespace irr; using namespace scene; @@ -146,11 +146,11 @@ int cbsetmaterial(lua_State* L){ } static const luaL_reg cbphysbox_m[] = { - {"setcpos", cbphyssetpos},//overload - {"getcpos", cbphysgetpos}, - {"getgravity", cbphysgetgravity}, - {"applygravity",cbphysapplygravity}, - {"setMaterial", cbsetmaterial}, + {"setpos", cbphyssetpos},//overload + {"getpos", cbphysgetpos}, + //{"getgravity", cbphysgetgravity}, + //{"applygravity",cbphysapplygravity}, + //{"setMaterial", cbsetmaterial}, // {"delete", delbphysbox},//client side delete needs to delete the visual representation {0, 0}, }; @@ -166,6 +166,7 @@ void cbphysbox_register(lua_State* L){ luaL_getmetatable(L,"phys.physbox");//phys.physbox lua_newtable(L);//phys.physbox,{} luaL_register(L,NULL,brigidbody_m); + luaL_register(L,NULL,igeneric_m); luaL_register(L,NULL,cbphysbox_m);//phys.physbox,{} lua_setfield(L,-2,"__index");//phys.physbox -- cgit v1.2.3-70-g09d2