Merge branch 'master' of github.com:ivansafrin/Polycode

.gitignore

@@ -6,6 +6,7 @@
 *.la
 *.dylib
 *.so
+*.pyc
 *.pbxuser
 *.mode1v3
 *.swp

Bindings/CMakeLists.txt

@@ -0,0 +1,3 @@
+ADD_SUBDIRECTORY(Scripts/create_lua_library)
+ADD_SUBDIRECTORY(Contents/LUA)
+

Bindings/Contents/LUA/API/Polycode/Renderer.lua

@@ -380,8 +380,8 @@ function Renderer:clearLights()
 	local retVal =  Polycore.Renderer_clearLights(self.__ptr)
 end
 
-function Renderer:addLight(position, direction, type, color, specularColor, constantAttenuation, linearAttenuation, quadraticAttenuation, intensity, spotlightCutoff, spotlightExponent, shadowsEnabled, textureMatrix, shadowMapTexture)
-	local retVal = Polycore.Renderer_addLight(self.__ptr, position.__ptr, direction.__ptr, type, color.__ptr, specularColor.__ptr, constantAttenuation, linearAttenuation, quadraticAttenuation, intensity, spotlightCutoff, spotlightExponent, shadowsEnabled, textureMatrix.__ptr, shadowMapTexture.__ptr)
+function Renderer:addLight(lightImportance, position, direction, type, color, specularColor, constantAttenuation, linearAttenuation, quadraticAttenuation, intensity, spotlightCutoff, spotlightExponent, shadowsEnabled, textureMatrix, shadowMapTexture)
+	local retVal = Polycore.Renderer_addLight(self.__ptr, lightImportance, position.__ptr, direction.__ptr, type, color.__ptr, specularColor.__ptr, constantAttenuation, linearAttenuation, quadraticAttenuation, intensity, spotlightCutoff, spotlightExponent, shadowsEnabled, textureMatrix.__ptr, shadowMapTexture.__ptr)
 end
 
 function Renderer:setExposureLevel(level)

Bindings/Contents/LUA/API/Polycode/SceneLight.lua

@@ -167,6 +167,15 @@ function SceneLight:enableDebugDraw(val)
 	local retVal = Polycore.SceneLight_enableDebugDraw(self.__ptr, val)
 end
 
+function SceneLight:setLightImportance(newImportance)
+	local retVal = Polycore.SceneLight_setLightImportance(self.__ptr, newImportance)
+end
+
+function SceneLight:getLightImportance()
+	local retVal =  Polycore.SceneLight_getLightImportance(self.__ptr)
+	return retVal
+end
+
 
 
 function SceneLight:__delete()

Bindings/Contents/CMakeLists.txt → Bindings/Contents/LUA/CMakeLists.txt

@@ -1,19 +1,20 @@
 INCLUDE(PolycodeIncludes)
 
 FIND_PACKAGE(Lua51 REQUIRED)
+
 INCLUDE_DIRECTORIES(
     ${LUA_INCLUDE_DIR}
-    LUA/Include
+    Include
 )
 
 SET(polycodeLua_SRCS
-    LUA/Source/PolycodeLUA.cpp
+    Source/PolycodeLUA.cpp
 )
 
 SET(polycodeLua_HDRS
-    LUA/Include/PolycodeLUAWrappers.h
-    LUA/Include/PolycodeLUA.h
-    LUA/Include/PolycodeLUA2D.h
+    Include/PolycodeLUAWrappers.h
+    Include/PolycodeLUA.h
+    Include/PolycodeLUA2D.h
 )
 
 SET(CMAKE_DEBUG_POSTFIX "_d")
@@ -25,6 +26,7 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
 
 #IF(POLYCODE_BUILD_STATIC)
 ADD_LIBRARY(PolycodeLua ${polycodeLua_SRCS} ${polycodeLua_HDRS})
+ADD_DEPENDENCIES(PolycodeLua PolycodeLuaGenerate)
 #ENDIF(POLYCODE_BUILD_STATIC)
 
 IF(POLYCODE_INSTALL_FRAMEWORK)

Bindings/Contents/LUA/Include/PolycodeLUAWrappers.h

@@ -1292,10 +1292,10 @@ static int Polycore_Renderer_setClippingPlanes(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	Renderer *inst = (Renderer*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TNUMBER);
-	Number near_ = lua_tonumber(L, 2);
+	Number near = lua_tonumber(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
-	Number far_ = lua_tonumber(L, 3);
-	inst->setClippingPlanes(near_, far_);
+	Number far = lua_tonumber(L, 3);
+	inst->setClippingPlanes(near, far);
 	return 0;
 }
 
@@ -1399,35 +1399,37 @@ static int Polycore_Renderer_clearLights(lua_State *L) {
 static int Polycore_Renderer_addLight(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	Renderer *inst = (Renderer*)lua_topointer(L, 1);
-	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	Vector3 position = *(Vector3*)lua_topointer(L, 2);
+	luaL_checktype(L, 2, LUA_TNUMBER);
+	int lightImportance = lua_tointeger(L, 2);
 	luaL_checktype(L, 3, LUA_TLIGHTUSERDATA);
-	Vector3 direction = *(Vector3*)lua_topointer(L, 3);
-	luaL_checktype(L, 4, LUA_TNUMBER);
-	int type = lua_tointeger(L, 4);
-	luaL_checktype(L, 5, LUA_TLIGHTUSERDATA);
-	Color color = *(Color*)lua_topointer(L, 5);
+	Vector3 position = *(Vector3*)lua_topointer(L, 3);
+	luaL_checktype(L, 4, LUA_TLIGHTUSERDATA);
+	Vector3 direction = *(Vector3*)lua_topointer(L, 4);
+	luaL_checktype(L, 5, LUA_TNUMBER);
+	int type = lua_tointeger(L, 5);
 	luaL_checktype(L, 6, LUA_TLIGHTUSERDATA);
-	Color specularColor = *(Color*)lua_topointer(L, 6);
-	luaL_checktype(L, 7, LUA_TNUMBER);
-	Number constantAttenuation = lua_tonumber(L, 7);
+	Color color = *(Color*)lua_topointer(L, 6);
+	luaL_checktype(L, 7, LUA_TLIGHTUSERDATA);
+	Color specularColor = *(Color*)lua_topointer(L, 7);
 	luaL_checktype(L, 8, LUA_TNUMBER);
-	Number linearAttenuation = lua_tonumber(L, 8);
+	Number constantAttenuation = lua_tonumber(L, 8);
 	luaL_checktype(L, 9, LUA_TNUMBER);
-	Number quadraticAttenuation = lua_tonumber(L, 9);
+	Number linearAttenuation = lua_tonumber(L, 9);
 	luaL_checktype(L, 10, LUA_TNUMBER);
-	Number intensity = lua_tonumber(L, 10);
+	Number quadraticAttenuation = lua_tonumber(L, 10);
 	luaL_checktype(L, 11, LUA_TNUMBER);
-	Number spotlightCutoff = lua_tonumber(L, 11);
+	Number intensity = lua_tonumber(L, 11);
 	luaL_checktype(L, 12, LUA_TNUMBER);
-	Number spotlightExponent = lua_tonumber(L, 12);
-	luaL_checktype(L, 13, LUA_TBOOLEAN);
-	bool shadowsEnabled = lua_toboolean(L, 13);
-	luaL_checktype(L, 14, LUA_TLIGHTUSERDATA);
-	Matrix4 * textureMatrix = (Matrix4 *)lua_topointer(L, 14);
+	Number spotlightCutoff = lua_tonumber(L, 12);
+	luaL_checktype(L, 13, LUA_TNUMBER);
+	Number spotlightExponent = lua_tonumber(L, 13);
+	luaL_checktype(L, 14, LUA_TBOOLEAN);
+	bool shadowsEnabled = lua_toboolean(L, 14);
 	luaL_checktype(L, 15, LUA_TLIGHTUSERDATA);
-	Texture * shadowMapTexture = (Texture *)lua_topointer(L, 15);
-	inst->addLight(position, direction, type, color, specularColor, constantAttenuation, linearAttenuation, quadraticAttenuation, intensity, spotlightCutoff, spotlightExponent, shadowsEnabled, textureMatrix, shadowMapTexture);
+	Matrix4 * textureMatrix = (Matrix4 *)lua_topointer(L, 15);
+	luaL_checktype(L, 16, LUA_TLIGHTUSERDATA);
+	Texture * shadowMapTexture = (Texture *)lua_topointer(L, 16);
+	inst->addLight(lightImportance, position, direction, type, color, specularColor, constantAttenuation, linearAttenuation, quadraticAttenuation, intensity, spotlightCutoff, spotlightExponent, shadowsEnabled, textureMatrix, shadowMapTexture);
 	return 0;
 }
 
@@ -10856,7 +10858,7 @@ static int Polycore_SceneLight_setLightColor(lua_State *L) {
 	if(lua_isnumber(L, 5)) {
 		a = lua_tonumber(L, 5);
 	} else {
-		a = 1;
+		a = 1.0;
 	}
 	inst->setLightColor(r, g, b, a);
 	return 0;
@@ -10934,6 +10936,22 @@ static int Polycore_SceneLight_enableDebugDraw(lua_State *L) {
 	return 0;
 }
 
+static int Polycore_SceneLight_setLightImportance(lua_State *L) {
+	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+	SceneLight *inst = (SceneLight*)lua_topointer(L, 1);
+	luaL_checktype(L, 2, LUA_TNUMBER);
+	int newImportance = lua_tointeger(L, 2);
+	inst->setLightImportance(newImportance);
+	return 0;
+}
+
+static int Polycore_SceneLight_getLightImportance(lua_State *L) {
+	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+	SceneLight *inst = (SceneLight*)lua_topointer(L, 1);
+	lua_pushinteger(L, inst->getLightImportance());
+	return 1;
+}
+
 static int Polycore_delete_SceneLight(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	SceneLight *inst = (SceneLight*)lua_topointer(L, 1);

Bindings/Contents/LUA/Source/PolycodeLUA.cpp

@@ -1169,6 +1169,8 @@ int luaopen_Polycode(lua_State *L) {
 		{"SceneLight_areShadowsEnabled", Polycore_SceneLight_areShadowsEnabled},
 		{"SceneLight_getLightType", Polycore_SceneLight_getLightType},
 		{"SceneLight_enableDebugDraw", Polycore_SceneLight_enableDebugDraw},
+		{"SceneLight_setLightImportance", Polycore_SceneLight_setLightImportance},
+		{"SceneLight_getLightImportance", Polycore_SceneLight_getLightImportance},
 		{"delete_SceneLight", Polycore_delete_SceneLight},
 		{NULL, NULL}
 	};

Bindings/Scripts/create_lua_library/CMakeLists.txt

@@ -0,0 +1,18 @@
+INCLUDE(FindPythonModule)
+
+FIND_PACKAGE(PythonInterp REQUIRED)
+FIND_PYTHON_MODULE(ply REQUIRED)
+IF(NOT PY_PLY)
+	MESSAGE(SEND_ERROR "The Python PLY (Python Lex-Yacc) module is required to generate Lua bindings.")
+ENDIF(NOT PY_PLY)
+
+ADD_CUSTOM_TARGET(PolycodeLuaGenerate
+    ${PYTHON_EXECUTABLE} create_lua_library.py ../../../Core/Contents/Include Polycode Polycode.h polycore Polycore ../../Contents/LUA/API ../../Contents/LUA/API/Polycode ../../Contents/LUA/Include ../../Contents/LUA/Source
+	${PYTHON_EXECUTABLE} create_lua_library.py ../../../Modules/Contents/2DPhysics/Include/ Physics2D Polycode2DPhysics.h physics2d Physics2D ../../../Modules/Bindings/2DPhysics/API ../../../Modules/Bindings/2DPhysics/API/Physics2D ../../../Modules/Bindings/2DPhysics/Include ../../../Modules/Bindings/2DPhysics/Source
+	${PYTHON_EXECUTABLE} create_lua_library.py ../../../Modules/Contents/3DPhysics/Include/ Physics3D Polycode3DPhysics.h physics3d Physics3D ../../../Modules/Bindings/3DPhysics/API ../../../Modules/Bindings/3DPhysics/API/Physics3D ../../../Modules/Bindings/3DPhysics/Include ../../../Modules/Bindings/3DPhysics/Source
+	DEPENDS Polycore
+	COMMENT "Generating Lua API"
+	WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+	SOURCES create_lua_library.py
+)
+

Bindings/Scripts/create_lua_library/create_lua_library.py

@@ -1,7 +1,7 @@
 import sys
 import CppHeaderParser
 import os
-
+import re
 
 def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, apiPath, apiClassPath, includePath, sourcePath):	
 	out = ""
@@ -261,9 +261,10 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 	
 									if "defaltValue" in param:
 										if checkfunc != "lua_islightuserdata" or (checkfunc == "lua_islightuserdata" and param["defaltValue"] == "NULL"):
-											param["defaltValue"] = param["defaltValue"].replace(" 0f", ".0f")
+											#param["defaltValue"] = param["defaltValue"].replace(" 0f", ".0f")
 											param["defaltValue"] = param["defaltValue"].replace(": :", "::")
-											param["defaltValue"] = param["defaltValue"].replace("0 ", "0.")
+											#param["defaltValue"] = param["defaltValue"].replace("0 ", "0.")
+											param["defaltValue"] = re.sub(r'([0-9]+) ([0-9])+', r'\1.\2', param["defaltValue"])
 	
 											out += "\t%s %s;\n" % (param["type"], param["name"])
 											out += "\tif(%s(L, %d)) {\n" % (checkfunc, idx)

CMake/FindPythonModule.cmake

@@ -0,0 +1,25 @@
+# Find if a Python module is installed
+# Found at http://www.cmake.org/pipermail/cmake/2011-January/041666.html
+# To use do: find_python_module(PyQt4 REQUIRED)
+function(find_python_module module)
+	string(TOUPPER ${module} module_upper)
+	if(NOT PY_${module_upper})
+		if(ARGC GREATER 1 AND ARGV1 STREQUAL "REQUIRED")
+			set(${module}_FIND_REQUIRED TRUE)
+		endif()
+		# A module's location is usually a directory, but for binary modules
+		# it's a .so file.
+		execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" 
+			"import re, ${module}; print re.compile('/__init__.py.*').sub('',${module}.__file__)"
+			RESULT_VARIABLE _${module}_status 
+			OUTPUT_VARIABLE _${module}_location
+			ERROR_QUIET 
+			OUTPUT_STRIP_TRAILING_WHITESPACE)
+		if(NOT _${module}_status)
+			set(PY_${module_upper} ${_${module}_location} CACHE STRING 
+				"Location of Python module ${module}")
+		endif(NOT _${module}_status)
+	endif(NOT PY_${module_upper})
+	find_package_handle_standard_args(PY_${module} DEFAULT_MSG PY_${module_upper})
+endfunction(find_python_module)
+

CMakeLists.txt

@@ -52,7 +52,7 @@ ADD_SUBDIRECTORY(Core/Contents)
 ADD_SUBDIRECTORY("Assets/Default asset pack")
 
 IF(POLYCODE_BUILD_BINDINGS)
-    ADD_SUBDIRECTORY(Bindings/Contents)
+    ADD_SUBDIRECTORY(Bindings)
 ENDIF(POLYCODE_BUILD_BINDINGS)
 
 IF(POLYCODE_BUILD_EXAMPLES)