aboutsummaryrefslogtreecommitdiff
path: root/src/client/lua_api
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/lua_api')
-rw-r--r--src/client/lua_api/gameparts.hpp10
-rw-r--r--src/client/lua_api/gui/iguibutton.cpp4
-rw-r--r--src/client/lua_api/load_core.cpp10
-rw-r--r--src/client/lua_api/load_core.hpp2
-rw-r--r--src/client/lua_api/load_game.cpp2
-rw-r--r--src/client/lua_api/load_game.hpp2
-rw-r--r--src/client/lua_api/load_gui.cpp12
-rw-r--r--src/client/lua_api/load_gui.hpp2
-rw-r--r--src/client/lua_api/load_phys.cpp22
-rw-r--r--src/client/lua_api/load_phys.hpp14
-rw-r--r--src/client/lua_api/phys/bphysbox.cpp286
-rw-r--r--src/client/lua_api/phys/bphysbox.hpp11
-rw-r--r--src/client/lua_api/scene/imesh.cpp2
13 files changed, 363 insertions, 16 deletions
diff --git a/src/client/lua_api/gameparts.hpp b/src/client/lua_api/gameparts.hpp
index 2938ee2..2a14f4a 100644
--- a/src/client/lua_api/gameparts.hpp
+++ b/src/client/lua_api/gameparts.hpp
@@ -1,4 +1,5 @@
#include "../util/hashmap.h"
+#include <btBulletDynamicsCommon.h>
extern "C" {
#include <lua.h>
#include <lauxlib.h>
@@ -9,7 +10,14 @@ typedef struct LISceneNode {
irr::scene::ISceneNode* n;
map_t funcmap;
const char* type;
-} LIGUIElement;
+} LISceneNode;
+
+typedef struct LBPhysNode {
+ irr::scene::ISceneNode* n;
+ btRigidBody* r;
+ map_t funcmap;
+ const char* type;
+} LIPhysNode;
extern lua_State* tL;
extern irr::IrrlichtDevice* gamedevice;
diff --git a/src/client/lua_api/gui/iguibutton.cpp b/src/client/lua_api/gui/iguibutton.cpp
index 6c2fc5a..88aa48e 100644
--- a/src/client/lua_api/gui/iguibutton.cpp
+++ b/src/client/lua_api/gui/iguibutton.cpp
@@ -19,7 +19,7 @@ extern "C" {
using namespace irr;
using namespace gui;
-IrrlichtDevice* device;
+extern IrrlichtDevice* device;
char lhashkey[20];
static LIGUIElement* checkiguibutton(lua_State* L, int index){
@@ -140,7 +140,7 @@ static const luaL_reg iguibutton_m[] = {
};
int iguibutton_register(lua_State* L, IrrlichtDevice* d){
- device = d;
+ //device = d;
tL = L;
luaL_newmetatable(L, "gui.iguibutton");
diff --git a/src/client/lua_api/load_core.cpp b/src/client/lua_api/load_core.cpp
index 2109fd5..152ab76 100644
--- a/src/client/lua_api/load_core.cpp
+++ b/src/client/lua_api/load_core.cpp
@@ -10,12 +10,16 @@ extern "C" {
#include <irrlicht.h>
#include "scene/icamera.hpp"
#include "scene/imesh.hpp"
+#include "phys/bphysbox.hpp"
using namespace irr;
-void load_corefuncs(lua_State* L, IrrlichtDevice* d){
- icamera_register(L,d);
- imesh_register(L,d);
+extern IrrlichtDevice* device;
+
+void load_corefuncs(lua_State* L){
+ icamera_register(L,device);
+ imesh_register(L,device);
+ bphysbox_register(L,device);
lua_pop(L, 1);
lua_newtable(L);
diff --git a/src/client/lua_api/load_core.hpp b/src/client/lua_api/load_core.hpp
index 6280484..b3b42ff 100644
--- a/src/client/lua_api/load_core.hpp
+++ b/src/client/lua_api/load_core.hpp
@@ -10,5 +10,5 @@ extern "C" {
}
#include <irrlicht.h>
-void load_corefuncs(lua_State* L, IrrlichtDevice* device);
+void load_corefuncs(lua_State* L);
#endif
diff --git a/src/client/lua_api/load_game.cpp b/src/client/lua_api/load_game.cpp
index fb51595..92cb2d5 100644
--- a/src/client/lua_api/load_game.cpp
+++ b/src/client/lua_api/load_game.cpp
@@ -18,7 +18,7 @@ using namespace irr;
using namespace gui;
using namespace core;
-void load_gamefuncs(lua_State* L, IrrlichtDevice* d){
+void load_gamefuncs(lua_State* L){
lua_newtable(L);
lua_setglobal(L,"GAME");
}
diff --git a/src/client/lua_api/load_game.hpp b/src/client/lua_api/load_game.hpp
index f20e0c6..41c9135 100644
--- a/src/client/lua_api/load_game.hpp
+++ b/src/client/lua_api/load_game.hpp
@@ -10,5 +10,5 @@ extern "C" {
}
#include <irrlicht.h>
-void load_gamefuncs(lua_State* L, IrrlichtDevice* device);
+void load_gamefuncs(lua_State* L);
#endif
diff --git a/src/client/lua_api/load_gui.cpp b/src/client/lua_api/load_gui.cpp
index 49c40e4..e1a6c99 100644
--- a/src/client/lua_api/load_gui.cpp
+++ b/src/client/lua_api/load_gui.cpp
@@ -19,6 +19,8 @@ using namespace irr;
using namespace gui;
using namespace core;
+extern IrrlichtDevice* device;
+
//Things from guiparts.hpp
std::map<irr::gui::IGUIElement*,int> iguielements;
IrrlichtDevice* guidevice;
@@ -29,15 +31,15 @@ lua_State* tL;
int screenwidth(lua_State* L);
int screenheight(lua_State* L);
-void load_guifuncs(lua_State* L, IrrlichtDevice* d){
+void load_guifuncs(lua_State* L){
tL = L;
- guidevice = d;
+ guidevice = device;
gui_elenum = 0;
guielements[0] = NULL;
- iguibutton_register(L,d);
- iguilabel_register(L,d);
- iguigeneric_register(L,d);
+ iguibutton_register(L,device);
+ iguilabel_register(L,device);
+ iguigeneric_register(L,device);
lua_pop(L, 1);
lua_newtable(L);
diff --git a/src/client/lua_api/load_gui.hpp b/src/client/lua_api/load_gui.hpp
index eb76634..a022306 100644
--- a/src/client/lua_api/load_gui.hpp
+++ b/src/client/lua_api/load_gui.hpp
@@ -10,5 +10,5 @@ extern "C" {
}
#include <irrlicht.h>
-void load_guifuncs(lua_State* L, IrrlichtDevice* device);
+void load_guifuncs(lua_State* L);
#endif
diff --git a/src/client/lua_api/load_phys.cpp b/src/client/lua_api/load_phys.cpp
new file mode 100644
index 0000000..846d34c
--- /dev/null
+++ b/src/client/lua_api/load_phys.cpp
@@ -0,0 +1,22 @@
+#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 "../callbackhandeler.hpp"
+
+using namespace irr;
+using namespace gui;
+using namespace core;
+
+extern IrrlichtDevice* d;
+
+void load_physfuncs(lua_State* L){
+ printf("Called load physfuncs...");
+}
diff --git a/src/client/lua_api/load_phys.hpp b/src/client/lua_api/load_phys.hpp
new file mode 100644
index 0000000..7ee07fe
--- /dev/null
+++ b/src/client/lua_api/load_phys.hpp
@@ -0,0 +1,14 @@
+#ifndef __H_loadphys
+#define __H_loadphys
+#include <stdio.h>
+#include <stdlib.h>
+#include <vector>
+extern "C" {
+ #include <lua.h>
+ #include <lauxlib.h>
+ #include <lualib.h>
+}
+#include <irrlicht.h>
+
+void load_physfuncs(lua_State* L);
+#endif
diff --git a/src/client/lua_api/phys/bphysbox.cpp b/src/client/lua_api/phys/bphysbox.cpp
new file mode 100644
index 0000000..9a87045
--- /dev/null
+++ b/src/client/lua_api/phys/bphysbox.cpp
@@ -0,0 +1,286 @@
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <vector>
+#include <memory>
+#include <map>
+#include <functional>
+extern "C" {
+ #include <lua.h>
+ #include <lauxlib.h>
+ #include <lualib.h>
+}
+#include <irrlicht.h>
+#include "../gameparts.hpp"
+#include "bphysbox.hpp"
+
+using namespace irr;
+using namespace scene;
+using namespace core;
+using namespace video;
+
+extern IrrlichtDevice* device;
+
+extern btDiscreteDynamicsWorld* World;
+extern core::list<btRigidBody*> Objects;
+
+static LBPhysNode* checkisbphysbox(lua_State* L, int index){
+ void* ud = luaL_checkudata(L,index,"phys.physbox");
+ luaL_argcheck(L,ud != NULL, index, "'phys.physbox' expected");
+ return (LBPhysNode*) ud;
+}
+
+/*
+static LISceneNode* checkismesh(lua_State* L){
+ return checkismesh(L,1);
+}
+*/
+
+//iscenecamera.new(Vector position, Vector lookat, parrent)
+// {} {} 0 1
+static int newbphysbox(lua_State* L){
+ printf("Createing bphysbox!\n");
+ int nargs = lua_gettop(L);
+ if(nargs != 3){
+ printf("Incorrect # of args to create a physbox!");
+ }
+ //The model for the mesh
+ //const char* modelpath = luaL_optstring(L,1,"error");
+
+ //Find the vector position
+ lua_pushnumber(L,1);
+ lua_gettable(L,-4);
+ float x = lua_tonumber(L,-1);
+ lua_pop(L,1);
+ lua_pushnumber(L,2);
+ lua_gettable(L,-4);
+ float y = lua_tonumber(L,-1);
+ lua_pop(L,1);
+ lua_pushnumber(L,3);
+ lua_gettable(L,-4);
+ float z = lua_tonumber(L,-1);
+ lua_pop(L,1);
+ printf("Found position for phys box: %f %f %f\n",x,y,z);
+
+ //Find the vector scale
+ lua_pushnumber(L,1);
+ lua_gettable(L,-3);
+ float sx = lua_tonumber(L,-1);
+ lua_pop(L,1);
+ lua_pushnumber(L,2);
+ lua_gettable(L,-3);
+ float sy = lua_tonumber(L,-1);
+ lua_pop(L,1);
+ lua_pushnumber(L,3);
+ lua_gettable(L,-3);
+ float sz = lua_tonumber(L,-1);
+ lua_pop(L,1);
+ printf("Found scale for phys box: %f %f %f\n",sx,sy,sz);
+
+ core::vector3df scale = core::vector3df(sx,sy,sz);
+ btVector3 pos = btVector3(x,y,z);
+ core::vector3df ipos = core::vector3df(x,y,z);
+ //Find the mass
+ float mass = luaL_optint(L,3,0);
+ printf("Found mass for physbox:%f\n",mass);
+
+ // Create an Irrlicht cube
+ scene::ISceneNode* Node = device->getSceneManager()->addCubeSceneNode(
+ ((f32) 1.0f),
+ ((ISceneNode*) 0),
+ ((s32)-1),
+ ipos,
+ core::vector3df(0,0,0),
+ scale
+ );
+ //Node->setScale(scale);
+
+ printf("Added cube scene node and set it's scale\n");
+
+ //Node->setMaterialFlag(video::EMF_WIREFRAME,true)
+ //Node->setMaterialFlag(video::EMF_NORMALIZE_NORMALS, true);
+ Node->setMaterialTexture(0, device->getVideoDriver()->getTexture("sydney.bmp"));
+
+ printf("Set node's lighting stuff...\n");
+
+ // Set the initial position of the object
+ btTransform Transform;
+ Transform.setIdentity();
+ Transform.setOrigin(pos);
+
+ printf("Created transform at pos...\n");
+
+ // Give it a default MotionState
+ btDefaultMotionState *MotionState = new btDefaultMotionState(Transform);
+
+ // Create the shape
+ btVector3 HalfExtents(sx * 0.5f, sy * 0.5f, sz * 0.5f);
+ btCollisionShape *Shape = new btBoxShape(HalfExtents);
+
+ printf("Created collision shape...");
+
+ // Add mass
+ btVector3 LocalInertia;
+ Shape->calculateLocalInertia(mass, LocalInertia);
+
+ // Create the rigid body object
+ btRigidBody *RigidBody = new btRigidBody(mass, MotionState, Shape, LocalInertia);
+
+ printf("Created rigidboxy...");
+
+ // Store a pointer to the irrlicht node so we can update it later
+ RigidBody->setUserPointer((void *)(Node));
+
+ printf("Set user pointer");
+
+ // Add it to the world
+ World->addRigidBody(RigidBody);
+ printf("Added to world");
+ Objects.push_back(RigidBody);
+
+ //Register it's callback
+ printf("Everything created, makeing the lua representation\n");
+
+ //Create it's lua representation
+ LBPhysNode* pnode = (LBPhysNode*)lua_newuserdata(L, sizeof(LBPhysNode));
+ int tref = luaL_ref(L,LUA_REGISTRYINDEX);
+ //iguielements[lcam] = tref;
+ lua_rawgeti(L,LUA_REGISTRYINDEX,tref);//Put it back on the stack since luaL_ref pops the object.
+
+ //Set it's metatable
+ luaL_getmetatable(L, "physbox");
+ lua_setmetatable(L, -2);
+
+ //Create the struct
+ pnode->n = Node;
+ pnode->r = RigidBody;
+ pnode->funcmap = hashmap_new();
+ pnode->type = "bphysbox";
+
+ printf("Done createing lua representation!\n");
+ //Free up anything made in this function
+ //free(label);
+
+ //Put it on top and return it
+ lua_rawgeti(L,LUA_REGISTRYINDEX,tref);
+ return 1;
+}
+
+static int delbphysbox(lua_State* L){
+ LBPhysNode* pnode = checkisbphysbox(L,-1);
+
+ delete pnode->r->getMotionState();
+ delete pnode->r->getCollisionShape();
+ delete pnode->r;
+
+ return 0;
+}
+
+/*mesh:setmaterial("string",layernum=0)*/
+/*
+static int setmaterial(lua_State* L){
+ LISceneNode* n = checkismesh(L,1);
+ u32 layernum = luaL_optint(L,3,0);
+ const char* matfile = luaL_optstring(L,2,"error.png");
+ printf("Setting material on a %s",n->type);
+ IVideoDriver* driver = device->getVideoDriver();
+ n->n->setMaterialTexture( 0, driver->getTexture(matfile) );
+ return 0;
+}
+*/
+
+static int bphyssetpos(lua_State *L){
+ LBPhysNode* i = checkisbphysbox(L,1);
+ btTransform bt = i->r->getWorldTransform();
+
+ lua_pushnumber(L,1);
+ lua_gettable(L,-2);
+ f32 x = (f32)lua_tonumber(L,-1);
+ lua_pop(L,1);
+
+ lua_pushnumber(L,2);
+ lua_gettable(L,-2);
+ f32 y = (f32)lua_tonumber(L,-1);
+ lua_pop(L,1);
+
+ lua_pushnumber(L,3);
+ lua_gettable(L,-2);
+ f32 z = (f32)lua_tonumber(L,-1);
+ lua_pop(L,1);
+
+ btVector3 to = btVector3(x,y,z);
+ printf("managed to set phys origin\n");
+ bt.setOrigin(to);
+ printf("managed to set phys transform\n");
+ i->r->setWorldTransform(bt);
+
+ printf("sucess! returning from call\n");
+ return 0;
+}
+
+static int bphysgetpos(lua_State *L){
+ LBPhysNode* i = checkisbphysbox(L,1);
+ btTransform bt = i->r->getWorldTransform();
+ btVector3 bv = bt.getOrigin();
+
+ lua_createtable(L,3,0);
+
+ lua_pushnumber(L,1);
+ lua_pushnumber(L,bv.x());
+ lua_settable(L,-3);
+
+ lua_pushnumber(L,2);
+ lua_pushnumber(L,bv.y());
+ lua_settable(L,-3);
+
+ lua_pushnumber(L,3);
+ lua_pushnumber(L,bv.z());
+ lua_settable(L,-3);
+
+ return 1;
+}
+
+static const luaL_reg bphysbox_f[] = {
+ {"new", newbphysbox},
+// {"gethandeler", guigethandeler},
+// {"sethandeler", guisethandeler},
+ {0,0},
+};
+
+static const luaL_reg bphysbox_m[] = {
+// {"setMaterial", setmaterial},
+ {"getpos", bphysgetpos},
+ {"setpos", bphyssetpos},
+// {"settext", setiguitext},
+// {"remove", removeiguielement},
+ {0, 0},
+};
+
+int bphysbox_register(lua_State* L, IrrlichtDevice* d){
+
+ device = d;
+
+ printf("bphysbox registered\n");
+
+ luaL_newmetatable(L, "phys.physbox");
+
+ luaL_register(L,"physbox",bphysbox_f);
+
+ lua_pushstring(L,"__index");
+ lua_pushstring(L,"gethandeler");
+ lua_gettable(L,-3);
+ lua_settable(L,-4);
+
+ lua_pushstring(L,"__newindex");
+ lua_pushstring(L,"sethandeler");
+ lua_gettable(L,-3);
+ lua_settable(L,-4);
+
+ lua_pushstring(L,"__gc");
+ lua_pushcfunction(L,delbphysbox);
+ lua_settable(L,-4);
+
+ luaL_register(L, NULL, bphysbox_m);
+
+ return 1;
+}
diff --git a/src/client/lua_api/phys/bphysbox.hpp b/src/client/lua_api/phys/bphysbox.hpp
new file mode 100644
index 0000000..cad3d02
--- /dev/null
+++ b/src/client/lua_api/phys/bphysbox.hpp
@@ -0,0 +1,11 @@
+
+#include <stdio.h>
+#include <stdlib.h>
+extern "C" {
+ #include <lua.h>
+ #include <lauxlib.h>
+ #include <lualib.h>
+}
+#include <irrlicht.h>
+
+int bphysbox_register(lua_State* L, irr::IrrlichtDevice* d);
diff --git a/src/client/lua_api/scene/imesh.cpp b/src/client/lua_api/scene/imesh.cpp
index c2b6510..c95366f 100644
--- a/src/client/lua_api/scene/imesh.cpp
+++ b/src/client/lua_api/scene/imesh.cpp
@@ -81,7 +81,7 @@ static int newiscenemesh(lua_State* L){
/*mesh:setmaterial("string",layernum=0)*/
static int setmaterial(lua_State* L){
LISceneNode* n = checkismesh(L,1);
- u32 layernum = luaL_optint(L,3,0);
+ //u32 layernum = luaL_optint(L,3,0);
const char* matfile = luaL_optstring(L,2,"error.png");
printf("Setting material on a %s",n->type);
IVideoDriver* driver = device->getVideoDriver();
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2026-01-18 11:09:52 +0000