From 33e6b9627e6a46d388d46f2c5b4d15ba7e9f9904 Mon Sep 17 00:00:00 2001
From: Alexander Pickering <alexandermpickering@gmail.com>
Date: Wed, 18 Oct 2017 21:34:55 -0400
Subject: Started refactoring

* Finished a basic server
* Changed from ZMQ to nanomsg (basically the same though)
* Moved some repeated code from the client/server directories into
"shared"
* Edited makefile to reflect new dependencies
---
 src/client/lua_api/load_core.cpp       | 31 -------------------------------
 src/client/lua_api/load_core.hpp       | 14 --------------
 src/client/lua_api/load_scene.cpp      | 31 +++++++++++++++++++++++++++++++
 src/client/lua_api/load_scene.hpp      | 14 ++++++++++++++
 src/client/lua_api/phys/bphysbox.cpp   |  3 ++-
 src/client/lua_api/phys/bphysmodel.cpp |  3 ++-
 6 files changed, 49 insertions(+), 47 deletions(-)
 delete mode 100644 src/client/lua_api/load_core.cpp
 delete mode 100644 src/client/lua_api/load_core.hpp
 create mode 100644 src/client/lua_api/load_scene.cpp
 create mode 100644 src/client/lua_api/load_scene.hpp

(limited to 'src/client/lua_api')

diff --git a/src/client/lua_api/load_core.cpp b/src/client/lua_api/load_core.cpp
deleted file mode 100644
index 4a74d39..0000000
--- a/src/client/lua_api/load_core.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <vector>
-#include <map>
-extern "C" {
-	#include <lua.h>
-	#include <lauxlib.h>
-	#include <lualib.h>
-}
-#include <irrlicht.h>
-#include "scene/icamera.hpp"
-#include "scene/imesh.hpp"
-#include "scene/ilight.hpp"
-#include "phys/bphysbox.hpp"
-#include "phys/bphysmodel.hpp"
-
-using namespace irr;
-
-extern IrrlichtDevice* device;
-
-void load_corefuncs(lua_State* L){
-	icamera_register(L,device);
-	imesh_register(L,device);
-	ilight_register(L,device);
-	bphysbox_register(L,device);
-	bphysmodel_register(L,device);
-	lua_pop(L, 1);
-	
-	lua_newtable(L);
-	lua_setglobal(L,"scene");
-}
diff --git a/src/client/lua_api/load_core.hpp b/src/client/lua_api/load_core.hpp
deleted file mode 100644
index b3b42ff..0000000
--- a/src/client/lua_api/load_core.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __H_loadcore
-#define __H_loadcore
-#include <stdio.h>
-#include <stdlib.h>
-#include <vector>
-extern "C" {
-  #include <lua.h>
-  #include <lauxlib.h>
-  #include <lualib.h>
-}
-#include <irrlicht.h>
-
-void load_corefuncs(lua_State* L);
-#endif
diff --git a/src/client/lua_api/load_scene.cpp b/src/client/lua_api/load_scene.cpp
new file mode 100644
index 0000000..285cba0
--- /dev/null
+++ b/src/client/lua_api/load_scene.cpp
@@ -0,0 +1,31 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <vector>
+#include <map>
+extern "C" {
+	#include <lua.h>
+	#include <lauxlib.h>
+	#include <lualib.h>
+}
+#include <irrlicht.h>
+#include "scene/icamera.hpp"
+#include "scene/imesh.hpp"
+#include "scene/ilight.hpp"
+#include "phys/bphysbox.hpp"
+#include "phys/bphysmodel.hpp"
+
+using namespace irr;
+
+extern IrrlichtDevice* device;
+
+void load_scenefuncs(lua_State* L){
+	icamera_register(L,device);
+	imesh_register(L,device);
+	ilight_register(L,device);
+	bphysbox_register(L,device);
+	bphysmodel_register(L,device);
+	lua_pop(L, 1);
+	
+	lua_newtable(L);
+	lua_setglobal(L,"scene");
+}
diff --git a/src/client/lua_api/load_scene.hpp b/src/client/lua_api/load_scene.hpp
new file mode 100644
index 0000000..7602d08
--- /dev/null
+++ b/src/client/lua_api/load_scene.hpp
@@ -0,0 +1,14 @@
+#ifndef __H_loadscene
+#define __H_loadscene
+#include <stdio.h>
+#include <stdlib.h>
+#include <vector>
+extern "C" {
+  #include <lua.h>
+  #include <lauxlib.h>
+  #include <lualib.h>
+}
+#include <irrlicht.h>
+
+void load_scenefuncs(lua_State* L);
+#endif
diff --git a/src/client/lua_api/phys/bphysbox.cpp b/src/client/lua_api/phys/bphysbox.cpp
index 80cd2eb..a03b488 100644
--- a/src/client/lua_api/phys/bphysbox.cpp
+++ b/src/client/lua_api/phys/bphysbox.cpp
@@ -5,6 +5,7 @@
 #include <memory>
 #include <map>
 #include <functional>
+#include <list>
 extern "C" {
   #include <lua.h>
   #include <lauxlib.h>
@@ -24,7 +25,7 @@ using namespace video;
 extern IrrlichtDevice* device;
 
 extern btDiscreteDynamicsWorld* World;
-extern core::list<btRigidBody*> Objects;
+extern std::list<btRigidBody*> Objects;
 
 static LBPhysNode* checkisbphysbox(lua_State* L, int index){
   void* ud = luaL_checkudata(L,index,"phys.physbox");
diff --git a/src/client/lua_api/phys/bphysmodel.cpp b/src/client/lua_api/phys/bphysmodel.cpp
index 7bdc483..b76b336 100644
--- a/src/client/lua_api/phys/bphysmodel.cpp
+++ b/src/client/lua_api/phys/bphysmodel.cpp
@@ -5,6 +5,7 @@
 #include <memory>
 #include <map>
 #include <functional>
+#include <list>
 extern "C" {
   #include <lua.h>
   #include <lauxlib.h>
@@ -25,7 +26,7 @@ using namespace video;
 extern IrrlichtDevice* device;
 
 extern btDiscreteDynamicsWorld* World;
-extern core::list<btRigidBody*> Objects;
+extern std::list<btRigidBody*> Objects;
 
 static LBPhysNode* checkisbphysmodel(lua_State* L, int index){
   void* ud = luaL_checkudata(L,index,"phys.physmodel");
-- 
cgit v1.2.3-70-g09d2