aboutsummaryrefslogtreecommitdiff
path: root/src/client/lua_api/load_scene.cpp
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2017-10-28 18:12:50 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2017-10-28 18:12:50 -0400
commit61c0c9f53d3a57ee7fd5db5faa74c4b51e2da396 (patch)
tree7f828d9557aa28ffcb4c7a1b9b3e3326f3ad0170 /src/client/lua_api/load_scene.cpp
parent33e6b9627e6a46d388d46f2c5b4d15ba7e9f9904 (diff)
downloadbrokengine-61c0c9f53d3a57ee7fd5db5faa74c4b51e2da396.tar.gz
brokengine-61c0c9f53d3a57ee7fd5db5faa74c4b51e2da396.tar.bz2
brokengine-61c0c9f53d3a57ee7fd5db5faa74c4b51e2da396.zip
Lots of updates
* Networking is finally working * Started moveing physics into the shared domain * Streams now have a readString() and writeString() method * streams are passed to the lua context for networking * Refactored cameras and physboxes to use metatables * Finally wrote the pushvector3* and popvector3* methods * Fixed a few crashes in ;main * Deleted a lot of code
Diffstat (limited to 'src/client/lua_api/load_scene.cpp')
-rw-r--r--src/client/lua_api/load_scene.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/client/lua_api/load_scene.cpp b/src/client/lua_api/load_scene.cpp
index 285cba0..6d02a2d 100644
--- a/src/client/lua_api/load_scene.cpp
+++ b/src/client/lua_api/load_scene.cpp
@@ -11,7 +11,7 @@ extern "C" {
#include "scene/icamera.hpp"
#include "scene/imesh.hpp"
#include "scene/ilight.hpp"
-#include "phys/bphysbox.hpp"
+#include "phys/cbphysbox.hpp"
#include "phys/bphysmodel.hpp"
using namespace irr;
@@ -19,13 +19,16 @@ using namespace irr;
extern IrrlichtDevice* device;
void load_scenefuncs(lua_State* L){
+ lua_newtable(L);//{}
+ lua_setglobal(L,"scene");//
icamera_register(L,device);
+
imesh_register(L,device);
ilight_register(L,device);
- bphysbox_register(L,device);
+ lua_newtable(L);
+ lua_setglobal(L,"phys");
+ cbphysbox_register(L);
bphysmodel_register(L,device);
- lua_pop(L, 1);
+ //lua_pop(L, 1);
- lua_newtable(L);
- lua_setglobal(L,"scene");
}