From ef25a513437196a3ea9ee45e6e03565eb86067d2 Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Thu, 28 Jun 2018 16:05:26 -0600 Subject: Simplified makefile Made makefile much simpiler, added option to build dynamically with DEBUG=true --- Makefile | 412 +++++++++++++++++++++----------- bin/client/bin/.gitignore | 2 + bin/client/data/init.lua | 3 + bin/server/.gitignore | 0 bin/server/bin/.gitignore | 2 + build/.gitignore | 0 build/client/lua_api/.gitignore | 0 build/client/lua_api/gui/.gitignore | 0 build/client/lua_api/phys/.gitignore | 0 build/client/lua_api/scene/.gitignore | 0 build/client/lua_api/video/.gitignore | 0 build/client/phys/.gitignore | 0 build/client/util/.gitignore | 0 src/client/lua_api/gui/iguibutton.cpp | 4 +- src/client/lua_api/gui/iguicheckbox.cpp | 2 +- src/client/lua_api/gui/iguielement.cpp | 2 +- src/client/lua_api/gui/iguiimage.cpp | 2 +- src/client/lua_api/gui/iguiwindow.cpp | 21 +- src/client/lua_api/load_video.cpp | 2 +- src/client/lua_api/phys/bphysbuffer.cpp | 193 ++++----------- src/client/lua_api/phys/bphysbuffer.hpp | 2 +- src/client/lua_api/phys/bphysmodel.hpp | 9 +- src/client/lua_api/phys/butil.cpp | 26 -- src/client/lua_api/phys/butil.hpp | 9 - src/client/lua_api/phys/cbphysbox.cpp | 3 +- src/client/lua_api/scene/icamera.cpp | 2 +- src/client/lua_api/scene/icube.cpp | 68 ------ src/client/lua_api/scene/icube.hpp | 11 - src/client/lua_api/scene/igeneric.cpp | 2 +- src/client/lua_api/scene/ilight.cpp | 2 +- src/client/lua_api/scene/imesh.cpp | 2 +- src/client/lua_api/video/iimage.cpp | 2 +- src/client/lua_api/video/itexture.cpp | 2 +- src/client/main.cpp | 2 +- src/shared/lua_api/common.c | 205 ---------------- src/shared/lua_api/common.cpp | 205 ++++++++++++++++ src/shared/lua_api/common.h | 20 -- src/shared/lua_api/common.hpp | 20 ++ src/shared/lua_api/load_net.cpp | 2 +- src/shared/lua_api/phys/bphysbox.cpp | 2 +- src/shared/lua_api/phys/bphysbox.hpp | 1 - src/shared/phys/physcommon.hpp | 3 +- src/shared/util/hashmap.c | 397 ------------------------------ src/shared/util/hashmap.cpp | 397 ++++++++++++++++++++++++++++++ src/shared/util/hashmap.h | 81 ------- src/shared/util/hashmap.hpp | 81 +++++++ 46 files changed, 1058 insertions(+), 1143 deletions(-) create mode 100644 bin/server/.gitignore create mode 100644 build/.gitignore create mode 100644 build/client/lua_api/.gitignore create mode 100644 build/client/lua_api/gui/.gitignore create mode 100644 build/client/lua_api/phys/.gitignore create mode 100644 build/client/lua_api/scene/.gitignore create mode 100644 build/client/lua_api/video/.gitignore create mode 100644 build/client/phys/.gitignore create mode 100644 build/client/util/.gitignore delete mode 100644 src/client/lua_api/phys/butil.cpp delete mode 100644 src/client/lua_api/phys/butil.hpp delete mode 100644 src/client/lua_api/scene/icube.cpp delete mode 100644 src/client/lua_api/scene/icube.hpp delete mode 100644 src/shared/lua_api/common.c create mode 100644 src/shared/lua_api/common.cpp delete mode 100644 src/shared/lua_api/common.h create mode 100644 src/shared/lua_api/common.hpp delete mode 100644 src/shared/util/hashmap.c create mode 100644 src/shared/util/hashmap.cpp delete mode 100644 src/shared/util/hashmap.h create mode 100644 src/shared/util/hashmap.hpp diff --git a/Makefile b/Makefile index d308319..2936037 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ endif ifeq ($(UNAME), Windows) EXE_EXT=.exe - STA_LIB_EXT=.lib + STA_LIB_EXT=.a DYN_LIB_EXT=.dll CMAKE_TYPE="MinGW Makefiles" CMAKE_FLAGS=-G $(CMAKE_TYPE) -DCMAKE_SH="CMAKE_SH-NOTFOUND" @@ -22,78 +22,128 @@ ifeq ($(UNAME), Linux) CMAKE_FLAGS= -G $(CMAKE_TYPE) endif +BIN_DIR=bin +BUILD_DIR=build +SRC_DIR=src +LIB_DIR=lib +DOC_DIR=doc + +CLIENTNAME=client +SERVERNAME=server +MASTERNAME=masterserver + +EX_PRE = brokengine_ +EX_PARTS = $(CLIENTNAME) $(SERVERNAME) $(MASTERNAME) + +NAMES = $(EX_PARTS:%=$(EX_PRE)%) +BINS+= $(foreach part,$(EX_PARTS),$(BIN_DIR)/$(part)/bin/$(EX_PRE)$(part)$(EXE_EXT)) +BUILDS = $(EX_PARTS:%=$(BUILD_DIR)/%) +SRC_DIRS = $(EX_PARTS:%=$(SRC_DIR)/%) #Run with mingw32-make -CLIENT_NAME=brokengine -CLIENT_EXE=$(CLIENT_NAME)$(EXE_EXT) -CLIENT_DIR=bin/client/bin -CLIENT_PATH=$(CLIENT_DIR)/$(CLIENT_EXE) -CLIENT_SRC=src/client/ -CLIENT_BUILD=build/client/ +#CLIENT_NAME=brokengine +#CLIENT_EXE=$(CLIENT_NAME)$(EXE_EXT) +#CLIENT_DIR=$(BIN_DIR)/client/bin +#CLIENT_PATH=$(CLIENT_DIR)/$(CLIENT_EXE) +#CLIENT_SRC=$(SRC_DIR)/client +#CLIENT_BUILD_DIR=$(BUILD_DIR)/client -SERVER_NAME=brokeserver -SERVER_EXE=$(SERVER_NAME)$(EXE_EXT) -SERVER_DIR=bin/server/bin -SERVER_PATH=$(SERVER_DIR)/$(SERVER_EXE) -SERVER_SRC=src/server/ -SERVER_BUILD=build/server/ +#SERVER_NAME=brokeserver +#SERVER_EXE=$(SERVER_NAME)$(EXE_EXT) +#SERVER_DIR=bin/server/bin +#SERVER_PATH=$(SERVER_DIR)/$(SERVER_EXE) +#SERVER_SRC=src/server/ +#SERVER_BUILD=build/server/ -SHARED_SRC=src/shared/ +#SHARED_SRC=src/shared/ -TEST_PATH=bin/test/ -TEST_SRC=src/test/ +#TEST_PATH=bin/test/ +#TEST_SRC=src/test/ -MASTER_EXE=borkmaster.exe +#MASTER_EXE=borkmaster.exe +CXX?=g++ +MKDIR?=mkdir +RM?=rm -f +ECHO?=echo -#Change these on linux -CC=g++ -MKDIR=mkdir -RM=rm -f -ECHO=printf +LLUADIR=$(LIB_DIR)/luajit +LIRRDIR=$(LIB_DIR)/irrlicht +LBULDIR=$(LIB_DIR)/bullet +LNANDIR=$(LIB_DIR)/nanomsg #Include directories -ILUADIR=./lib/luajit/src -IIRRDIR=./lib/irrlicht/include -IBULDIR=./lib/bullet/src -INANDIR=./lib/nanomsg/src -ISHADIR=./src -INCLUDES=-I$(ILUADIR) -I$(IIRRDIR) -I$(IBULDIR) -I$(INANDIR) -I$(ISHADIR) +ILUADIR=$(LLUADIR)/src +IIRRDIR=$(LIRRDIR)/include +IBULDIR=$(LBULDIR)/src +INANDIR=$(LNANDIR)/src +ISHADIR=src +INCLUDE_PATHS=-I$(ILUADIR) -I$(IIRRDIR) -I$(IBULDIR) -I$(INANDIR) -I$(ISHADIR) #library directories -LLUADIR=lib/luajit -LIRRDIR=lib/irrlicht -LBULDIR=lib/bullet -LNANDIR=lib/nanomsg -LIBRARIES=-Llib +CXXFLAGS+=$(INCLUDE_PATHS) + +LDFLAGS+=-Llib #Libraries -LIBLUA=lib/libluajit.a -LIBIRR=lib/libIrrlicht.a -LIBBCO=lib/libBulletCollision.a -LIBBDY=lib/libBulletDynamics.a -LIBBLM=lib/libLinearMath.a -LIBNAN=lib/libnanomsg.a +#static libs +LIB_S_LUA=lib/libluajit.a +LIB_S_IRR=lib/Irrlicht.a +LIB_S_BCO=lib/libBulletCollision.a +LIB_S_BDY=lib/libBulletDynamics.a +LIB_S_BLM=lib/libLinearMath.a +LIB_S_NAN=lib/libnanomsg.a + +#dynamic libraries +LIB_D_LUA=lib/lua51$(DYN_LIB_EXT) +LIB_D_IRR=lib/Irrlicht$(DYN_LIB_EXT) +# Bullet cannot be built dynamically +LIB_D_BCO=$(LIB_S_BCO) +LIB_D_BDY=$(LIB_S_BDY) +LIB_D_BLM=$(LIB_S_BLM) +LIB_D_NAN=lib/nanomsg/libnanomsg$(DYN_LIB_EXT) + +DLLS=Irrlicht libnanomsg lua51 +BINS= +ifeq ($(DEBUG),true) + LIB_OBJS = $(LIB_D_LUA) $(LIB_D_IRR) $(LIB_D_BCO) $(LIB_D_BDY) $(LIB_D_BLM) $(LIB_D_NAN) + BINS+=$(DLLS:%=$(BIN_DIR)/$(CLIENTNAME)/bin/%$(DYN_LIB_EXT)) +else + LIB_OBJS = $(LIB_S_LUA) $(LIB_S_IRR) $(LIB_S_BCO) $(LIB_S_BDY) $(LIB_S_BLM) $(LIB_S_NAN) +endif -DLLIRR=$(LIRRDIR)/Irrlicht.dll +#LIBLUA=lib/libluajit.a +#LIBIRR=lib/libIrrlicht.a +#LIBBCO=lib/libBulletCollision.a +#LIBBDY=lib/libBulletDynamics.a +#LIBBLM=lib/libLinearMath.a +#LIBNAN=lib/libnanomsg.a -DYNAMIC_LIBS = #-lnanomsg.dll #-lIrrlicht +#DLLIRR=$(LIRRDIR)/Irrlicht.dll + +# Libraries #order matters! -STATIC_LIBS = -lBulletDynamics -lBulletCollision -lLinearMath -lIrrlicht -lluajit -lnanomsg +LIBS=-lBulletDynamics -lBulletCollision -lLinearMath -lIrrlicht -lnanomsg ifeq ($(UNAME),Windows) - STATIC_LIBS+=-lOpenGL32 + LIBS+=-lOpenGL32 else - DYNAMIC_LIBS+=-lGL + LIBS+=-lGL +endif +ifeq ($(DEBUG),true) + LIBS+=-llua51 +else + LIBS+=-lluajit endif -LIBS=-Bstatic $(STATIC_LIBS) -Bdynamic $(DYNAMIC_LIBS) - -SLIBS=$(LIBLUA) $(LIBIRR) $(LIBBDY) $(LIBBCO) $(LIBBLM) $(LIBNAN) +#can't compile with -std=c++11 because irrlicht will complain +CXXFLAGS+=-Wall +LDFLAGS+=$(LIBS) +ifeq ($(DEBUG), true) +else + CXXFLAGS += -static $(INCLUDE_PATHS) -D_IRR_STATIC_LIB_ -DNN_STATIC_LIB +endif -#can't compile with -std=c++11 because irrlicht will complain -CFLAGS=-Wall -static $(INCLUDES) -D_IRR_STATIC_LIB_ -DNN_STATIC_LIB -LDFLAGS= ifeq ($(UNAME),Windows) LDFLAGS+=-mwindows -lwinmm #-Wl,-subsystem,windows STATIC_LIBS+=-lws2_32 -lmswsock -ladvapi32 @@ -106,120 +156,161 @@ ifeq ($(UNAME),true) endif ifeq ($(DEBUG),true) - CFLAGS+=-g + CXXFLAGS+=-O0 -g else - CFLAGS+=-O3 + CXXFLAGS+=-O3 #LDFLAGS+=--strip-all endif -all : $(CLIENT_PATH) $(SERVER_PATH) + +FSYSTEM_FOLDERS = lua_api phys util lua_api/irr lua_api/phys lua_api/gui lua_api/scene lua_api/video +CLIENT_BUILD_FOLDERS = $(FSYSTEM_FOLDERS:%=$(BUILD_DIR)/$(CLIENTNAME)/%) + +all : $(BINS) client : $(CLIENT_PATH) server : $(SERVER_PATH) +SHARED_CLIENT_FILES = lua_api/common phys/physcommon lua_api/phys/bphysbox util/hashmap lua_api/stream lua_api/load_net +SHARED_CLIENT_OBJS = $(SHARED_CLIENT_FILES:%=$(BUILD_DIR)/$(CLIENTNAME)/%.o) + +# The client-side only stuff +LAPI_GUI = iguibutton iguicheckbox iguielement iguiimage iguilabel iguiskin iguiutil iguiwindow +LAPI_PHYS = bphysmodel cbphysbox +LAPI_SCENE = icamera igeneric ilight imesh +LAPI_VIDEO = iimage itexture smaterial +LAPI_LOAD = load_gui load_game load_scene load_phys load_video +LAPI_OBJS_T = $(LAPI_GUI:%=gui/%.o) $(LAPI_PHYS:%=phys/%.o) $(LAPI_SCENE:%=scene/%.o) $(LAPI_VIDEO:%=video/%.o) +LAPI_OBJS = $(LAPI_OBJS_T:%=$(BUILD_DIR)/$(CLIENTNAME)/lua_api/%) $(LAPI_LOAD:%=$(BUILD_DIR)/$(CLIENTNAME)/lua_api/%.o) +CLIENT_FILES = initdevice menuhandeler callbackhandeler +CLIENT_SRCS = $(CLIENT_FILES:%=$(BUILD_DIR)/$(CLIENTNAME)/%.o) $(LAPI_OBJS) +CLIENT_OBJS = $(BUILD_DIR)/$(CLIENTNAME)/main.o $(CLIENT_SRCS) $(SHARED_CLIENT_OBJS) + #Compile the client -$(CLIENT_PATH) : $(CLIENT_BUILD)main.o $(CLIENT_BUILD)initdevice.o $(CLIENT_BUILD)menuhandeler.o $(CLIENT_BUILD)load_gui.o $(CLIENT_BUILD)callbackhandeler.o $(CLIENT_BUILD)load_game.o $(CLIENT_BUILD)load_scene.o $(CLIENT_BUILD)load_phys.o $(CLIENT_BUILD)common.o $(CLIENT_BUILD)load_net.o $(CLIENT_BUILD)physcommon.o $(SLIBS) $(CLIENT_BUILD)load_video.o - $(CC) $(CFLAGS) -o $(CLIENT_PATH) $(CLIENT_BUILD)*.o $(LIBRARIES) $(DYNAMIC_LIBS) $(STATIC_LIBS) $(SLIBS) $(LDFLAGS) +$(BIN_DIR)/$(CLIENTNAME)/bin/$(EX_PRE)$(CLIENTNAME)$(EXE_EXT) : $(CLIENT_OBJS) $(LIB_OBJS) + $(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -$(CLIENT_BUILD)main.o : $(CLIENT_SRC)main.cpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)main.o $(CLIENT_SRC)main.cpp +# does not have .hpp associated +$(BUILD_DIR)/$(CLIENTNAME)/main.o : $(SRC_DIR)/client/main.cpp + $(CXX) $(CXXFLAGS) -c -o $@ $^ -$(CLIENT_BUILD)physcommon.o : $(SHARED_SRC)phys/physcommon.cpp $(SHARED_SRC)phys/physcommon.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)physcommon.o $(SHARED_SRC)phys/physcommon.cpp +$(CLIENT_SRCS) : $(BUILD_DIR)/$(CLIENTNAME)/%.o : src/client/%.cpp $(SRC_DIR)/client/%.hpp + @echo "Building client $^" + $(CXX) $(CXXFLAGS) -c -o $@ $< -$(CLIENT_BUILD)load_net.o : $(SHARED_SRC)lua_api/load_net.cpp $(SHARED_SRC)lua_api/load_net.hpp $(CLIENT_BUILD)stream.o - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_net.o $(SHARED_SRC)lua_api/load_net.cpp +$(SHARED_CLIENT_OBJS) : $(BUILD_DIR)/$(CLIENTNAME)/%.o : src/shared/%.cpp $(SRC_DIR)/shared/%.hpp + @echo "Building shared $<" + $(CXX) $(CXXFLAGS) -c -o $@ $< -$(CLIENT_BUILD)stream.o : $(SHARED_SRC)lua_api/stream.cpp $(SHARED_SRC)lua_api/stream.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)stream.o $(SHARED_SRC)lua_api/stream.cpp +#$(BUILD_DIR)/$(CLIENTNAME)/lua_api/common.o : $(SRC_DIR)/shared/lua_api/common.c $(SRC_DIR)/shared/lua_api/common.h + #$(CXX) $(CXXFLAGS) -c -o $@ $^ +#$(CLIENT_OBJS) : build/%.o : src/%.cpp + #$(CXX) $(CXXFLAGS) -c -o $@ $^ -$(CLIENT_BUILD)common.o : $(SHARED_SRC)lua_api/common.c $(SHARED_SRC)lua_api/common.h - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)common.o $(SHARED_SRC)lua_api/common.c +#$(CLIENT_BUILD)main.o : $(CLIENT_SRC)main.cpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)main.o $(CLIENT_SRC)main.cpp -$(CLIENT_BUILD)initdevice.o : $(CLIENT_SRC)initdevice.cpp $(CLIENT_SRC)initdevice.hpp - $(CC) $(CFLAGS) -c -static -o $(CLIENT_BUILD)initdevice.o $(CLIENT_SRC)initdevice.cpp +#$(CLIENT_BUILD)physcommon.o : $(SHARED_SRC)phys/physcommon.cpp $(SHARED_SRC)phys/physcommon.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)physcommon.o $(SHARED_SRC)phys/physcommon.cpp -$(CLIENT_BUILD)menuhandeler.o : $(CLIENT_SRC)menuhandeler.cpp $(CLIENT_SRC)menuhandeler.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)menuhandeler.o $(CLIENT_SRC)menuhandeler.cpp +#$(CLIENT_BUILD)load_net.o : $(SHARED_SRC)lua_api/load_net.cpp $(SHARED_SRC)lua_api/load_net.hpp $(CLIENT_BUILD)stream.o + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_net.o $(SHARED_SRC)lua_api/load_net.cpp -$(CLIENT_BUILD)load_game.o : $(CLIENT_SRC)lua_api/load_game.cpp $(CLIENT_SRC)lua_api/load_game.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_game.o $(CLIENT_SRC)lua_api/load_game.cpp +#$(CLIENT_BUILD)stream.o : $(SHARED_SRC)lua_api/stream.cpp $(SHARED_SRC)lua_api/stream.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)stream.o $(SHARED_SRC)lua_api/stream.cpp -$(CLIENT_BUILD)load_gui.o : $(CLIENT_BUILD)iguibutton.o $(CLIENT_BUILD)iguilabel.o $(CLIENT_BUILD)iguielement.o $(CLIENT_BUILD)iguiwindow.o $(CLIENT_BUILD)iguiskin.o $(CLIENT_BUILD)iguicheckbox.o $(CLIENT_BUILD)common.o $(CLIENT_BUILD)iguiimage.o $(CLIENT_SRC)lua_api/load_gui.cpp $(CLIENT_SRC)lua_api/load_gui.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_gui.o $(CLIENT_SRC)lua_api/load_gui.cpp +#$(CLIENT_BUILD)common.o : $(SHARED_SRC)lua_api/common.c $(SHARED_SRC)lua_api/common.h + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)common.o $(SHARED_SRC)lua_api/common.c -$(CLIENT_BUILD)iguiimage.o : $(CLIENT_SRC)lua_api/gui/iguiimage.cpp $(CLIENT_SRC)lua_api/gui/iguiimage.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguiimage.o $(CLIENT_SRC)lua_api/gui/iguiimage.cpp +#$(CLIENT_BUILD)initdevice.o : $(CLIENT_SRC)initdevice.cpp $(CLIENT_SRC)initdevice.hpp + #$(CC) $(CFLAGS) -c -static -o $(CLIENT_BUILD)initdevice.o $(CLIENT_SRC)initdevice.cpp -$(CLIENT_BUILD)iguiwindow.o : $(CLIENT_BUILD)iguiutil.o $(CLIENT_SRC)lua_api/gui/iguiwindow.cpp $(CLIENT_SRC)lua_api/gui/iguiwindow.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguiwindow.o $(CLIENT_SRC)lua_api/gui/iguiwindow.cpp +#$(CLIENT_BUILD)menuhandeler.o : $(CLIENT_SRC)menuhandeler.cpp $(CLIENT_SRC)menuhandeler.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)menuhandeler.o $(CLIENT_SRC)menuhandeler.cpp -$(CLIENT_BUILD)iguiutil.o : $(CLIENT_SRC)lua_api/gui/iguiutil.cpp $(CLIENT_SRC)lua_api/gui/iguiutil.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguiutil.o $(CLIENT_SRC)lua_api/gui/iguiutil.cpp +#$(CLIENT_BUILD)load_game.o : $(CLIENT_SRC)lua_api/load_game.cpp $(CLIENT_SRC)lua_api/load_game.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_game.o $(CLIENT_SRC)lua_api/load_game.cpp -$(CLIENT_BUILD)load_video.o : $(CLIENT_SRC)lua_api/load_video.cpp $(CLIENT_SRC)lua_api/load_video.hpp $(CLIENT_BUILD)smaterial.o $(CLIENT_BUILD)itexture.o $(CLIENT_BUILD)iimage.o - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_video.o $(CLIENT_SRC)lua_api/load_video.cpp +#$(CLIENT_BUILD)load_gui.o : $(CLIENT_BUILD)iguibutton.o $(CLIENT_BUILD)iguilabel.o $(CLIENT_BUILD)iguielement.o $(CLIENT_BUILD)iguiwindow.o $(CLIENT_BUILD)iguiskin.o $(CLIENT_BUILD)iguicheckbox.o $(CLIENT_BUILD)common.o $(CLIENT_BUILD)iguiimage.o $(CLIENT_SRC)lua_api/load_gui.cpp $(CLIENT_SRC)lua_api/load_gui.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_gui.o $(CLIENT_SRC)lua_api/load_gui.cpp -$(CLIENT_BUILD)smaterial.o : $(CLIENT_SRC)lua_api/video/smaterial.cpp $(CLIENT_SRC)lua_api/video/smaterial.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)smaterial.o $(CLIENT_SRC)lua_api/video/smaterial.cpp +#$(CLIENT_BUILD)iguiimage.o : $(CLIENT_SRC)lua_api/gui/iguiimage.cpp $(CLIENT_SRC)lua_api/gui/iguiimage.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguiimage.o $(CLIENT_SRC)lua_api/gui/iguiimage.cpp -$(CLIENT_BUILD)itexture.o : $(CLIENT_SRC)lua_api/video/itexture.cpp $(CLIENT_SRC)lua_api/video/itexture.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)itexture.o $(CLIENT_SRC)lua_api/video/itexture.cpp +#$(CLIENT_BUILD)iguiwindow.o : $(CLIENT_BUILD)iguiutil.o $(CLIENT_SRC)lua_api/gui/iguiwindow.cpp $(CLIENT_SRC)lua_api/gui/iguiwindow.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguiwindow.o $(CLIENT_SRC)lua_api/gui/iguiwindow.cpp -$(CLIENT_BUILD)iimage.o : $(CLIENT_SRC)lua_api/video/iimage.cpp $(CLIENT_SRC)lua_api/video/iimage.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iimage.o $(CLIENT_SRC)lua_api/video/iimage.cpp +#$(CLIENT_BUILD)iguiutil.o : $(CLIENT_SRC)lua_api/gui/iguiutil.cpp $(CLIENT_SRC)lua_api/gui/iguiutil.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguiutil.o $(CLIENT_SRC)lua_api/gui/iguiutil.cpp -$(CLIENT_BUILD)load_phys.o : $(CLIENT_BUILD)cbphysbox.o $(CLIENT_BUILD)bphysmodel.o $(CLIENT_SRC)lua_api/load_phys.cpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_phys.o $(CLIENT_SRC)lua_api/load_phys.cpp +#$(CLIENT_BUILD)load_video.o : $(CLIENT_SRC)lua_api/load_video.cpp $(CLIENT_SRC)lua_api/load_video.hpp $(CLIENT_BUILD)smaterial.o $(CLIENT_BUILD)itexture.o $(CLIENT_BUILD)iimage.o + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_video.o $(CLIENT_SRC)lua_api/load_video.cpp -$(CLIENT_BUILD)load_scene.o : $(CLIENT_BUILD)icamera.o $(CLIENT_BUILD)ilight.o $(CLIENT_BUILD)imesh.o $(CLIENT_BUILD)cbphysbox.o $(CLIENT_SRC)/lua_api/load_scene.cpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_scene.o $(CLIENT_SRC)lua_api/load_scene.cpp +#$(CLIENT_BUILD)smaterial.o : $(CLIENT_SRC)lua_api/video/smaterial.cpp $(CLIENT_SRC)lua_api/video/smaterial.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)smaterial.o $(CLIENT_SRC)lua_api/video/smaterial.cpp -$(CLIENT_BUILD)ilight.o : $(CLIENT_SRC)lua_api/scene/ilight.cpp $(CLIENT_SRC)lua_api/scene/ilight.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)ilight.o $(CLIENT_SRC)lua_api/scene/ilight.cpp +#$(CLIENT_BUILD)itexture.o : $(CLIENT_SRC)lua_api/video/itexture.cpp $(CLIENT_SRC)lua_api/video/itexture.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)itexture.o $(CLIENT_SRC)lua_api/video/itexture.cpp -$(CLIENT_BUILD)iguibutton.o : $(CLIENT_SRC)lua_api/gui/iguibutton.cpp $(CLIENT_SRC)lua_api/gui/iguibutton.hpp $(CLIENT_SRC)lua_api/guiparts.hpp $(CLIENT_SRC)callbackhandeler.hpp $(CLIENT_SRC)util/hashmap.h $(SHARED_SRC)lua_api/common.c $(SHARED_SRC)lua_api/common.h - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguibutton.o $(CLIENT_SRC)lua_api/gui/iguibutton.cpp +#$(CLIENT_BUILD)iimage.o : $(CLIENT_SRC)lua_api/video/iimage.cpp $(CLIENT_SRC)lua_api/video/iimage.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iimage.o $(CLIENT_SRC)lua_api/video/iimage.cpp -$(CLIENT_BUILD)iguilabel.o : $(CLIENT_SRC)lua_api/gui/iguilabel.cpp $(CLIENT_SRC)lua_api/gui/iguilabel.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguilabel.o $(CLIENT_SRC)lua_api/gui/iguilabel.cpp +#$(CLIENT_BUILD)load_phys.o : $(CLIENT_BUILD)cbphysbox.o $(CLIENT_BUILD)bphysmodel.o $(CLIENT_SRC)lua_api/load_phys.cpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_phys.o $(CLIENT_SRC)lua_api/load_phys.cpp -$(CLIENT_BUILD)iguicheckbox.o : $(CLIENT_SRC)lua_api/gui/iguicheckbox.cpp $(CLIENT_SRC)lua_api/gui/iguicheckbox.hpp $(SHARED_SRC)lua_api/common.h - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguicheckbox.o $(CLIENT_SRC)lua_api/gui/iguicheckbox.cpp +#$(CLIENT_BUILD)load_scene.o : $(CLIENT_BUILD)icamera.o $(CLIENT_BUILD)ilight.o $(CLIENT_BUILD)imesh.o $(CLIENT_BUILD)cbphysbox.o $(CLIENT_SRC)/lua_api/load_scene.cpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_scene.o $(CLIENT_SRC)lua_api/load_scene.cpp -$(CLIENT_BUILD)iguielement.o : $(CLIENT_BUILD)hashmap.o $(CLIENT_SRC)lua_api/gui/iguielement.cpp $(CLIENT_SRC)lua_api/gui/iguielement.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguielement.o $(CLIENT_SRC)lua_api/gui/iguielement.cpp +#$(CLIENT_BUILD)ilight.o : $(CLIENT_SRC)lua_api/scene/ilight.cpp $(CLIENT_SRC)lua_api/scene/ilight.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)ilight.o $(CLIENT_SRC)lua_api/scene/ilight.cpp -$(CLIENT_BUILD)iguiskin.o : $(CLIENT_SRC)lua_api/gui/iguiskin.cpp $(CLIENT_SRC)lua_api/gui/iguiskin.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguiskin.o $(CLIENT_SRC)lua_api/gui/iguiskin.cpp +#$(CLIENT_BUILD)iguibutton.o : $(CLIENT_SRC)lua_api/gui/iguibutton.cpp $(CLIENT_SRC)lua_api/gui/iguibutton.hpp $(CLIENT_SRC)lua_api/guiparts.hpp $(CLIENT_SRC)callbackhandeler.hpp $(CLIENT_SRC)util/hashmap.h $(SHARED_SRC)lua_api/common.c $(SHARED_SRC)lua_api/common.h + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguibutton.o $(CLIENT_SRC)lua_api/gui/iguibutton.cpp -$(CLIENT_BUILD)icamera.o : $(CLIENT_BUILD)igeneric.o $(CLIENT_SRC)lua_api/scene/icamera.cpp $(CLIENT_SRC)lua_api/scene/icamera.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)icamera.o $(CLIENT_SRC)lua_api/scene/icamera.cpp +#$(CLIENT_BUILD)iguilabel.o : $(CLIENT_SRC)lua_api/gui/iguilabel.cpp $(CLIENT_SRC)lua_api/gui/iguilabel.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguilabel.o $(CLIENT_SRC)lua_api/gui/iguilabel.cpp -$(CLIENT_BUILD)imesh.o : $(CLIENT_SRC)lua_api/scene/imesh.cpp $(CLIENT_SRC)lua_api/scene/imesh.hpp $(CLIENT_SRC)lua_api/scene/igeneric.cpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)imesh.o $(CLIENT_SRC)lua_api/scene/imesh.cpp +#$(CLIENT_BUILD)iguicheckbox.o : $(CLIENT_SRC)lua_api/gui/iguicheckbox.cpp $(CLIENT_SRC)lua_api/gui/iguicheckbox.hpp $(SHARED_SRC)lua_api/common.h + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguicheckbox.o $(CLIENT_SRC)lua_api/gui/iguicheckbox.cpp -$(CLIENT_BUILD)igeneric.o: $(CLIENT_SRC)lua_api/scene/igeneric.cpp $(CLIENT_SRC)lua_api/scene/igeneric.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)igeneric.o $(CLIENT_SRC)lua_api/scene/igeneric.cpp +#$(CLIENT_BUILD)iguielement.o : $(CLIENT_BUILD)hashmap.o $(CLIENT_SRC)lua_api/gui/iguielement.cpp $(CLIENT_SRC)lua_api/gui/iguielement.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguielement.o $(CLIENT_SRC)lua_api/gui/iguielement.cpp -$(CLIENT_BUILD)cbphysbox.o: $(CLIENT_SRC)lua_api/phys/cbphysbox.cpp $(CLIENT_SRC)lua_api/phys/cbphysbox.hpp $(CLIENT_SRC)lua_api/scene/igeneric.cpp $(CLIENT_BUILD)bphysbox.o - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)cbphysbox.o $(CLIENT_SRC)lua_api/phys/cbphysbox.cpp +#$(CLIENT_BUILD)iguiskin.o : $(CLIENT_SRC)lua_api/gui/iguiskin.cpp $(CLIENT_SRC)lua_api/gui/iguiskin.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguiskin.o $(CLIENT_SRC)lua_api/gui/iguiskin.cpp -$(CLIENT_BUILD)bphysbox.o: $(SHARED_SRC)lua_api/phys/bphysbox.cpp $(SHARED_SRC)lua_api/phys/bphysbox.hpp $(CLIENT_BUILD)common.o - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)bphysbox.o $(SHARED_SRC)lua_api/phys/bphysbox.cpp +#$(CLIENT_BUILD)icamera.o : $(CLIENT_BUILD)igeneric.o $(CLIENT_SRC)lua_api/scene/icamera.cpp $(CLIENT_SRC)lua_api/scene/icamera.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)icamera.o $(CLIENT_SRC)lua_api/scene/icamera.cpp -$(CLIENT_BUILD)bphysmodel.o: $(CLIENT_SRC)lua_api/phys/bphysmodel.cpp $(CLIENT_SRC)lua_api/phys/bphysmodel.hpp $(CLIENT_SRC)lua_api/scene/igeneric.cpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)bphysmodel.o $(CLIENT_SRC)lua_api/phys/bphysmodel.cpp +#$(CLIENT_BUILD)imesh.o : $(CLIENT_SRC)lua_api/scene/imesh.cpp $(CLIENT_SRC)lua_api/scene/imesh.hpp $(CLIENT_SRC)lua_api/scene/igeneric.cpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)imesh.o $(CLIENT_SRC)lua_api/scene/imesh.cpp -$(CLIENT_BUILD)callbackhandeler.o : $(CLIENT_SRC)callbackhandeler.cpp $(CLIENT_SRC)callbackhandeler.hpp - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)callbackhandeler.o $(CLIENT_SRC)callbackhandeler.cpp +#$(CLIENT_BUILD)igeneric.o: $(CLIENT_SRC)lua_api/scene/igeneric.cpp $(CLIENT_SRC)lua_api/scene/igeneric.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)igeneric.o $(CLIENT_SRC)lua_api/scene/igeneric.cpp -$(CLIENT_BUILD)hashmap.o : $(CLIENT_SRC)util/hashmap.c $(CLIENT_SRC)util/hashmap.h - $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)hashmap.o $(CLIENT_SRC)util/hashmap.c +#$(CLIENT_BUILD)cbphysbox.o: $(CLIENT_SRC)lua_api/phys/cbphysbox.cpp $(CLIENT_SRC)lua_api/phys/cbphysbox.hpp $(CLIENT_SRC)lua_api/scene/igeneric.cpp $(CLIENT_BUILD)bphysbox.o + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)cbphysbox.o $(CLIENT_SRC)lua_api/phys/cbphysbox.cpp + +#$(CLIENT_BUILD)bphysbox.o: $(SHARED_SRC)lua_api/phys/bphysbox.cpp $(SHARED_SRC)lua_api/phys/bphysbox.hpp $(CLIENT_BUILD)common.o + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)bphysbox.o $(SHARED_SRC)lua_api/phys/bphysbox.cpp + +#$(CLIENT_BUILD)bphysmodel.o: $(CLIENT_SRC)lua_api/phys/bphysmodel.cpp $(CLIENT_SRC)lua_api/phys/bphysmodel.hpp $(CLIENT_SRC)lua_api/scene/igeneric.cpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)bphysmodel.o $(CLIENT_SRC)lua_api/phys/bphysmodel.cpp + +#$(CLIENT_BUILD)callbackhandeler.o : $(CLIENT_SRC)callbackhandeler.cpp $(CLIENT_SRC)callbackhandeler.hpp + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)callbackhandeler.o $(CLIENT_SRC)callbackhandeler.cpp + +#$(CLIENT_BUILD)hashmap.o : $(CLIENT_SRC)util/hashmap.c $(CLIENT_SRC)util/hashmap.h + #$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)hashmap.o $(CLIENT_SRC)util/hashmap.c #end compile client + + #compile server +SERVER_FILES = main hashmap common physcommon load_net load_phys +SERVER_OBJS = $(SERVER_FILES:%=$(CLIENT_BUILD_DIR)/%.o) +$(BIN_DIR)/$(SERVERNAME)/bin/$(EX_PRE)$(SERVERNAME)$(EXE_EXT) : $(SERVER_OBJS) $(SERVER_PATH) : $(SERVER_BUILD)main.o $(SERVER_BUILD)hashmap.o $(SERVER_BUILD)common.o $(SERVER_BUILD)physcommon.o $(SERVER_BUILD)load_net.o $(SERVER_BUILD)load_phys.o - $(CC) $(CFLAGS) -o $(SERVER_PATH) $(SERVER_BUILD)*.o $(LIBRARIES) $(STATIC_LIBS) $(SLIBS) $(LDFLAGS) + $(CC) $(CFLAGS) -o $(SERVER_PATH) $(SERVER_BUILD)*.o $(STATIC_LIBS) $(SLIBS) $(LDFLAGS) $(SERVER_BUILD)main.o : $(SERVER_SRC)main.cpp $(SERVER_SRC)testclient.cpp $(CC) $(CFLAGS) -c -o $(SERVER_BUILD)main.o $(SERVER_SRC)main.cpp @@ -251,8 +342,8 @@ $(SERVER_BUILD)bphysbox.o : $(SHARED_SRC)lua_api/phys/bphysbox.cpp $(SHARED_SRC) #compile libraries $(LIBLUA) : $(ILUADIR)/Makefile - sed -i "s/BUILDMODE= mixed/BUILDMODE= static/" $(ILUADIR)/Makefile - cd $(ILUADIR) && $(MAKE) + @echo "Could not find $(LIBLUA), rebuilding" + cd $(ILUADIR) && $(MAKE) "BUILDMODE= static" cp $(ILUADIR)/libluajit.a lib IRRMAKEFLAGS= @@ -261,40 +352,72 @@ ifeq ($(DEBUG),true) IRRMAKEFLAGS+=NDEBUG=1 endif ifeq ($(UNAME), Windows) - IRRMAKEFLAGS=staticlib_win32 - IRRMADELIB=$(LIRRDIR)/lib/Win32-gcc + ifeq ($(DEBUG),true) + IRRMAKEFLAGS+=dynamiclib_win32 + IRRMADELIB=$(LIRRDIR)/bin/Win32-gcc + else + IRRMAKEFLAGS=staticlib_win32 + IRRMADELIB=$(LIRRDIR)/lib/Win32-gcc + endif else - IRRMAKEFLAGS=NDEBUG=1 IRRMADELIB=$(LIRRDIR)/lib/Linux endif -$(LIBIRR) : $(LIRRDIR)/source/Irrlicht/Makefile +# Library - Irrlicht +$(LIB_S_IRR) : $(IRRMADELIB)/libIrrlicht.a + cp $^ $@ + +$(IRRMADELIB)/libIrrlicht.a : $(LIRRDIR)/source/Irrlicht/Makefile cd $(LIRRDIR)/source/Irrlicht && $(MAKE) $(IRRMAKEFLAGS) - cp $(IRRMADELIB)/libIrrlicht.a lib -$(LIBBCO) : $(LBULDIR)/Makefile +$(BIN_DIR)/$(CLIENTNAME)/bin/Irrlicht$(DYN_LIB_EXT) : $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT) + cp $^ $@ + +$(IRRMADELIB)/lib/Irrlicht$(DYN_LIB_EXT) : $(LIRRDIR)/source/Irrlicht/Makefile + cd $(LIRRDIR)/source/Irrlicht && $(MAKE) $(IRRMAKEFLAGS) + +# Library - Lua +$(BIN_DIR)/$(CLIENTNAME)/bin/lua51$(DYN_LIB_EXT) : $(LLUADIR)/src/lua51$(DYN_LIB_EXT) + cp $^ $@ + +$(LIB_D_LUA) : $(LLUADIR)/src/Makefile + @echo "Could not find $(LLUADIR)/src/lua51$(DYN_LIB_EXT), rebuilding" + cd $(LLUADIR)/src && make "BUILDMODE= dynamic" + +# Library - Bullet +#$(LIB_D_BCO) : $(LBULDIR)/src/BulletCollision/libBulletCollision.a + #cp $^ $@ + +$(LIB_D_BCO) : $(LBULDIR)/Makefile cd $(LBULDIR) && make BulletCollision - cp $(LBULDIR)/src/BulletCollision/libBulletCollision.a lib -$(LIBBDY) : $(LBULDIR)/Makefile +#$(LIB_D_BDY) : $(LBULDIR)/src/BulletDynamics/libBulletDynamics.a + #cp $^ $@ + +$(LIB_D_DY) : $(LBULDIR)/Makefile cd $(LBULDIR) && make BulletDynamics - cp $(LBULDIR)/src/BulletDynamics/libBulletDynamics.a lib -$(LIBBLM) : $(LBULDIR)/Makefile +#$(LIB_D_BLM) : $(LBULDIR)/src/LinearMath/libLinearMath.a + #cp $^ $@ + +$(LIB_D_BLM) : $(LBULDIR)/Makefile cd $(LBULDIR) && make LinearMath - cp $(LBULDIR)/src/LinearMath/libLinearMath.a lib $(LBULDIR)/Makefile : $(LBULDIR)/CMakeLists.txt cd $(LBULDIR) && cmake $(CMAKE_FLAGS) -DBUILD_EXTRAS=off -DBUILD_DEMOS=off -$(LIBNAN) : $(LNANDIR)/Makefile - cd $(LNANDIR) && make - cp $(LNANDIR)/libnanomsg.a lib - # cp $(LNANDIR)/libnanomsg.dll $(CLIENT_DIR) - # cp $(LNANDIR)/libnanomsg.dll $(SERVER_DIR) +# Library - Nanomsg +$(BIN_DIR)/$(CLIENTNAME)/bin/libnanomsg$(DYN_LIB_EXT) : $(LNANDIR)/dyn_lib/libnanomsg$(DYN_LIB_EXT) + cp $^ $@ + +$(LIB_D_NAN) : $(LNANDIR)/dyn_lib/Makefile + cd $(LNANDIR)/dyn_lib/ && $(MAKE) nanomsg -$(LNANDIR)/Makefile : $(LNANDIR)/CMakeLists.txt - cd $(LNANDIR) && cmake -DNN_STATIC_LIB=ON $(CMAKE_FLAGS) +$(LNANDIR)/dyn_lib/Makefile : $(LNANDIR)/CMakeLists.txt $(LNANDIR)/dyn_lib + cd $(LNANDIR)/dyn_lib && cmake $(CMAKE_FLAGS) ../ + +$(LNANDIR)/dyn_lib : + mkdir $(LNANDIR)/dyn_lib #compile & run tests test: $(TEST_PATH)test_stream $(TEST_PATH)test_phys @@ -310,8 +433,9 @@ $(TEST_PATH)test_phys : $(TEST_SRC)test_phys.cpp $(CC) $(CFLAGS) -o $(TEST_PATH)test_phys $(TEST_SRC)test_phys.cpp $(SLIBS) #end tests +cleantest : + echo $(BUILDS:%=%/*.o) + clean : - $(RM) $(SERVER_PATH) - $(RM) $(CLIENT_PATH) - $(RM) $(CLIENT_BUILD)*.o - $(RM) $(SERVER_BUILD)*.o + $(RM) $(CLIENT_OBJS) + $(RM) $(BINS) diff --git a/bin/client/bin/.gitignore b/bin/client/bin/.gitignore index e69de29..8620bdd 100644 --- a/bin/client/bin/.gitignore +++ b/bin/client/bin/.gitignore @@ -0,0 +1,2 @@ +*.dll +*.exe diff --git a/bin/client/data/init.lua b/bin/client/data/init.lua index 0631f01..8829e01 100644 --- a/bin/client/data/init.lua +++ b/bin/client/data/init.lua @@ -1,4 +1,7 @@ +dofile("../data/mahjong.lua") + +do return end print("Phys was:",phys) for k,v in pairs(phys) do print(k,":",v) diff --git a/bin/server/.gitignore b/bin/server/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/bin/server/bin/.gitignore b/bin/server/bin/.gitignore index e69de29..8620bdd 100644 --- a/bin/server/bin/.gitignore +++ b/bin/server/bin/.gitignore @@ -0,0 +1,2 @@ +*.dll +*.exe diff --git a/build/.gitignore b/build/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/build/client/lua_api/.gitignore b/build/client/lua_api/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/build/client/lua_api/gui/.gitignore b/build/client/lua_api/gui/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/build/client/lua_api/phys/.gitignore b/build/client/lua_api/phys/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/build/client/lua_api/scene/.gitignore b/build/client/lua_api/scene/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/build/client/lua_api/video/.gitignore b/build/client/lua_api/video/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/build/client/phys/.gitignore b/build/client/phys/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/build/client/util/.gitignore b/build/client/util/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/src/client/lua_api/gui/iguibutton.cpp b/src/client/lua_api/gui/iguibutton.cpp index 8732bd6..86e6db8 100644 --- a/src/client/lua_api/gui/iguibutton.cpp +++ b/src/client/lua_api/gui/iguibutton.cpp @@ -14,8 +14,8 @@ extern "C" { #include "../guiparts.hpp" #include "iguielement.hpp" #include "client/callbackhandeler.hpp" -#include "client/util/hashmap.h" -#include "shared/lua_api/common.h" +#include +#include using namespace irr; using namespace core; diff --git a/src/client/lua_api/gui/iguicheckbox.cpp b/src/client/lua_api/gui/iguicheckbox.cpp index 74dd12e..ec9cb93 100644 --- a/src/client/lua_api/gui/iguicheckbox.cpp +++ b/src/client/lua_api/gui/iguicheckbox.cpp @@ -7,7 +7,7 @@ extern "C" { #include #include "../guiparts.hpp" #include "iguielement.hpp" -#include "../../../shared/lua_api/common.h" +#include using namespace irr; using namespace gui; diff --git a/src/client/lua_api/gui/iguielement.cpp b/src/client/lua_api/gui/iguielement.cpp index 436bf93..d14c18e 100644 --- a/src/client/lua_api/gui/iguielement.cpp +++ b/src/client/lua_api/gui/iguielement.cpp @@ -6,7 +6,7 @@ extern "C" { } -#include "../../../shared/lua_api/common.h" +#include #include #include "../guiparts.hpp" diff --git a/src/client/lua_api/gui/iguiimage.cpp b/src/client/lua_api/gui/iguiimage.cpp index 370da68..0428344 100644 --- a/src/client/lua_api/gui/iguiimage.cpp +++ b/src/client/lua_api/gui/iguiimage.cpp @@ -15,7 +15,7 @@ extern "C" { #include "iguiwindow.hpp" #include "iguiutil.hpp" #include "../../callbackhandeler.hpp" -#include "../../../shared/lua_api/common.h" +#include using namespace irr; using namespace gui; diff --git a/src/client/lua_api/gui/iguiwindow.cpp b/src/client/lua_api/gui/iguiwindow.cpp index 150ba68..705af18 100644 --- a/src/client/lua_api/gui/iguiwindow.cpp +++ b/src/client/lua_api/gui/iguiwindow.cpp @@ -15,7 +15,7 @@ extern "C" { #include "iguiwindow.hpp" #include "iguiutil.hpp" #include "../../callbackhandeler.hpp" -#include "../../../shared/lua_api/common.h" +#include using namespace irr; using namespace gui; @@ -32,39 +32,38 @@ static bool iguiwindowevent(irr::SEvent e){ return shouldclose == 1; } -//new({posx,posy},{width,height},"title"[,parent]) +//new({{sx,sy},{ex,ey}},"title"[,{guielement=parent}]) :: {guielement} static int newiguiwindow(lua_State* L){ IGUIElement* parent = NULL; int numargs = lua_gettop(L); if(numargs == 4){ + lua_getfield(L,-1,"guielement");//{{sx,sy},{ex,ey}},"title",{guielement=parent},parent parent = (IGUIElement*)lua_touserdata(L,-1); - lua_pop(L,1); + lua_pop(L,2); } + //{{sx,sy},{ex,ey},"title" const char* title_c = lua_tostring(L,-1); const wchar_t* title_w = irr::core::stringw(title_c).c_str(); - lua_pop(L,1); + lua_pop(L,1);//{{sx,sy},{ex,ey}} //Frame position - long x,y,w,h; - popvector2i(L,&w,&h); - popvector2i(L,&x,&y); + long sx,sy,ex,ey; + poprecti(L,&sx,&sy,&ex,&ey);// //Create the window IGUIEnvironment* env = guidevice->getGUIEnvironment(); IGUIWindow* wi = env->addWindow( - core::rect(x,y,x+w,y+h), + core::rect(sx,sy,ex,ey), false, title_w, parent, -1 ); - lua_pushlightuserdata(L,wi); - lua_newtable(L);//{} lua_pushlightuserdata(L,wi);//{},{ud_window} - lua_setfield(L,-2,"element");//{element=ud_window} + lua_setfield(L,-2,"guielement");//{element=ud_window} luaL_getmetatable(L,"gui.window");//{element=ud_window},{m_gui.window} lua_setmetatable(L,-2);//{element=ud_window, __meta=gui.window} diff --git a/src/client/lua_api/load_video.cpp b/src/client/lua_api/load_video.cpp index df3a9aa..bd07e97 100644 --- a/src/client/lua_api/load_video.cpp +++ b/src/client/lua_api/load_video.cpp @@ -9,7 +9,7 @@ extern "C" { #include "video/itexture.hpp" #include "video/iimage.hpp" -#include "shared/lua_api/common.h" +#include using namespace irr; using namespace video; diff --git a/src/client/lua_api/phys/bphysbuffer.cpp b/src/client/lua_api/phys/bphysbuffer.cpp index aa2833a..a8f7302 100644 --- a/src/client/lua_api/phys/bphysbuffer.cpp +++ b/src/client/lua_api/phys/bphysbuffer.cpp @@ -12,10 +12,11 @@ extern "C" { } #include #include -#include "../gameparts.hpp" -#include "bphysbox.hpp" +#include +#include #include "bphysmodel.hpp" #include "../scene/igeneric.hpp" +#include using namespace irr; using namespace scene; @@ -49,40 +50,14 @@ static int newbphysmodel(lua_State* L){ } //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); + + double x,y,z; + popvector3d(L,&x,&y,&z); printf("Found position for phys model: %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); - + double sx,sy,sz; + popvector3d(L,&sx,&sy,&sz); printf("Found scale for phys model: %f %f %f\n",sx,sy,sz); //find the model path @@ -90,41 +65,41 @@ static int newbphysmodel(lua_State* L){ printf("I want to use model %s\n", mpath); - ISceneManager* smgr = device->getSceneManager(); - IMesh* amesh = smgr->getMesh(mpath); - IMeshBuffer* bf = amesh->getMeshBuffer(0); - u32 ni = bf->getIndexCount(); - - btTriangleMesh* trimesh = new btTriangleMesh(); - for(u32 i = 0; i < ni; i+=3){ - vector3df p1 = bf->getPosition(i + 0); - vector3df p2 = bf->getPosition(i + 1); - vector3df p3 = bf->getPosition(i + 2); - btVector3 b1 = btVector3(p1.X,p1.Y,p1.Z); - btVector3 b2 = btVector3(p2.X,p2.Y,p2.Z); - btVector3 b3 = btVector3(p3.X,p3.Y,p3.Z); - trimesh->addTriangle(b1,b2,b3); - } - btCollisionShape* shape = new btConvexTriangleMeshShape(trimesh,true); + ISceneManager* smgr = device->getSceneManager(); + IMesh* amesh = smgr->getMesh(mpath); + IMeshBuffer* bf = amesh->getMeshBuffer(0); + u32 ni = bf->getIndexCount(); + + btTriangleMesh* trimesh = new btTriangleMesh(); + for(u32 i = 0; i < ni; i+=3){ + vector3df p1 = bf->getPosition(i + 0); + vector3df p2 = bf->getPosition(i + 1); + vector3df p3 = bf->getPosition(i + 2); + btVector3 b1 = btVector3(p1.X,p1.Y,p1.Z); + btVector3 b2 = btVector3(p2.X,p2.Y,p2.Z); + btVector3 b3 = btVector3(p3.X,p3.Y,p3.Z); + trimesh->addTriangle(b1,b2,b3); + } + btCollisionShape* shape = new btConvexTriangleMeshShape(trimesh,true); core::vector3df scale = core::vector3df(sx,sy,sz); btVector3 pos = btVector3(x,y,z); core::vector3df ipos = core::vector3df(x,y,z); - shape->setLocalScaling(btVector3(sx,sy,sz)); + shape->setLocalScaling(btVector3(sx,sy,sz)); //Find the mass float mass = luaL_optint(L,4,0); - printf("Found mass for physbox:%f\n",mass); + printf("Found mass for physbox:%f\n",mass); // Create an Irrlicht cube scene::ISceneNode* Node = smgr->addMeshSceneNode( - amesh, - (ISceneNode*)0, - (s32)-1, - ipos, - vector3df(0,0,0), - scale - ); + amesh, + (ISceneNode*)0, + (s32)-1, + ipos, + vector3df(0,0,0), + scale + ); //Node->setScale(scale); printf("Added cube scene node and set it's scale\n"); @@ -199,108 +174,30 @@ static int newbphysmodel(lua_State* L){ return 1; } -static int delbphysmodel(lua_State* L){ - LBPhysNode* pnode = checkisbphysmodel(L,-1); - - //delete pnode->r->getMotionState(); - delete pnode->r->getCollisionShape(); - delete pnode->r; - - return 0; -} -static int bphyssetpos(lua_State *L){ - LBPhysNode* i = checkisbphysmodel(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); - i->r->activate(); - printf("sucess! returning from call\n"); - return 0; -} - -static int bphysgetpos(lua_State *L){ - LBPhysNode* i = checkisbphysmodel(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 bphysmodel_f[] = { - {"new", newbphysbuffer}, +static const luaL_reg bphysbuffer_f[] = { + //{"new", newbphysmodel}, // {"gethandeler", guigethandeler}, // {"sethandeler", guisethandeler}, {0,0}, }; -static const luaL_reg bphysmodel_m[] = { - {"setmaterial", iscenesetmaterial}, - {"getpos", bphysgetpos}, - {"setpos", bphyssetpos}, +static const luaL_reg bphysbuffer_m[] = { + //{"setmaterial", iscenesetmaterial}, + //{"getpos", bphysgetpos}, + //{"setpos", bphyssetpos}, // {"settext", setiguitext}, // {"remove", removeiguielement}, {0, 0}, }; -int bphysmodel_register(lua_State* L, IrrlichtDevice* d){ +void bphysbuffer_register(lua_State* L, IrrlichtDevice* d){ device = d; - //printf("bphysmodel registered\n"); - - luaL_newmetatable(L, "phys.physmodel"); - - luaL_register(L,"physmodel",bphysmodel_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,delbphysmodel); - lua_settable(L,-4); - - luaL_register(L, NULL, bphysmodel_m); - - return 1; + luaL_newmetatable(L, "phys.physbuffer");//{m_physbuffer} + lua_newtable(L);//{m_physbuffer},{} + luaL_register(L,"physbuffer",bphysbuffer_m);//{m_physbuffer},{physbuffer} + lua_setfield(L,-2,"__index");//{m_physbuffer} + lua_pop(L,1); } diff --git a/src/client/lua_api/phys/bphysbuffer.hpp b/src/client/lua_api/phys/bphysbuffer.hpp index a59c451..cfbf549 100644 --- a/src/client/lua_api/phys/bphysbuffer.hpp +++ b/src/client/lua_api/phys/bphysbuffer.hpp @@ -8,4 +8,4 @@ extern "C" { } #include -int bphysmodel_register(lua_State* L, irr::IrrlichtDevice* d); +void bphysmodel_register(lua_State* L); diff --git a/src/client/lua_api/phys/bphysmodel.hpp b/src/client/lua_api/phys/bphysmodel.hpp index a59c451..1c0fbac 100644 --- a/src/client/lua_api/phys/bphysmodel.hpp +++ b/src/client/lua_api/phys/bphysmodel.hpp @@ -1,11 +1,12 @@ - +#ifndef _BPHYSMODEL_HPP_ #include #include extern "C" { - #include - #include - #include + #include + #include + #include } #include int bphysmodel_register(lua_State* L, irr::IrrlichtDevice* d); +#endif diff --git a/src/client/lua_api/phys/butil.cpp b/src/client/lua_api/phys/butil.cpp deleted file mode 100644 index 6319688..0000000 --- a/src/client/lua_api/phys/butil.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include - -extern "C" { - #include - #include - #include -} - -#include - -#include "butil.hpp" - -btVector3 lua_popbtvector(lua_State* L,int pos){ - f32 p[3]; - - for(int i = 0; i < 3; i++){ - lua_pushnumber(L,i+1); - lua_gettable(L,pos); - p[i] = (f32) lua_tonumber(L,-1); - lua_pop(L,1); - } - - printf("Found vector (%f,%f,%f)\n",p[0],p[1],p[2]); - - return btVector3(p[0],p[1],p[2]); -} diff --git a/src/client/lua_api/phys/butil.hpp b/src/client/lua_api/phys/butil.hpp deleted file mode 100644 index c288b97..0000000 --- a/src/client/lua_api/phys/butil.hpp +++ /dev/null @@ -1,9 +0,0 @@ -extern "C" { - #include - #include - #include -} - -#include - -btVector3 lua_popbtvector(lua_State* L,int pos); diff --git a/src/client/lua_api/phys/cbphysbox.cpp b/src/client/lua_api/phys/cbphysbox.cpp index 6a3d64e..2935d21 100644 --- a/src/client/lua_api/phys/cbphysbox.cpp +++ b/src/client/lua_api/phys/cbphysbox.cpp @@ -12,8 +12,9 @@ extern "C" { #include #include "cbphysbox.hpp" #include "../scene/imesh.hpp" -#include "../../../shared/lua_api/phys/bphysbox.hpp" +#include #include "../scene/igeneric.hpp" +#include using namespace irr; using namespace scene; diff --git a/src/client/lua_api/scene/icamera.cpp b/src/client/lua_api/scene/icamera.cpp index dcdec2d..654fc7b 100644 --- a/src/client/lua_api/scene/icamera.cpp +++ b/src/client/lua_api/scene/icamera.cpp @@ -14,7 +14,7 @@ extern "C" { #include "../gameparts.hpp" #include "icamera.hpp" #include "igeneric.hpp" -#include "../../../shared/lua_api/common.h" +#include using namespace irr; using namespace scene; diff --git a/src/client/lua_api/scene/icube.cpp b/src/client/lua_api/scene/icube.cpp deleted file mode 100644 index 8f4c9d8..0000000 --- a/src/client/lua_api/scene/icube.cpp +++ /dev/null @@ -1,68 +0,0 @@ - -extern "C" { - #include - #include - #include -} -#include - -extern IrrlichtDevice* device; - -using namespace irr; - -// {} :: scene.newcube(num_size, {v3 pos}) -int newiscenecube(lua_StatE* L){//num_size, {v3 pos} - double x,y,z; - popvector3d(L,&x, &y, &z);//num_size - double size = lua_tonumber(L,-1);//num_size - lua_pop(L,1);// - IMeshSceneNode* n = device->getSceneManager()->addCubeSceneNode(size,0,-1,core::vector3df(x,y,z)); - - lua_newtable(L);//{} - lua_pushlightuserdata(L,n);//{},ud_node - lua_setfield(L,-2,"node");//{} - - luaL_getmetatable(L,"scene.inode");//{},sene.inode - lua_setmetatable(L,-2); - - return 1; -} - -static const luaL_reg iscenenode_m[] = { - {"getpos", iscenegetpos}, - {"setpos", iscenesetpos}, -// {"remove", removeiguielement}, - {0, 0}, -}; - -void icube_register(lua_State* L){ - - luaL_newmetatable(L, "scene.icamera");//scene.icamera - lua_newtable(L);//scene.icamera, {} - luaL_register(L,NULL,icamera_m);//scene.icamera, {} - lua_setfield(L,-2,"__index");//scene.icamera - lua_pop(L,1);// - - luaL_newmetatable(L, "scene.imayacamera");//scene.imayacamera - lua_newtable(L);//scene.imayascamera,{} - luaL_register(L,NULL,imayacamera_m);//scene.imayascamera,{} - lua_setfield(L,-2,"__index");//scene.imayascamera - lua_pop(L,1);// - - luaL_newmetatable(L,"scene.ifpscamera");//scene.ifpscamera - lua_newtable(L);//scene.ifpscamera, {} - luaL_register(L,NULL,ifpscamera_m);//scene.ifpscamera,{} - luaL_register(L,NULL,icamera_m);//scene.ifpscamera,{} - lua_setfield(L,-2,"__index");//scene.ifpscamera - lua_pop(L,1);// - - lua_getglobal(L,"scene");//{} - lua_pushcfunction(L,newiscenecamera);//{},newiscenecamera() - lua_setfield(L,-2,"newcamera");//{} - lua_pushcfunction(L,newiscenefpscamera);//{},newiscenefpscamera() - lua_setfield(L,-2,"newfpscamera");//{} - lua_pushcfunction(L,newiscenemayacamera);//{},newiscenemayacamera() - lua_setfield(L,-2,"newmayacamera");//{} - //printf("\"scene\" was set!\n"); - //lua_pop(L,1); -} diff --git a/src/client/lua_api/scene/icube.hpp b/src/client/lua_api/scene/icube.hpp deleted file mode 100644 index ffb4d3b..0000000 --- a/src/client/lua_api/scene/icube.hpp +++ /dev/null @@ -1,11 +0,0 @@ - -#include -#include -extern "C" { - #include - #include - #include -} -#include - -void icube_register(lua_State* L); diff --git a/src/client/lua_api/scene/igeneric.cpp b/src/client/lua_api/scene/igeneric.cpp index c016788..4619064 100644 --- a/src/client/lua_api/scene/igeneric.cpp +++ b/src/client/lua_api/scene/igeneric.cpp @@ -7,7 +7,7 @@ extern "C" { #include #include "igeneric.hpp" #include "../gameparts.hpp" -#include "../../../shared/lua_api/common.h" +#include using namespace irr; using namespace core; diff --git a/src/client/lua_api/scene/ilight.cpp b/src/client/lua_api/scene/ilight.cpp index 451280a..8f52f2d 100644 --- a/src/client/lua_api/scene/ilight.cpp +++ b/src/client/lua_api/scene/ilight.cpp @@ -14,7 +14,7 @@ extern "C" { #include "../gameparts.hpp" #include "ilight.hpp" #include "igeneric.hpp" -#include "../../../shared/lua_api/common.h" +#include using namespace irr; using namespace scene; diff --git a/src/client/lua_api/scene/imesh.cpp b/src/client/lua_api/scene/imesh.cpp index 2760067..c72e83a 100644 --- a/src/client/lua_api/scene/imesh.cpp +++ b/src/client/lua_api/scene/imesh.cpp @@ -14,7 +14,7 @@ extern "C" { #include "../gameparts.hpp" #include "imesh.hpp" #include "igeneric.hpp" -#include "../../../shared/lua_api/common.h" +#include using namespace irr; using namespace scene; diff --git a/src/client/lua_api/video/iimage.cpp b/src/client/lua_api/video/iimage.cpp index 3090057..aa51d29 100644 --- a/src/client/lua_api/video/iimage.cpp +++ b/src/client/lua_api/video/iimage.cpp @@ -2,7 +2,7 @@ #include "iimage.hpp" #include -#include "../../../shared/lua_api/common.h" +#include using namespace irr; using namespace video; diff --git a/src/client/lua_api/video/itexture.cpp b/src/client/lua_api/video/itexture.cpp index 42de1bd..587b8ee 100644 --- a/src/client/lua_api/video/itexture.cpp +++ b/src/client/lua_api/video/itexture.cpp @@ -7,7 +7,7 @@ extern "C" { #include #include "itexture.hpp" #include "iimage.hpp" -#include "../../../shared/lua_api/common.h" +#include using namespace irr; using namespace video; diff --git a/src/client/main.cpp b/src/client/main.cpp index ad7d818..f764fe9 100644 --- a/src/client/main.cpp +++ b/src/client/main.cpp @@ -21,7 +21,7 @@ extern "C" { #include "lua_api/load_video.hpp" #include "callbackhandeler.hpp" -#include "../shared/lua_api/common.h" +#include #include "../shared/lua_api/load_net.hpp" #include "../shared/phys/physcommon.hpp" diff --git a/src/shared/lua_api/common.c b/src/shared/lua_api/common.c deleted file mode 100644 index 2eeee11..0000000 --- a/src/shared/lua_api/common.c +++ /dev/null @@ -1,205 +0,0 @@ - -extern "C" { - #include - #include - #include -} - -#include "common.h" - -//Expose things to the lua state -void loadLLibs(lua_State* L){ - - lua_pushcfunction(L,luaopen_base); - lua_pushliteral(L,""); - lua_call(L,1,0); - - lua_pushcfunction(L,luaopen_table); - lua_pushliteral(L,LUA_TABLIBNAME); - lua_call(L,1,0); - - lua_pushcfunction(L,luaopen_string); - lua_pushliteral(L,LUA_STRLIBNAME); - lua_call(L,1,0); - - lua_pushcfunction(L,luaopen_math); - lua_pushliteral(L,LUA_MATHLIBNAME); - lua_call(L,1,0); - - lua_pushcfunction(L,luaopen_string); - lua_pushliteral(L,LUA_STRLIBNAME); - lua_call(L,1,0); - - /* - lua_pushcfunction(L,luaopen_string); - lua_pushliteral(L,LUA_STRLIBNAME); - lua_call(L,1,0); - */ -} - - -int pushvector3i(lua_State* L,long a,long b,long c){ - lua_newtable(L);//{} - - lua_pushinteger(L,1);//{},1 - lua_pushinteger(L,a);//{},1,a - lua_settable(L,-3);//{} - - lua_pushinteger(L,2);//{},2 - lua_pushinteger(L,b);//{},2,b - lua_settable(L,-3);//{} - - lua_pushinteger(L,3);//{},3 - lua_pushinteger(L,c);//{},3,c - lua_settable(L,-3);//{} - - return 1; -} -int pushvector3d(lua_State* L,double a,double b,double c){ - lua_newtable(L);//{} - - lua_pushinteger(L,1);//{},1 - lua_pushnumber(L,a);//{},1,a - lua_settable(L,-3);//{} - - lua_pushinteger(L,2);//{},2 - lua_pushnumber(L,b);//{},2,b - lua_settable(L,-3);//{} - - lua_pushinteger(L,3);//{},3 - lua_pushnumber(L,c);//{},3,c - lua_settable(L,-3);//{} - - return 1; -} -int pushvector2i(lua_State* L, long a, long b){ - lua_newtable(L); - - lua_pushinteger(L,1); - lua_pushinteger(L,a); - lua_settable(L,-3); - - lua_pushinteger(L,2); - lua_pushinteger(L,b); - lua_settable(L,-3); - - return 1; -} - -int popvector4i(lua_State* L,long* a,long* b,long* c, long* d){ - lua_pushinteger(L,1);//{v4},1 - lua_gettable(L,-2);//{v4},v4[1] - *a = lua_tointeger(L,-1);//{v4},v4[1] - lua_pop(L,1);//{v4} - - lua_pushinteger(L,2);//{v4},2 - lua_gettable(L,-2);//{v4},v4[2] - *b = lua_tointeger(L,-1);//{v4},v4[2] - lua_pop(L,1);//{v4} - - lua_pushinteger(L,3);//{v4},3 - lua_gettable(L,-2);//{v4},v4[3] - *c = lua_tointeger(L,-1);//{v4},v4[3] - lua_pop(L,1);//{v4} - - lua_pushinteger(L,4);//{v4},3 - lua_gettable(L,-2);//{v4},v4[3] - *d = lua_tointeger(L,-1);//{v4},v4[3] - lua_pop(L,1);//{v4} - - lua_pop(L,1);// - return 0; -} - -int popvector3i(lua_State* L,long* a,long* b,long* c){//{v3} - lua_pushinteger(L,1);//{v3},1 - lua_gettable(L,-2);//{v3},v3[1] - *a = lua_tointeger(L,-1);//{v3},v3[1] - lua_pop(L,1);//{v3} - - lua_pushinteger(L,2);//{v3},2 - lua_gettable(L,-2);//{v3},v3[2] - *b = lua_tointeger(L,-1);//{v3},v3[2] - lua_pop(L,1);//{v3} - - lua_pushinteger(L,3);//{v3},3 - lua_gettable(L,-2);//{v3},v3[3] - *c = lua_tointeger(L,-1);//{v3},v3[3] - lua_pop(L,1);//{v3} - - lua_pop(L,1);// - return 0; -} - - - -int popvector3d(lua_State* L,double* a,double* b,double* c){ - lua_pushinteger(L,1); - lua_gettable(L,-2); - *a = lua_tonumber(L,-1); - lua_pop(L,1); - - lua_pushinteger(L,2); - lua_gettable(L,-2); - *b = lua_tonumber(L,-1); - lua_pop(L,1); - - lua_pushinteger(L,3); - lua_gettable(L,-2); - *c = lua_tonumber(L,-1); - lua_pop(L,1); - - lua_pop(L,1); - return 0; -} - -int popvector4d(lua_State* L, double *a, double *b, double *c, double *d){ - lua_pushinteger(L,1);//{a,b,c,d},1 - lua_gettable(L,-2);//{a,b,c,d},a - *a = lua_tonumber(L,-1);//{a,b,c,d},a - lua_pop(L,1);//{a,b,c,d} - - lua_pushinteger(L,2); - lua_gettable(L,-2); - *b = lua_tonumber(L,-1); - lua_pop(L,1); - - lua_pushinteger(L,3); - lua_gettable(L,-2); - *c = lua_tonumber(L,-1); - lua_pop(L,1); - - lua_pushinteger(L,4); - lua_gettable(L,-2); - *d = lua_tonumber(L,-1); - lua_pop(L,1); - - lua_pop(L,1); - return 0; -} - -//{{sx,sy},{ex,ey}} -int poprecti(lua_State* L, long *sx, long *sy, long *ex, long *ey){ - lua_pushnumber(L,1); - lua_gettable(L,-2); - popvector2i(L,sx,sy); - lua_pushnumber(L,2); - lua_gettable(L,-2); - popvector2i(L,ex,ey); - lua_pop(L,1); - return 0; -} - -int popvector2i(lua_State* L, long* a, long* b){ - lua_pushinteger(L,1); - lua_gettable(L,-2); - *a = lua_tonumber(L,-1); - lua_pop(L,1); - - lua_pushinteger(L,2); - lua_gettable(L,-2); - *b = lua_tonumber(L,-1); - lua_pop(L,2); - - return 0; -} diff --git a/src/shared/lua_api/common.cpp b/src/shared/lua_api/common.cpp new file mode 100644 index 0000000..68bf203 --- /dev/null +++ b/src/shared/lua_api/common.cpp @@ -0,0 +1,205 @@ + +extern "C" { + #include + #include + #include +} + +#include "common.hpp" + +//Expose things to the lua state +void loadLLibs(lua_State* L){ + + lua_pushcfunction(L,luaopen_base); + lua_pushliteral(L,""); + lua_call(L,1,0); + + lua_pushcfunction(L,luaopen_table); + lua_pushliteral(L,LUA_TABLIBNAME); + lua_call(L,1,0); + + lua_pushcfunction(L,luaopen_string); + lua_pushliteral(L,LUA_STRLIBNAME); + lua_call(L,1,0); + + lua_pushcfunction(L,luaopen_math); + lua_pushliteral(L,LUA_MATHLIBNAME); + lua_call(L,1,0); + + lua_pushcfunction(L,luaopen_string); + lua_pushliteral(L,LUA_STRLIBNAME); + lua_call(L,1,0); + + /* + lua_pushcfunction(L,luaopen_string); + lua_pushliteral(L,LUA_STRLIBNAME); + lua_call(L,1,0); + */ +} + + +int pushvector3i(lua_State* L,long a,long b,long c){ + lua_newtable(L);//{} + + lua_pushinteger(L,1);//{},1 + lua_pushinteger(L,a);//{},1,a + lua_settable(L,-3);//{} + + lua_pushinteger(L,2);//{},2 + lua_pushinteger(L,b);//{},2,b + lua_settable(L,-3);//{} + + lua_pushinteger(L,3);//{},3 + lua_pushinteger(L,c);//{},3,c + lua_settable(L,-3);//{} + + return 1; +} +int pushvector3d(lua_State* L,double a,double b,double c){ + lua_newtable(L);//{} + + lua_pushinteger(L,1);//{},1 + lua_pushnumber(L,a);//{},1,a + lua_settable(L,-3);//{} + + lua_pushinteger(L,2);//{},2 + lua_pushnumber(L,b);//{},2,b + lua_settable(L,-3);//{} + + lua_pushinteger(L,3);//{},3 + lua_pushnumber(L,c);//{},3,c + lua_settable(L,-3);//{} + + return 1; +} +int pushvector2i(lua_State* L, long a, long b){ + lua_newtable(L); + + lua_pushinteger(L,1); + lua_pushinteger(L,a); + lua_settable(L,-3); + + lua_pushinteger(L,2); + lua_pushinteger(L,b); + lua_settable(L,-3); + + return 1; +} + +int popvector4i(lua_State* L,long* a,long* b,long* c, long* d){ + lua_pushinteger(L,1);//{v4},1 + lua_gettable(L,-2);//{v4},v4[1] + *a = lua_tointeger(L,-1);//{v4},v4[1] + lua_pop(L,1);//{v4} + + lua_pushinteger(L,2);//{v4},2 + lua_gettable(L,-2);//{v4},v4[2] + *b = lua_tointeger(L,-1);//{v4},v4[2] + lua_pop(L,1);//{v4} + + lua_pushinteger(L,3);//{v4},3 + lua_gettable(L,-2);//{v4},v4[3] + *c = lua_tointeger(L,-1);//{v4},v4[3] + lua_pop(L,1);//{v4} + + lua_pushinteger(L,4);//{v4},3 + lua_gettable(L,-2);//{v4},v4[3] + *d = lua_tointeger(L,-1);//{v4},v4[3] + lua_pop(L,1);//{v4} + + lua_pop(L,1);// + return 0; +} + +int popvector3i(lua_State* L,long* a,long* b,long* c){//{v3} + lua_pushinteger(L,1);//{v3},1 + lua_gettable(L,-2);//{v3},v3[1] + *a = lua_tointeger(L,-1);//{v3},v3[1] + lua_pop(L,1);//{v3} + + lua_pushinteger(L,2);//{v3},2 + lua_gettable(L,-2);//{v3},v3[2] + *b = lua_tointeger(L,-1);//{v3},v3[2] + lua_pop(L,1);//{v3} + + lua_pushinteger(L,3);//{v3},3 + lua_gettable(L,-2);//{v3},v3[3] + *c = lua_tointeger(L,-1);//{v3},v3[3] + lua_pop(L,1);//{v3} + + lua_pop(L,1);// + return 0; +} + + + +int popvector3d(lua_State* L,double* a,double* b,double* c){ + lua_pushinteger(L,1); + lua_gettable(L,-2); + *a = lua_tonumber(L,-1); + lua_pop(L,1); + + lua_pushinteger(L,2); + lua_gettable(L,-2); + *b = lua_tonumber(L,-1); + lua_pop(L,1); + + lua_pushinteger(L,3); + lua_gettable(L,-2); + *c = lua_tonumber(L,-1); + lua_pop(L,1); + + lua_pop(L,1); + return 0; +} + +int popvector4d(lua_State* L, double *a, double *b, double *c, double *d){ + lua_pushinteger(L,1);//{a,b,c,d},1 + lua_gettable(L,-2);//{a,b,c,d},a + *a = lua_tonumber(L,-1);//{a,b,c,d},a + lua_pop(L,1);//{a,b,c,d} + + lua_pushinteger(L,2); + lua_gettable(L,-2); + *b = lua_tonumber(L,-1); + lua_pop(L,1); + + lua_pushinteger(L,3); + lua_gettable(L,-2); + *c = lua_tonumber(L,-1); + lua_pop(L,1); + + lua_pushinteger(L,4); + lua_gettable(L,-2); + *d = lua_tonumber(L,-1); + lua_pop(L,1); + + lua_pop(L,1); + return 0; +} + +//{{sx,sy},{ex,ey}} +int poprecti(lua_State* L, long *sx, long *sy, long *ex, long *ey){ + lua_pushnumber(L,1); + lua_gettable(L,-2); + popvector2i(L,sx,sy); + lua_pushnumber(L,2); + lua_gettable(L,-2); + popvector2i(L,ex,ey); + lua_pop(L,1); + return 0; +} + +int popvector2i(lua_State* L, long* a, long* b){ + lua_pushinteger(L,1); + lua_gettable(L,-2); + *a = lua_tonumber(L,-1); + lua_pop(L,1); + + lua_pushinteger(L,2); + lua_gettable(L,-2); + *b = lua_tonumber(L,-1); + lua_pop(L,2); + + return 0; +} diff --git a/src/shared/lua_api/common.h b/src/shared/lua_api/common.h deleted file mode 100644 index 6086065..0000000 --- a/src/shared/lua_api/common.h +++ /dev/null @@ -1,20 +0,0 @@ - -extern "C" { - #include - #include - #include -} - -void loadLLibs(lua_State*); - -int pushvector3i(lua_State*,long,long,long); -int pushvector3d(lua_State*,double,double,double); -int pushvector2i(lua_State*,long,long); - -int popvector4i(lua_State*,long*,long*,long*,long*); -int popvector4d(lua_State*,double*,double*,double*,double*); -int popvector3i(lua_State*,long*,long*,long*); -int popvector3d(lua_State*,double*,double*,double*); -int popvector2i(lua_State*,long*,long*); - -int poprecti(lua_State* L,long*,long*,long*,long*); diff --git a/src/shared/lua_api/common.hpp b/src/shared/lua_api/common.hpp new file mode 100644 index 0000000..6086065 --- /dev/null +++ b/src/shared/lua_api/common.hpp @@ -0,0 +1,20 @@ + +extern "C" { + #include + #include + #include +} + +void loadLLibs(lua_State*); + +int pushvector3i(lua_State*,long,long,long); +int pushvector3d(lua_State*,double,double,double); +int pushvector2i(lua_State*,long,long); + +int popvector4i(lua_State*,long*,long*,long*,long*); +int popvector4d(lua_State*,double*,double*,double*,double*); +int popvector3i(lua_State*,long*,long*,long*); +int popvector3d(lua_State*,double*,double*,double*); +int popvector2i(lua_State*,long*,long*); + +int poprecti(lua_State* L,long*,long*,long*,long*); diff --git a/src/shared/lua_api/load_net.cpp b/src/shared/lua_api/load_net.cpp index 5280d42..740d997 100644 --- a/src/shared/lua_api/load_net.cpp +++ b/src/shared/lua_api/load_net.cpp @@ -20,7 +20,7 @@ extern "C" { #include "load_net.hpp" -#include "../util/hashmap.h" +#include #include "stream.hpp" std::map> netfuncs; diff --git a/src/shared/lua_api/phys/bphysbox.cpp b/src/shared/lua_api/phys/bphysbox.cpp index 0fe9f72..728b6d1 100644 --- a/src/shared/lua_api/phys/bphysbox.cpp +++ b/src/shared/lua_api/phys/bphysbox.cpp @@ -9,7 +9,7 @@ extern "C" { } #include #include "bphysbox.hpp" -#include "../common.h" +#include extern btDiscreteDynamicsWorld* World; extern std::list Objects; diff --git a/src/shared/lua_api/phys/bphysbox.hpp b/src/shared/lua_api/phys/bphysbox.hpp index 96b58a7..1471381 100644 --- a/src/shared/lua_api/phys/bphysbox.hpp +++ b/src/shared/lua_api/phys/bphysbox.hpp @@ -8,7 +8,6 @@ extern "C" { #include } #include -#include "../common.h" void bphysbox_register(lua_State* L); void makenewbphysbox(lua_State* L); diff --git a/src/shared/phys/physcommon.hpp b/src/shared/phys/physcommon.hpp index e4660ab..00061ec 100644 --- a/src/shared/phys/physcommon.hpp +++ b/src/shared/phys/physcommon.hpp @@ -1,4 +1,5 @@ - +#ifndef _shared_physcommon_ void gameloop_phys(void(*f)(btRigidBody*)); void phys_genesis(); void phys_shutdown(void(*f)(btRigidBody*)); +#endif diff --git a/src/shared/util/hashmap.c b/src/shared/util/hashmap.c deleted file mode 100644 index f91e743..0000000 --- a/src/shared/util/hashmap.c +++ /dev/null @@ -1,397 +0,0 @@ -/* - * Generic map implementation. - */ -#include "hashmap.h" - -#include -#include -#include - -#define INITIAL_SIZE (256) -#define MAX_CHAIN_LENGTH (8) - -/* We need to keep keys and values */ -typedef struct _hashmap_element{ - char* key; - int in_use; - any_t data; -} hashmap_element; - -/* A hashmap has some maximum size and current size, - * as well as the data to hold. */ -typedef struct _hashmap_map{ - int table_size; - int size; - hashmap_element *data; -} hashmap_map; - -/* - * Return an empty hashmap, or NULL on failure. - */ -map_t hashmap_new() { - hashmap_map* m = (hashmap_map*) malloc(sizeof(hashmap_map)); - if(!m) goto err; - - m->data = (hashmap_element*) calloc(INITIAL_SIZE, sizeof(hashmap_element)); - if(!m->data) goto err; - - m->table_size = INITIAL_SIZE; - m->size = 0; - - return m; - err: - if (m) - hashmap_free(m); - return NULL; -} - -/* The implementation here was originally done by Gary S. Brown. I have - borrowed the tables directly, and made some minor changes to the - crc32-function (including changing the interface). //ylo */ - - /* ============================================================= */ - /* COPYRIGHT (C) 1986 Gary S. Brown. You may use this program, or */ - /* code or tables extracted from it, as desired without restriction. */ - /* */ - /* First, the polynomial itself and its table of feedback terms. The */ - /* polynomial is */ - /* X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 */ - /* */ - /* Note that we take it "backwards" and put the highest-order term in */ - /* the lowest-order bit. The X^32 term is "implied"; the LSB is the */ - /* X^31 term, etc. The X^0 term (usually shown as "+1") results in */ - /* the MSB being 1. */ - /* */ - /* Note that the usual hardware shift register implementation, which */ - /* is what we're using (we're merely optimizing it by doing eight-bit */ - /* chunks at a time) shifts bits into the lowest-order term. In our */ - /* implementation, that means shifting towards the right. Why do we */ - /* do it this way? Because the calculated CRC must be transmitted in */ - /* order from highest-order term to lowest-order term. UARTs transmit */ - /* characters in order from LSB to MSB. By storing the CRC this way, */ - /* we hand it to the UART in the order low-byte to high-byte; the UART */ - /* sends each low-bit to hight-bit; and the result is transmission bit */ - /* by bit from highest- to lowest-order term without requiring any bit */ - /* shuffling on our part. Reception works similarly. */ - /* */ - /* The feedback terms table consists of 256, 32-bit entries. Notes: */ - /* */ - /* The table can be generated at runtime if desired; code to do so */ - /* is shown later. It might not be obvious, but the feedback */ - /* terms simply represent the results of eight shift/xor opera- */ - /* tions for all combinations of data and CRC register values. */ - /* */ - /* The values must be right-shifted by eight bits by the "updcrc" */ - /* logic; the shift must be unsigned (bring in zeroes). On some */ - /* hardware you could probably optimize the shift in assembler by */ - /* using byte-swap instructions. */ - /* polynomial $edb88320 */ - /* */ - /* -------------------------------------------------------------------- */ - -static unsigned long crc32_tab[] = { - 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, - 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, - 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, - 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, - 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, - 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, - 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, - 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, - 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, - 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, - 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, - 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, - 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, - 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, - 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, - 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, - 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, - 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, - 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, - 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, - 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, - 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, - 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, - 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, - 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, - 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, - 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, - 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, - 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, - 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, - 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, - 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, - 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, - 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, - 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, - 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, - 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, - 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, - 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, - 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, - 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, - 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, - 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, - 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, - 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, - 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, - 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, - 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, - 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, - 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, - 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, - 0x2d02ef8dL - }; - -/* Return a 32-bit CRC of the contents of the buffer. */ - -unsigned long crc32(const unsigned char *s, unsigned int len) -{ - unsigned int i; - unsigned long crc32val; - - crc32val = 0; - for (i = 0; i < len; i ++) - { - crc32val = - crc32_tab[(crc32val ^ s[i]) & 0xff] ^ - (crc32val >> 8); - } - return crc32val; -} - -/* - * Hashing function for a string - */ -unsigned int hashmap_hash_int(hashmap_map * m, char* keystring){ - - unsigned long key = crc32((unsigned char*)(keystring), strlen(keystring)); - - /* Robert Jenkins' 32 bit Mix Function */ - key += (key << 12); - key ^= (key >> 22); - key += (key << 4); - key ^= (key >> 9); - key += (key << 10); - key ^= (key >> 2); - key += (key << 7); - key ^= (key >> 12); - - /* Knuth's Multiplicative Method */ - key = (key >> 3) * 2654435761; - - return key % m->table_size; -} - -/* - * Return the integer of the location in data - * to store the point to the item, or MAP_FULL. - */ -int hashmap_hash(map_t in, char* key){ - int curr; - int i; - - /* Cast the hashmap */ - hashmap_map* m = (hashmap_map *) in; - - /* If full, return immediately */ - if(m->size >= (m->table_size/2)) return MAP_FULL; - - /* Find the best index */ - curr = hashmap_hash_int(m, key); - - /* Linear probing */ - for(i = 0; i< MAX_CHAIN_LENGTH; i++){ - if(m->data[curr].in_use == 0) - return curr; - - if(m->data[curr].in_use == 1 && (strcmp(m->data[curr].key,key)==0)) - return curr; - - curr = (curr + 1) % m->table_size; - } - - return MAP_FULL; -} - -/* - * Doubles the size of the hashmap, and rehashes all the elements - */ -int hashmap_rehash(map_t in){ - int i; - int old_size; - hashmap_element* curr; - - /* Setup the new elements */ - hashmap_map *m = (hashmap_map *) in; - hashmap_element* temp = (hashmap_element *) - calloc(2 * m->table_size, sizeof(hashmap_element)); - if(!temp) return MAP_OMEM; - - /* Update the array */ - curr = m->data; - m->data = temp; - - /* Update the size */ - old_size = m->table_size; - m->table_size = 2 * m->table_size; - m->size = 0; - - /* Rehash the elements */ - for(i = 0; i < old_size; i++){ - int status; - - if (curr[i].in_use == 0) - continue; - - status = hashmap_put(m, curr[i].key, curr[i].data); - if (status != MAP_OK) - return status; - } - - free(curr); - - return MAP_OK; -} - -/* - * Add a pointer to the hashmap with some key - */ -int hashmap_put(map_t in, char* key, any_t value){ - int index; - hashmap_map* m; - - /* Cast the hashmap */ - m = (hashmap_map *) in; - - /* Find a place to put our value */ - index = hashmap_hash(in, key); - while(index == MAP_FULL){ - if (hashmap_rehash(in) == MAP_OMEM) { - return MAP_OMEM; - } - index = hashmap_hash(in, key); - } - - /* Set the data */ - m->data[index].data = value; - m->data[index].key = key; - m->data[index].in_use = 1; - m->size++; - - return MAP_OK; -} - -/* - * Get your pointer out of the hashmap with a key - */ -int hashmap_get(map_t in, char* key, any_t *arg){ - int curr; - int i; - hashmap_map* m; - - /* Cast the hashmap */ - m = (hashmap_map *) in; - - /* Find data location */ - curr = hashmap_hash_int(m, key); - - /* Linear probing, if necessary */ - for(i = 0; idata[curr].in_use; - if (in_use == 1){ - if (strcmp(m->data[curr].key,key)==0){ - *arg = (m->data[curr].data); - return MAP_OK; - } - } - - curr = (curr + 1) % m->table_size; - } - - *arg = NULL; - - /* Not found */ - return MAP_MISSING; -} - -/* - * Iterate the function parameter over each element in the hashmap. The - * additional any_t argument is passed to the function as its first - * argument and the hashmap element is the second. - */ -int hashmap_iterate(map_t in, PFany f, any_t item) { - int i; - - /* Cast the hashmap */ - hashmap_map* m = (hashmap_map*) in; - - /* On empty hashmap, return immediately */ - if (hashmap_length(m) <= 0) - return MAP_MISSING; - - /* Linear probing */ - for(i = 0; i< m->table_size; i++) - if(m->data[i].in_use != 0) { - any_t data = (any_t) (m->data[i].data); - int status = f(item, data); - if (status != MAP_OK) { - return status; - } - } - - return MAP_OK; -} - -/* - * Remove an element with that key from the map - */ -int hashmap_remove(map_t in, char* key){ - int i; - int curr; - hashmap_map* m; - - /* Cast the hashmap */ - m = (hashmap_map *) in; - - /* Find key */ - curr = hashmap_hash_int(m, key); - - /* Linear probing, if necessary */ - for(i = 0; idata[curr].in_use; - if (in_use == 1){ - if (strcmp(m->data[curr].key,key)==0){ - /* Blank out the fields */ - m->data[curr].in_use = 0; - m->data[curr].data = NULL; - m->data[curr].key = NULL; - - /* Reduce the size */ - m->size--; - return MAP_OK; - } - } - curr = (curr + 1) % m->table_size; - } - - /* Data not found */ - return MAP_MISSING; -} - -/* Deallocate the hashmap */ -void hashmap_free(map_t in){ - hashmap_map* m = (hashmap_map*) in; - free(m->data); - free(m); -} - -/* Return the length of the hashmap */ -int hashmap_length(map_t in){ - hashmap_map* m = (hashmap_map *) in; - if(m != NULL) return m->size; - else return 0; -} diff --git a/src/shared/util/hashmap.cpp b/src/shared/util/hashmap.cpp new file mode 100644 index 0000000..9d7ac71 --- /dev/null +++ b/src/shared/util/hashmap.cpp @@ -0,0 +1,397 @@ +/* + * Generic map implementation. + */ +#include "hashmap.hpp" + +#include +#include +#include + +#define INITIAL_SIZE (256) +#define MAX_CHAIN_LENGTH (8) + +/* We need to keep keys and values */ +typedef struct _hashmap_element{ + char* key; + int in_use; + any_t data; +} hashmap_element; + +/* A hashmap has some maximum size and current size, + * as well as the data to hold. */ +typedef struct _hashmap_map{ + int table_size; + int size; + hashmap_element *data; +} hashmap_map; + +/* + * Return an empty hashmap, or NULL on failure. + */ +map_t hashmap_new() { + hashmap_map* m = (hashmap_map*) malloc(sizeof(hashmap_map)); + if(!m) goto err; + + m->data = (hashmap_element*) calloc(INITIAL_SIZE, sizeof(hashmap_element)); + if(!m->data) goto err; + + m->table_size = INITIAL_SIZE; + m->size = 0; + + return m; + err: + if (m) + hashmap_free(m); + return NULL; +} + +/* The implementation here was originally done by Gary S. Brown. I have + borrowed the tables directly, and made some minor changes to the + crc32-function (including changing the interface). //ylo */ + + /* ============================================================= */ + /* COPYRIGHT (C) 1986 Gary S. Brown. You may use this program, or */ + /* code or tables extracted from it, as desired without restriction. */ + /* */ + /* First, the polynomial itself and its table of feedback terms. The */ + /* polynomial is */ + /* X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 */ + /* */ + /* Note that we take it "backwards" and put the highest-order term in */ + /* the lowest-order bit. The X^32 term is "implied"; the LSB is the */ + /* X^31 term, etc. The X^0 term (usually shown as "+1") results in */ + /* the MSB being 1. */ + /* */ + /* Note that the usual hardware shift register implementation, which */ + /* is what we're using (we're merely optimizing it by doing eight-bit */ + /* chunks at a time) shifts bits into the lowest-order term. In our */ + /* implementation, that means shifting towards the right. Why do we */ + /* do it this way? Because the calculated CRC must be transmitted in */ + /* order from highest-order term to lowest-order term. UARTs transmit */ + /* characters in order from LSB to MSB. By storing the CRC this way, */ + /* we hand it to the UART in the order low-byte to high-byte; the UART */ + /* sends each low-bit to hight-bit; and the result is transmission bit */ + /* by bit from highest- to lowest-order term without requiring any bit */ + /* shuffling on our part. Reception works similarly. */ + /* */ + /* The feedback terms table consists of 256, 32-bit entries. Notes: */ + /* */ + /* The table can be generated at runtime if desired; code to do so */ + /* is shown later. It might not be obvious, but the feedback */ + /* terms simply represent the results of eight shift/xor opera- */ + /* tions for all combinations of data and CRC register values. */ + /* */ + /* The values must be right-shifted by eight bits by the "updcrc" */ + /* logic; the shift must be unsigned (bring in zeroes). On some */ + /* hardware you could probably optimize the shift in assembler by */ + /* using byte-swap instructions. */ + /* polynomial $edb88320 */ + /* */ + /* -------------------------------------------------------------------- */ + +static unsigned long crc32_tab[] = { + 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, + 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, + 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, + 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, + 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, + 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, + 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, + 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, + 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, + 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, + 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, + 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, + 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, + 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, + 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, + 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, + 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, + 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, + 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, + 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, + 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, + 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, + 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, + 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, + 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, + 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, + 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, + 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, + 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, + 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, + 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, + 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, + 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, + 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, + 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, + 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, + 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, + 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, + 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, + 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, + 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, + 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, + 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, + 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, + 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, + 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, + 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, + 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, + 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, + 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, + 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, + 0x2d02ef8dL + }; + +/* Return a 32-bit CRC of the contents of the buffer. */ + +unsigned long crc32(const unsigned char *s, unsigned int len) +{ + unsigned int i; + unsigned long crc32val; + + crc32val = 0; + for (i = 0; i < len; i ++) + { + crc32val = + crc32_tab[(crc32val ^ s[i]) & 0xff] ^ + (crc32val >> 8); + } + return crc32val; +} + +/* + * Hashing function for a string + */ +unsigned int hashmap_hash_int(hashmap_map * m, char* keystring){ + + unsigned long key = crc32((unsigned char*)(keystring), strlen(keystring)); + + /* Robert Jenkins' 32 bit Mix Function */ + key += (key << 12); + key ^= (key >> 22); + key += (key << 4); + key ^= (key >> 9); + key += (key << 10); + key ^= (key >> 2); + key += (key << 7); + key ^= (key >> 12); + + /* Knuth's Multiplicative Method */ + key = (key >> 3) * 2654435761; + + return key % m->table_size; +} + +/* + * Return the integer of the location in data + * to store the point to the item, or MAP_FULL. + */ +int hashmap_hash(map_t in, char* key){ + int curr; + int i; + + /* Cast the hashmap */ + hashmap_map* m = (hashmap_map *) in; + + /* If full, return immediately */ + if(m->size >= (m->table_size/2)) return MAP_FULL; + + /* Find the best index */ + curr = hashmap_hash_int(m, key); + + /* Linear probing */ + for(i = 0; i< MAX_CHAIN_LENGTH; i++){ + if(m->data[curr].in_use == 0) + return curr; + + if(m->data[curr].in_use == 1 && (strcmp(m->data[curr].key,key)==0)) + return curr; + + curr = (curr + 1) % m->table_size; + } + + return MAP_FULL; +} + +/* + * Doubles the size of the hashmap, and rehashes all the elements + */ +int hashmap_rehash(map_t in){ + int i; + int old_size; + hashmap_element* curr; + + /* Setup the new elements */ + hashmap_map *m = (hashmap_map *) in; + hashmap_element* temp = (hashmap_element *) + calloc(2 * m->table_size, sizeof(hashmap_element)); + if(!temp) return MAP_OMEM; + + /* Update the array */ + curr = m->data; + m->data = temp; + + /* Update the size */ + old_size = m->table_size; + m->table_size = 2 * m->table_size; + m->size = 0; + + /* Rehash the elements */ + for(i = 0; i < old_size; i++){ + int status; + + if (curr[i].in_use == 0) + continue; + + status = hashmap_put(m, curr[i].key, curr[i].data); + if (status != MAP_OK) + return status; + } + + free(curr); + + return MAP_OK; +} + +/* + * Add a pointer to the hashmap with some key + */ +int hashmap_put(map_t in, char* key, any_t value){ + int index; + hashmap_map* m; + + /* Cast the hashmap */ + m = (hashmap_map *) in; + + /* Find a place to put our value */ + index = hashmap_hash(in, key); + while(index == MAP_FULL){ + if (hashmap_rehash(in) == MAP_OMEM) { + return MAP_OMEM; + } + index = hashmap_hash(in, key); + } + + /* Set the data */ + m->data[index].data = value; + m->data[index].key = key; + m->data[index].in_use = 1; + m->size++; + + return MAP_OK; +} + +/* + * Get your pointer out of the hashmap with a key + */ +int hashmap_get(map_t in, char* key, any_t *arg){ + int curr; + int i; + hashmap_map* m; + + /* Cast the hashmap */ + m = (hashmap_map *) in; + + /* Find data location */ + curr = hashmap_hash_int(m, key); + + /* Linear probing, if necessary */ + for(i = 0; idata[curr].in_use; + if (in_use == 1){ + if (strcmp(m->data[curr].key,key)==0){ + *arg = (m->data[curr].data); + return MAP_OK; + } + } + + curr = (curr + 1) % m->table_size; + } + + *arg = NULL; + + /* Not found */ + return MAP_MISSING; +} + +/* + * Iterate the function parameter over each element in the hashmap. The + * additional any_t argument is passed to the function as its first + * argument and the hashmap element is the second. + */ +int hashmap_iterate(map_t in, PFany f, any_t item) { + int i; + + /* Cast the hashmap */ + hashmap_map* m = (hashmap_map*) in; + + /* On empty hashmap, return immediately */ + if (hashmap_length(m) <= 0) + return MAP_MISSING; + + /* Linear probing */ + for(i = 0; i< m->table_size; i++) + if(m->data[i].in_use != 0) { + any_t data = (any_t) (m->data[i].data); + int status = f(item, data); + if (status != MAP_OK) { + return status; + } + } + + return MAP_OK; +} + +/* + * Remove an element with that key from the map + */ +int hashmap_remove(map_t in, char* key){ + int i; + int curr; + hashmap_map* m; + + /* Cast the hashmap */ + m = (hashmap_map *) in; + + /* Find key */ + curr = hashmap_hash_int(m, key); + + /* Linear probing, if necessary */ + for(i = 0; idata[curr].in_use; + if (in_use == 1){ + if (strcmp(m->data[curr].key,key)==0){ + /* Blank out the fields */ + m->data[curr].in_use = 0; + m->data[curr].data = NULL; + m->data[curr].key = NULL; + + /* Reduce the size */ + m->size--; + return MAP_OK; + } + } + curr = (curr + 1) % m->table_size; + } + + /* Data not found */ + return MAP_MISSING; +} + +/* Deallocate the hashmap */ +void hashmap_free(map_t in){ + hashmap_map* m = (hashmap_map*) in; + free(m->data); + free(m); +} + +/* Return the length of the hashmap */ +int hashmap_length(map_t in){ + hashmap_map* m = (hashmap_map *) in; + if(m != NULL) return m->size; + else return 0; +} diff --git a/src/shared/util/hashmap.h b/src/shared/util/hashmap.h deleted file mode 100644 index 16c76dd..0000000 --- a/src/shared/util/hashmap.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Generic hashmap manipulation functions - * - * Originally by Elliot C Back - http://elliottback.com/wp/hashmap-implementation-in-c/ - * - * Modified by Pete Warden to fix a serious performance problem, support strings as keys - * and removed thread synchronization - http://petewarden.typepad.com - */ -#ifndef __HASHMAP_H__ -#define __HASHMAP_H__ - -#define MAP_MISSING -3 /* No such element */ -#define MAP_FULL -2 /* Hashmap is full */ -#define MAP_OMEM -1 /* Out of Memory */ -#define MAP_OK 0 /* OK */ - -/* - * any_t is a pointer. This allows you to put arbitrary structures in - * the hashmap. - */ -typedef void *any_t; - -/* - * PFany is a pointer to a function that can take two any_t arguments - * and return an integer. Returns status code.. - */ -typedef int (*PFany)(any_t, any_t); - -/* - * map_t is a pointer to an internally maintained data structure. - * Clients of this package do not need to know how hashmaps are - * represented. They see and manipulate only map_t's. - */ -typedef any_t map_t; - -/* - * Return an empty hashmap. Returns NULL if empty. -*/ -extern map_t hashmap_new(); - -/* - * Iteratively call f with argument (item, data) for - * each element data in the hashmap. The function must - * return a map status code. If it returns anything other - * than MAP_OK the traversal is terminated. f must - * not reenter any hashmap functions, or deadlock may arise. - */ -extern int hashmap_iterate(map_t in, PFany f, any_t item); - -/* - * Add an element to the hashmap. Return MAP_OK or MAP_OMEM. - */ -extern int hashmap_put(map_t in, char* key, any_t value); - -/* - * Get an element from the hashmap. Return MAP_OK or MAP_MISSING. - */ -extern int hashmap_get(map_t in, char* key, any_t *arg); - -/* - * Remove an element from the hashmap. Return MAP_OK or MAP_MISSING. - */ -extern int hashmap_remove(map_t in, char* key); - -/* - * Get any element. Return MAP_OK or MAP_MISSING. - * remove - should the element be removed from the hashmap - */ -extern int hashmap_get_one(map_t in, any_t *arg, int remove); - -/* - * Free the hashmap - */ -extern void hashmap_free(map_t in); - -/* - * Get the current size of a hashmap - */ -extern int hashmap_length(map_t in); - -#endif //__HASHMAP_H__ diff --git a/src/shared/util/hashmap.hpp b/src/shared/util/hashmap.hpp new file mode 100644 index 0000000..16c76dd --- /dev/null +++ b/src/shared/util/hashmap.hpp @@ -0,0 +1,81 @@ +/* + * Generic hashmap manipulation functions + * + * Originally by Elliot C Back - http://elliottback.com/wp/hashmap-implementation-in-c/ + * + * Modified by Pete Warden to fix a serious performance problem, support strings as keys + * and removed thread synchronization - http://petewarden.typepad.com + */ +#ifndef __HASHMAP_H__ +#define __HASHMAP_H__ + +#define MAP_MISSING -3 /* No such element */ +#define MAP_FULL -2 /* Hashmap is full */ +#define MAP_OMEM -1 /* Out of Memory */ +#define MAP_OK 0 /* OK */ + +/* + * any_t is a pointer. This allows you to put arbitrary structures in + * the hashmap. + */ +typedef void *any_t; + +/* + * PFany is a pointer to a function that can take two any_t arguments + * and return an integer. Returns status code.. + */ +typedef int (*PFany)(any_t, any_t); + +/* + * map_t is a pointer to an internally maintained data structure. + * Clients of this package do not need to know how hashmaps are + * represented. They see and manipulate only map_t's. + */ +typedef any_t map_t; + +/* + * Return an empty hashmap. Returns NULL if empty. +*/ +extern map_t hashmap_new(); + +/* + * Iteratively call f with argument (item, data) for + * each element data in the hashmap. The function must + * return a map status code. If it returns anything other + * than MAP_OK the traversal is terminated. f must + * not reenter any hashmap functions, or deadlock may arise. + */ +extern int hashmap_iterate(map_t in, PFany f, any_t item); + +/* + * Add an element to the hashmap. Return MAP_OK or MAP_OMEM. + */ +extern int hashmap_put(map_t in, char* key, any_t value); + +/* + * Get an element from the hashmap. Return MAP_OK or MAP_MISSING. + */ +extern int hashmap_get(map_t in, char* key, any_t *arg); + +/* + * Remove an element from the hashmap. Return MAP_OK or MAP_MISSING. + */ +extern int hashmap_remove(map_t in, char* key); + +/* + * Get any element. Return MAP_OK or MAP_MISSING. + * remove - should the element be removed from the hashmap + */ +extern int hashmap_get_one(map_t in, any_t *arg, int remove); + +/* + * Free the hashmap + */ +extern void hashmap_free(map_t in); + +/* + * Get the current size of a hashmap + */ +extern int hashmap_length(map_t in); + +#endif //__HASHMAP_H__ -- cgit v1.2.3-70-g09d2