More Mac cmake fixes for Player

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

@@ -68,7 +68,7 @@ function Bone:Bone(...)
 end
 
 function Bone:enableBoneLabel(labelFont, size, scale, labelColor)
-	local retVal = Polycore.Bone_enableBoneLabel(self.__ptr, labelFont.__ptr, size, scale, labelColor.__ptr)
+	local retVal = Polycore.Bone_enableBoneLabel(self.__ptr, labelFont, size, scale, labelColor.__ptr)
 end
 
 function Bone:getName()

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

@@ -95,7 +95,7 @@ function Camera:createPostFilter(shaderMaterial)
 end
 
 function Camera:setPostFilter(shaderName)
-	local retVal = Polycore.Camera_setPostFilter(self.__ptr, shaderName.__ptr)
+	local retVal = Polycore.Camera_setPostFilter(self.__ptr, shaderName)
 end
 
 function Camera:removePostFilter()

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

@@ -21,15 +21,15 @@ function Config:Config(...)
 end
 
 function Config:loadConfig(configNamespace, fileName)
-	local retVal = Polycore.Config_loadConfig(self.__ptr, configNamespace.__ptr, fileName.__ptr)
+	local retVal = Polycore.Config_loadConfig(self.__ptr, configNamespace, fileName)
 end
 
 function Config:saveConfig(configNamespace, fileName)
-	local retVal = Polycore.Config_saveConfig(self.__ptr, configNamespace.__ptr, fileName.__ptr)
+	local retVal = Polycore.Config_saveConfig(self.__ptr, configNamespace, fileName)
 end
 
 function Config:getEntry(configNamespace, key)
-	local retVal = Polycore.Config_getEntry(self.__ptr, configNamespace.__ptr, key.__ptr)
+	local retVal = Polycore.Config_getEntry(self.__ptr, configNamespace, key)
 	if retVal == nil then return nil end
 	if Polycore.__ptr_lookup[retVal] ~= nil then
 		return Polycore.__ptr_lookup[retVal]
@@ -41,20 +41,20 @@ function Config:getEntry(configNamespace, key)
 end
 
 function Config:setStringValue(configNamespace, key, value)
-	local retVal = Polycore.Config_setStringValue(self.__ptr, configNamespace.__ptr, key.__ptr, value.__ptr)
+	local retVal = Polycore.Config_setStringValue(self.__ptr, configNamespace, key, value)
 end
 
 function Config:setNumericValue(configNamespace, key, value)
-	local retVal = Polycore.Config_setNumericValue(self.__ptr, configNamespace.__ptr, key.__ptr, value)
+	local retVal = Polycore.Config_setNumericValue(self.__ptr, configNamespace, key, value)
 end
 
 function Config:getNumericValue(configNamespace, key)
-	local retVal = Polycore.Config_getNumericValue(self.__ptr, configNamespace.__ptr, key.__ptr)
+	local retVal = Polycore.Config_getNumericValue(self.__ptr, configNamespace, key)
 	return retVal
 end
 
 function Config:getStringValue(configNamespace, key)
-	local retVal = Polycore.Config_getStringValue(self.__ptr, configNamespace.__ptr, key.__ptr)
+	local retVal = Polycore.Config_getStringValue(self.__ptr, configNamespace, key)
 	if retVal == nil then return nil end
 	if Polycore.__ptr_lookup[retVal] ~= nil then
 		return Polycore.__ptr_lookup[retVal]

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

@@ -47,7 +47,7 @@ function Core:createMutex()
 end
 
 function Core:copyStringToClipboard(str)
-	local retVal = Polycore.Core_copyStringToClipboard(self.__ptr, str.__ptr)
+	local retVal = Polycore.Core_copyStringToClipboard(self.__ptr, str)
 end
 
 function Core:getClipboardString()
@@ -121,19 +121,19 @@ function Core:getNumVideoModes()
 end
 
 function Core:createFolder(folderPath)
-	local retVal = Polycore.Core_createFolder(self.__ptr, folderPath.__ptr)
+	local retVal = Polycore.Core_createFolder(self.__ptr, folderPath)
 end
 
 function Core:copyDiskItem(itemPath, destItemPath)
-	local retVal = Polycore.Core_copyDiskItem(self.__ptr, itemPath.__ptr, destItemPath.__ptr)
+	local retVal = Polycore.Core_copyDiskItem(self.__ptr, itemPath, destItemPath)
 end
 
 function Core:moveDiskItem(itemPath, destItemPath)
-	local retVal = Polycore.Core_moveDiskItem(self.__ptr, itemPath.__ptr, destItemPath.__ptr)
+	local retVal = Polycore.Core_moveDiskItem(self.__ptr, itemPath, destItemPath)
 end
 
 function Core:removeDiskItem(itemPath)
-	local retVal = Polycore.Core_removeDiskItem(self.__ptr, itemPath.__ptr)
+	local retVal = Polycore.Core_removeDiskItem(self.__ptr, itemPath)
 end
 
 function Core:openFolderPicker()

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

@@ -21,7 +21,7 @@ function Data:Data(...)
 end
 
 function Data:loadFromFile(fileName)
-	local retVal = Polycore.Data_loadFromFile(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.Data_loadFromFile(self.__ptr, fileName)
 end
 
 function Data:getAsString(encoding)
@@ -30,11 +30,11 @@ function Data:getAsString(encoding)
 end
 
 function Data:setFromString(str, encoding)
-	local retVal = Polycore.Data_setFromString(self.__ptr, str.__ptr, encoding)
+	local retVal = Polycore.Data_setFromString(self.__ptr, str, encoding)
 end
 
 function Data:saveToFile(fileName)
-	local retVal = Polycore.Data_saveToFile(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.Data_saveToFile(self.__ptr, fileName)
 	return retVal
 end
 

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

@@ -470,7 +470,7 @@ function Entity:getChildCenter()
 end
 
 function Entity:getEntityProp(propName)
-	local retVal = Polycore.Entity_getEntityProp(self.__ptr, propName.__ptr)
+	local retVal = Polycore.Entity_getEntityProp(self.__ptr, propName)
 	return retVal
 end
 

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

@@ -29,15 +29,15 @@ function FixedShaderBinding:FixedShaderBinding(...)
 end
 
 function FixedShaderBinding:addTexture(name, texture)
-	local retVal = Polycore.FixedShaderBinding_addTexture(self.__ptr, name.__ptr, texture.__ptr)
+	local retVal = Polycore.FixedShaderBinding_addTexture(self.__ptr, name, texture.__ptr)
 end
 
 function FixedShaderBinding:addCubemap(name, cubemap)
-	local retVal = Polycore.FixedShaderBinding_addCubemap(self.__ptr, name.__ptr, cubemap.__ptr)
+	local retVal = Polycore.FixedShaderBinding_addCubemap(self.__ptr, name, cubemap.__ptr)
 end
 
 function FixedShaderBinding:addParam(type, name, value)
-	local retVal = Polycore.FixedShaderBinding_addParam(self.__ptr, type.__ptr, name.__ptr, value.__ptr)
+	local retVal = Polycore.FixedShaderBinding_addParam(self.__ptr, type, name, value)
 end
 
 function FixedShaderBinding:getDiffuseTexture()

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

@@ -21,11 +21,11 @@ function FontManager:FontManager(...)
 end
 
 function FontManager:registerFont(fontName, fontPath)
-	local retVal = Polycore.FontManager_registerFont(self.__ptr, fontName.__ptr, fontPath.__ptr)
+	local retVal = Polycore.FontManager_registerFont(self.__ptr, fontName, fontPath)
 end
 
 function FontManager:getFontByName(fontName)
-	local retVal = Polycore.FontManager_getFontByName(self.__ptr, fontName.__ptr)
+	local retVal = Polycore.FontManager_getFontByName(self.__ptr, fontName)
 	if retVal == nil then return nil end
 	if Polycore.__ptr_lookup[retVal] ~= nil then
 		return Polycore.__ptr_lookup[retVal]

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

@@ -23,12 +23,12 @@ function Image:Image(...)
 end
 
 function Image:loadImage(fileName)
-	local retVal = Polycore.Image_loadImage(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.Image_loadImage(self.__ptr, fileName)
 	return retVal
 end
 
 function Image:loadPNG(fileName)
-	local retVal = Polycore.Image_loadPNG(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.Image_loadPNG(self.__ptr, fileName)
 	return retVal
 end
 
@@ -129,7 +129,7 @@ function Image:getType()
 end
 
 function Image:writeBMP(fileName)
-	local retVal = Polycore.Image_writeBMP(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.Image_writeBMP(self.__ptr, fileName)
 end
 
 function Image:getWidth()

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

@@ -31,7 +31,7 @@ function Label:Label(...)
 end
 
 function Label:setText(text)
-	local retVal = Polycore.Label_setText(self.__ptr, text.__ptr)
+	local retVal = Polycore.Label_setText(self.__ptr, text)
 end
 
 function Label:getText()
@@ -47,12 +47,12 @@ function Label:getText()
 end
 
 function Label:getTextWidth(font, text, size)
-	local retVal = Polycore.Label_getTextWidth(self.__ptr, font.__ptr, text.__ptr, size)
+	local retVal = Polycore.Label_getTextWidth(self.__ptr, font.__ptr, text, size)
 	return retVal
 end
 
 function Label:getTextHeight(font, text, size)
-	local retVal = Polycore.Label_getTextHeight(self.__ptr, font.__ptr, text.__ptr, size)
+	local retVal = Polycore.Label_getTextHeight(self.__ptr, font.__ptr, text, size)
 	return retVal
 end
 

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

@@ -125,7 +125,7 @@ function Material:getShaderBinding(index)
 end
 
 function Material:loadMaterial(fileName)
-	local retVal = Polycore.Material_loadMaterial(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.Material_loadMaterial(self.__ptr, fileName)
 end
 
 

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

@@ -73,7 +73,7 @@ function MaterialManager:createTextureFromImage(image, clamp)
 end
 
 function MaterialManager:createTextureFromFile(fileName, clamp)
-	local retVal = Polycore.MaterialManager_createTextureFromFile(self.__ptr, fileName.__ptr, clamp)
+	local retVal = Polycore.MaterialManager_createTextureFromFile(self.__ptr, fileName, clamp)
 	if retVal == nil then return nil end
 	if Polycore.__ptr_lookup[retVal] ~= nil then
 		return Polycore.__ptr_lookup[retVal]
@@ -105,7 +105,7 @@ function MaterialManager:addShaderModule(module)
 end
 
 function MaterialManager:getTextureByResourcePath(resourcePath)
-	local retVal = Polycore.MaterialManager_getTextureByResourcePath(self.__ptr, resourcePath.__ptr)
+	local retVal = Polycore.MaterialManager_getTextureByResourcePath(self.__ptr, resourcePath)
 	if retVal == nil then return nil end
 	if Polycore.__ptr_lookup[retVal] ~= nil then
 		return Polycore.__ptr_lookup[retVal]

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

@@ -43,7 +43,7 @@ function Mesh:addPolygon(newPolygon)
 end
 
 function Mesh:loadMesh(fileName)
-	local retVal = Polycore.Mesh_loadMesh(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.Mesh_loadMesh(self.__ptr, fileName)
 end
 
 function Mesh:clearMesh()
@@ -51,7 +51,7 @@ function Mesh:clearMesh()
 end
 
 function Mesh:saveToFile(fileName)
-	local retVal = Polycore.Mesh_saveToFile(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.Mesh_saveToFile(self.__ptr, fileName)
 end
 
 function Mesh:loadFromFile(inFile)

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

@@ -7,7 +7,7 @@ class "OSBasics"
 
 
 function OSBasics:open(filename, opts)
-	local retVal = Polycore.OSBasics_open(filename.__ptr, opts.__ptr)
+	local retVal = Polycore.OSBasics_open(filename, opts)
 	if retVal == nil then return nil end
 	if Polycore.__ptr_lookup[retVal] ~= nil then
 		return Polycore.__ptr_lookup[retVal]
@@ -44,16 +44,16 @@ function OSBasics:tell(stream)
 end
 
 function OSBasics:isFolder(pathString)
-	local retVal = Polycore.OSBasics_isFolder(pathString.__ptr)
+	local retVal = Polycore.OSBasics_isFolder(pathString)
 	return retVal
 end
 
 function OSBasics:createFolder(pathString)
-	local retVal = Polycore.OSBasics_createFolder(pathString.__ptr)
+	local retVal = Polycore.OSBasics_createFolder(pathString)
 end
 
 function OSBasics:removeItem(pathString)
-	local retVal = Polycore.OSBasics_removeItem(pathString.__ptr)
+	local retVal = Polycore.OSBasics_removeItem(pathString)
 end
 
 

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

@@ -6,50 +6,15 @@ TYPE_FILE = 0
 TYPE_FOLDER = 1
 function OSFileEntry:__index__(name)
 	if name == "name" then
-		retVal = Polycore.OSFileEntry_get_name(self.__ptr)
-		if Polycore.__ptr_lookup[retVal] ~= nil then
-			return Polycore.__ptr_lookup[retVal]
-		else
-			Polycore.__ptr_lookup[retVal] = Polycode::String("__skip_ptr__")
-			Polycore.__ptr_lookup[retVal].__ptr = retVal
-			return Polycore.__ptr_lookup[retVal]
-		end
+		return Polycore.OSFileEntry_get_name(self.__ptr)
 	elseif name == "extension" then
-		retVal = Polycore.OSFileEntry_get_extension(self.__ptr)
-		if Polycore.__ptr_lookup[retVal] ~= nil then
-			return Polycore.__ptr_lookup[retVal]
-		else
-			Polycore.__ptr_lookup[retVal] = Polycode::String("__skip_ptr__")
-			Polycore.__ptr_lookup[retVal].__ptr = retVal
-			return Polycore.__ptr_lookup[retVal]
-		end
+		return Polycore.OSFileEntry_get_extension(self.__ptr)
 	elseif name == "nameWithoutExtension" then
-		retVal = Polycore.OSFileEntry_get_nameWithoutExtension(self.__ptr)
-		if Polycore.__ptr_lookup[retVal] ~= nil then
-			return Polycore.__ptr_lookup[retVal]
-		else
-			Polycore.__ptr_lookup[retVal] = Polycode::String("__skip_ptr__")
-			Polycore.__ptr_lookup[retVal].__ptr = retVal
-			return Polycore.__ptr_lookup[retVal]
-		end
+		return Polycore.OSFileEntry_get_nameWithoutExtension(self.__ptr)
 	elseif name == "basePath" then
-		retVal = Polycore.OSFileEntry_get_basePath(self.__ptr)
-		if Polycore.__ptr_lookup[retVal] ~= nil then
-			return Polycore.__ptr_lookup[retVal]
-		else
-			Polycore.__ptr_lookup[retVal] = Polycode::String("__skip_ptr__")
-			Polycore.__ptr_lookup[retVal].__ptr = retVal
-			return Polycore.__ptr_lookup[retVal]
-		end
+		return Polycore.OSFileEntry_get_basePath(self.__ptr)
 	elseif name == "fullPath" then
-		retVal = Polycore.OSFileEntry_get_fullPath(self.__ptr)
-		if Polycore.__ptr_lookup[retVal] ~= nil then
-			return Polycore.__ptr_lookup[retVal]
-		else
-			Polycore.__ptr_lookup[retVal] = Polycode::String("__skip_ptr__")
-			Polycore.__ptr_lookup[retVal].__ptr = retVal
-			return Polycore.__ptr_lookup[retVal]
-		end
+		return Polycore.OSFileEntry_get_fullPath(self.__ptr)
 	elseif name == "type" then
 		return Polycore.OSFileEntry_get_type(self.__ptr)
 	end
@@ -57,7 +22,22 @@ end
 
 
 function OSFileEntry:__set_callback(name,value)
-	if name == "type" then
+	if name == "name" then
+		Polycore.OSFileEntry_set_name(self.__ptr, value)
+		return true
+	elseif name == "extension" then
+		Polycore.OSFileEntry_set_extension(self.__ptr, value)
+		return true
+	elseif name == "nameWithoutExtension" then
+		Polycore.OSFileEntry_set_nameWithoutExtension(self.__ptr, value)
+		return true
+	elseif name == "basePath" then
+		Polycore.OSFileEntry_set_basePath(self.__ptr, value)
+		return true
+	elseif name == "fullPath" then
+		Polycore.OSFileEntry_set_fullPath(self.__ptr, value)
+		return true
+	elseif name == "type" then
 		Polycore.OSFileEntry_set_type(self.__ptr, value)
 		return true
 	end

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

@@ -69,7 +69,7 @@ function ObjectEntry:ObjectEntry(...)
 end
 
 function ObjectEntry:addChild(name)
-	local retVal = Polycore.ObjectEntry_addChild(self.__ptr, name.__ptr)
+	local retVal = Polycore.ObjectEntry_addChild(self.__ptr, name)
 	if retVal == nil then return nil end
 	if Polycore.__ptr_lookup[retVal] ~= nil then
 		return Polycore.__ptr_lookup[retVal]

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

@@ -160,11 +160,11 @@ function Quaternion:fromAxes(az, ay, ax)
 end
 
 function Quaternion:FromAngleAxis(rfAngle, rkAxis)
-	local retVal = Polycore.Quaternion_FromAngleAxis(self.__ptr, rfAngle.__ptr, rkAxis.__ptr)
+	local retVal = Polycore.Quaternion_FromAngleAxis(self.__ptr, rfAngle, rkAxis.__ptr)
 end
 
 function Quaternion:ToAngleAxis(rfAngle, rkAxis)
-	local retVal = Polycore.Quaternion_ToAngleAxis(self.__ptr, rfAngle.__ptr, rkAxis.__ptr)
+	local retVal = Polycore.Quaternion_ToAngleAxis(self.__ptr, rfAngle, rkAxis.__ptr)
 end
 
 function Quaternion:createFromAxisAngle(x, y, z, degrees)

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

@@ -44,11 +44,11 @@ function Resource:getResourceType()
 end
 
 function Resource:setResourceName(newName)
-	local retVal = Polycore.Resource_setResourceName(self.__ptr, newName.__ptr)
+	local retVal = Polycore.Resource_setResourceName(self.__ptr, newName)
 end
 
 function Resource:setResourcePath(path)
-	local retVal = Polycore.Resource_setResourcePath(self.__ptr, path.__ptr)
+	local retVal = Polycore.Resource_setResourcePath(self.__ptr, path)
 end
 
 function Resource:getResourcePath()

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

@@ -25,44 +25,44 @@ function ResourceManager:addResource(resource)
 end
 
 function ResourceManager:addDirResource(dirPath, recursive)
-	local retVal = Polycore.ResourceManager_addDirResource(self.__ptr, dirPath.__ptr, recursive)
+	local retVal = Polycore.ResourceManager_addDirResource(self.__ptr, dirPath, recursive)
 end
 
 function ResourceManager:addArchive(zipPath)
-	local retVal = Polycore.ResourceManager_addArchive(self.__ptr, zipPath.__ptr)
+	local retVal = Polycore.ResourceManager_addArchive(self.__ptr, zipPath)
 end
 
 function ResourceManager:readFile(fileName)
-	local retVal = Polycore.ResourceManager_readFile(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.ResourceManager_readFile(self.__ptr, fileName)
 	return retVal
 end
 
 function ResourceManager:parseTextures(dirPath, recursive)
-	local retVal = Polycore.ResourceManager_parseTextures(self.__ptr, dirPath.__ptr, recursive)
+	local retVal = Polycore.ResourceManager_parseTextures(self.__ptr, dirPath, recursive)
 end
 
 function ResourceManager:parseMaterials(dirPath, recursive)
-	local retVal = Polycore.ResourceManager_parseMaterials(self.__ptr, dirPath.__ptr, recursive)
+	local retVal = Polycore.ResourceManager_parseMaterials(self.__ptr, dirPath, recursive)
 end
 
 function ResourceManager:parseShaders(dirPath, recursive)
-	local retVal = Polycore.ResourceManager_parseShaders(self.__ptr, dirPath.__ptr, recursive)
+	local retVal = Polycore.ResourceManager_parseShaders(self.__ptr, dirPath, recursive)
 end
 
 function ResourceManager:parsePrograms(dirPath, recursive)
-	local retVal = Polycore.ResourceManager_parsePrograms(self.__ptr, dirPath.__ptr, recursive)
+	local retVal = Polycore.ResourceManager_parsePrograms(self.__ptr, dirPath, recursive)
 end
 
 function ResourceManager:parseCubemaps(dirPath, recursive)
-	local retVal = Polycore.ResourceManager_parseCubemaps(self.__ptr, dirPath.__ptr, recursive)
+	local retVal = Polycore.ResourceManager_parseCubemaps(self.__ptr, dirPath, recursive)
 end
 
 function ResourceManager:parseOthers(dirPath, recursive)
-	local retVal = Polycore.ResourceManager_parseOthers(self.__ptr, dirPath.__ptr, recursive)
+	local retVal = Polycore.ResourceManager_parseOthers(self.__ptr, dirPath, recursive)
 end
 
 function ResourceManager:getResource(resourceType, resourceName)
-	local retVal = Polycore.ResourceManager_getResource(self.__ptr, resourceType, resourceName.__ptr)
+	local retVal = Polycore.ResourceManager_getResource(self.__ptr, resourceType, resourceName)
 	if retVal == nil then return nil end
 	if Polycore.__ptr_lookup[retVal] ~= nil then
 		return Polycore.__ptr_lookup[retVal]

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

@@ -174,7 +174,7 @@ function Scene:readString(inFile)
 end
 
 function Scene:loadScene(fileName)
-	local retVal = Polycore.Scene_loadScene(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.Scene_loadScene(self.__ptr, fileName)
 end
 
 function Scene:generateLightmaps(lightMapRes, lightMapQuality, numRadPasses)
@@ -206,11 +206,11 @@ function Scene:writeEntityMatrix(entity, outFile)
 end
 
 function Scene:writeString(str, outFile)
-	local retVal = Polycore.Scene_writeString(self.__ptr, str.__ptr, outFile.__ptr)
+	local retVal = Polycore.Scene_writeString(self.__ptr, str, outFile.__ptr)
 end
 
 function Scene:saveScene(fileName)
-	local retVal = Polycore.Scene_saveScene(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.Scene_saveScene(self.__ptr, fileName)
 end
 
 function Scene:getNumStaticGeometry()
@@ -252,7 +252,7 @@ function Scene:getLight(index)
 end
 
 function Scene:getCustomEntityByType(type)
-	local retVal = Polycore.Scene_getCustomEntityByType(self.__ptr, type.__ptr)
+	local retVal = Polycore.Scene_getCustomEntityByType(self.__ptr, type)
 	if retVal == nil then return nil end
 	if Polycore.__ptr_lookup[retVal] ~= nil then
 		return Polycore.__ptr_lookup[retVal]

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

@@ -34,7 +34,7 @@ function SceneLabel:testMouseCollision(x, y)
 end
 
 function SceneLabel:setText(newText)
-	local retVal = Polycore.SceneLabel_setText(self.__ptr, newText.__ptr)
+	local retVal = Polycore.SceneLabel_setText(self.__ptr, newText)
 end
 
 function SceneLabel:getLabel()

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

@@ -102,11 +102,11 @@ function SceneMesh:getMaterial()
 end
 
 function SceneMesh:loadTexture(fileName, clamp)
-	local retVal = Polycore.SceneMesh_loadTexture(self.__ptr, fileName.__ptr, clamp)
+	local retVal = Polycore.SceneMesh_loadTexture(self.__ptr, fileName, clamp)
 end
 
 function SceneMesh:loadSkeleton(fileName)
-	local retVal = Polycore.SceneMesh_loadSkeleton(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.SceneMesh_loadSkeleton(self.__ptr, fileName)
 end
 
 function SceneMesh:setTexture(texture)
@@ -118,7 +118,7 @@ function SceneMesh:setMaterial(material)
 end
 
 function SceneMesh:setMaterialByName(materialName)
-	local retVal = Polycore.SceneMesh_setMaterialByName(self.__ptr, materialName.__ptr)
+	local retVal = Polycore.SceneMesh_setMaterialByName(self.__ptr, materialName)
 end
 
 function SceneMesh:setMesh(mesh)

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

@@ -113,7 +113,7 @@ function Screen:setNormalizedCoordinates(newVal, yCoordinateSize)
 end
 
 function Screen:setScreenShader(shaderName)
-	local retVal = Polycore.Screen_setScreenShader(self.__ptr, shaderName.__ptr)
+	local retVal = Polycore.Screen_setScreenShader(self.__ptr, shaderName)
 end
 
 function Screen:clearScreenShader()

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

@@ -33,7 +33,7 @@ function ScreenLabel:addDropShadow(color, size, offsetX, offsetY)
 end
 
 function ScreenLabel:setText(newText)
-	local retVal = Polycore.ScreenLabel_setText(self.__ptr, newText.__ptr)
+	local retVal = Polycore.ScreenLabel_setText(self.__ptr, newText)
 end
 
 function ScreenLabel:getText()

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

@@ -57,7 +57,7 @@ function ScreenMesh:getTexture()
 end
 
 function ScreenMesh:loadTexture(fileName)
-	local retVal = Polycore.ScreenMesh_loadTexture(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.ScreenMesh_loadTexture(self.__ptr, fileName)
 end
 
 function ScreenMesh:setTexture(texture)

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

@@ -29,11 +29,11 @@ function ScreenSprite:ScreenSprite(...)
 end
 
 function ScreenSprite:addAnimation(name, frames, speed)
-	local retVal = Polycore.ScreenSprite_addAnimation(self.__ptr, name.__ptr, frames.__ptr, speed)
+	local retVal = Polycore.ScreenSprite_addAnimation(self.__ptr, name, frames, speed)
 end
 
 function ScreenSprite:playAnimation(name, startFrame, once)
-	local retVal = Polycore.ScreenSprite_playAnimation(self.__ptr, name.__ptr, startFrame, once)
+	local retVal = Polycore.ScreenSprite_playAnimation(self.__ptr, name, startFrame, once)
 end
 
 function ScreenSprite:Update()

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

@@ -33,7 +33,7 @@ function Shader:getType()
 end
 
 function Shader:setName(name)
-	local retVal = Polycore.Shader_setName(self.__ptr, name.__ptr)
+	local retVal = Polycore.Shader_setName(self.__ptr, name)
 end
 
 function Shader:getName()

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

@@ -21,19 +21,19 @@ function ShaderBinding:ShaderBinding(...)
 end
 
 function ShaderBinding:clearTexture(name)
-	local retVal = Polycore.ShaderBinding_clearTexture(self.__ptr, name.__ptr)
+	local retVal = Polycore.ShaderBinding_clearTexture(self.__ptr, name)
 end
 
 function ShaderBinding:addTexture(name, texture)
-	local retVal = Polycore.ShaderBinding_addTexture(self.__ptr, name.__ptr, texture.__ptr)
+	local retVal = Polycore.ShaderBinding_addTexture(self.__ptr, name, texture.__ptr)
 end
 
 function ShaderBinding:addParam(type, name, value)
-	local retVal = Polycore.ShaderBinding_addParam(self.__ptr, type.__ptr, name.__ptr, value.__ptr)
+	local retVal = Polycore.ShaderBinding_addParam(self.__ptr, type, name, value)
 end
 
 function ShaderBinding:addCubemap(name, cubemap)
-	local retVal = Polycore.ShaderBinding_addCubemap(self.__ptr, name.__ptr, cubemap.__ptr)
+	local retVal = Polycore.ShaderBinding_addCubemap(self.__ptr, name, cubemap.__ptr)
 end
 
 function ShaderBinding:getNumLocalParams()
@@ -54,7 +54,7 @@ function ShaderBinding:getLocalParam(index)
 end
 
 function ShaderBinding:getLocalParamByName(name)
-	local retVal = Polycore.ShaderBinding_getLocalParamByName(self.__ptr, name.__ptr)
+	local retVal = Polycore.ShaderBinding_getLocalParamByName(self.__ptr, name)
 	if retVal == nil then return nil end
 	if Polycore.__ptr_lookup[retVal] ~= nil then
 		return Polycore.__ptr_lookup[retVal]
@@ -121,7 +121,7 @@ function ShaderBinding:getOutTargetBinding(index)
 end
 
 function ShaderBinding:addLocalParam(name, ptr)
-	local retVal = Polycore.ShaderBinding_addLocalParam(self.__ptr, name.__ptr, ptr.__ptr)
+	local retVal = Polycore.ShaderBinding_addLocalParam(self.__ptr, name, ptr.__ptr)
 end
 
 

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

@@ -29,11 +29,11 @@ function Skeleton:Skeleton(...)
 end
 
 function Skeleton:loadSkeleton(fileName)
-	local retVal = Polycore.Skeleton_loadSkeleton(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.Skeleton_loadSkeleton(self.__ptr, fileName)
 end
 
 function Skeleton:playAnimation(animName, once)
-	local retVal = Polycore.Skeleton_playAnimation(self.__ptr, animName.__ptr, once)
+	local retVal = Polycore.Skeleton_playAnimation(self.__ptr, animName, once)
 end
 
 function Skeleton:playAnimationByIndex(index, once)
@@ -41,11 +41,11 @@ function Skeleton:playAnimationByIndex(index, once)
 end
 
 function Skeleton:addAnimation(name, fileName)
-	local retVal = Polycore.Skeleton_addAnimation(self.__ptr, name.__ptr, fileName.__ptr)
+	local retVal = Polycore.Skeleton_addAnimation(self.__ptr, name, fileName)
 end
 
 function Skeleton:getAnimation(name)
-	local retVal = Polycore.Skeleton_getAnimation(self.__ptr, name.__ptr)
+	local retVal = Polycore.Skeleton_getAnimation(self.__ptr, name)
 	if retVal == nil then return nil end
 	if Polycore.__ptr_lookup[retVal] ~= nil then
 		return Polycore.__ptr_lookup[retVal]
@@ -61,7 +61,7 @@ function Skeleton:Update()
 end
 
 function Skeleton:getBoneByName(name)
-	local retVal = Polycore.Skeleton_getBoneByName(self.__ptr, name.__ptr)
+	local retVal = Polycore.Skeleton_getBoneByName(self.__ptr, name)
 	if retVal == nil then return nil end
 	if Polycore.__ptr_lookup[retVal] ~= nil then
 		return Polycore.__ptr_lookup[retVal]
@@ -77,7 +77,7 @@ function Skeleton:bonesVisible(val)
 end
 
 function Skeleton:enableBoneLabels(labelFont, size, scale, labelColor)
-	local retVal = Polycore.Skeleton_enableBoneLabels(self.__ptr, labelFont.__ptr, size, scale, labelColor.__ptr)
+	local retVal = Polycore.Skeleton_enableBoneLabels(self.__ptr, labelFont, size, scale, labelColor.__ptr)
 end
 
 function Skeleton:getNumBones()

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

@@ -57,7 +57,7 @@ function Sound:setPositionalProperties(referenceDistance, maxDistance)
 end
 
 function Sound:loadWAV(fileName)
-	local retVal = Polycore.Sound_loadWAV(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.Sound_loadWAV(self.__ptr, fileName)
 	if retVal == nil then return nil end
 	if Polycore.__ptr_lookup[retVal] ~= nil then
 		return Polycore.__ptr_lookup[retVal]
@@ -69,7 +69,7 @@ function Sound:loadWAV(fileName)
 end
 
 function Sound:loadOGG(fileName)
-	local retVal = Polycore.Sound_loadOGG(self.__ptr, fileName.__ptr)
+	local retVal = Polycore.Sound_loadOGG(self.__ptr, fileName)
 	if retVal == nil then return nil end
 	if Polycore.__ptr_lookup[retVal] ~= nil then
 		return Polycore.__ptr_lookup[retVal]
@@ -93,15 +93,15 @@ function Sound:GenSource(buffer)
 end
 
 function Sound:checkALError(operation)
-	local retVal = Polycore.Sound_checkALError(self.__ptr, operation.__ptr)
+	local retVal = Polycore.Sound_checkALError(self.__ptr, operation)
 end
 
 function Sound:soundError(err)
-	local retVal = Polycore.Sound_soundError(self.__ptr, err.__ptr)
+	local retVal = Polycore.Sound_soundError(self.__ptr, err)
 end
 
 function Sound:soundCheck(result, err)
-	local retVal = Polycore.Sound_soundCheck(self.__ptr, result, err.__ptr)
+	local retVal = Polycore.Sound_soundCheck(self.__ptr, result, err)
 end
 
 

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

@@ -9,7 +9,7 @@ function String:__index__(name)
 		if Polycore.__ptr_lookup[retVal] ~= nil then
 			return Polycore.__ptr_lookup[retVal]
 		else
-			Polycore.__ptr_lookup[retVal] = std::string("__skip_ptr__")
+			Polycore.__ptr_lookup[retVal] = string("__skip_ptr__")
 			Polycore.__ptr_lookup[retVal].__ptr = retVal
 			return Polycore.__ptr_lookup[retVal]
 		end
@@ -52,17 +52,17 @@ function String:substr(pos, n)
 end
 
 function String:rfind(str, pos)
-	local retVal = Polycore.String_rfind(self.__ptr, str.__ptr, pos.__ptr)
+	local retVal = Polycore.String_rfind(self.__ptr, str, pos.__ptr)
 	return retVal
 end
 
 function String:find(str, pos)
-	local retVal = Polycore.String_find(self.__ptr, str.__ptr, pos.__ptr)
+	local retVal = Polycore.String_find(self.__ptr, str, pos.__ptr)
 	return retVal
 end
 
 function String:find_last_of(str, pos)
-	local retVal = Polycore.String_find_last_of(self.__ptr, str.__ptr, pos.__ptr)
+	local retVal = Polycore.String_find_last_of(self.__ptr, str, pos.__ptr)
 	return retVal
 end
 
@@ -77,7 +77,7 @@ function String:toUpperCase()
 end
 
 function String:replace(what, withWhat)
-	local retVal = Polycore.String_replace(self.__ptr, what.__ptr, withWhat.__ptr)
+	local retVal = Polycore.String_replace(self.__ptr, what, withWhat)
 	return retVal
 end
 

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

@@ -57,7 +57,7 @@ function Texture:updateScroll(elapsed)
 end
 
 function Texture:setResourcePath(newPath)
-	local retVal = Polycore.Texture_setResourcePath(self.__ptr, newPath.__ptr)
+	local retVal = Polycore.Texture_setResourcePath(self.__ptr, newPath)
 end
 
 function Texture:getResourcePath()

Bindings/Contents/LUA/Source/PolycodeLUA.cpp

@@ -16,6 +16,11 @@ int luaopen_Polycode(lua_State *L) {
 		{"OSFileEntry_get_basePath", Polycore_OSFileEntry_get_basePath},
 		{"OSFileEntry_get_fullPath", Polycore_OSFileEntry_get_fullPath},
 		{"OSFileEntry_get_type", Polycore_OSFileEntry_get_type},
+		{"OSFileEntry_set_name", Polycore_OSFileEntry_set_name},
+		{"OSFileEntry_set_extension", Polycore_OSFileEntry_set_extension},
+		{"OSFileEntry_set_nameWithoutExtension", Polycore_OSFileEntry_set_nameWithoutExtension},
+		{"OSFileEntry_set_basePath", Polycore_OSFileEntry_set_basePath},
+		{"OSFileEntry_set_fullPath", Polycore_OSFileEntry_set_fullPath},
 		{"OSFileEntry_set_type", Polycore_OSFileEntry_set_type},
 		{"OSFileEntry", Polycore_OSFileEntry},
 		{"delete_OSFileEntry", Polycore_delete_OSFileEntry},

Bindings/Scripts/create_lua_library/create_lua_library.py

@@ -93,6 +93,8 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 
 				pps = []
 				for pp in c["properties"]["public"]:
+					pp["type"] = pp["type"].replace("Polycode::", "")
+					pp["type"] = pp["type"].replace("std::", "")
 					if pp["type"].find("static ") != -1:
 						if "defaltValue" in pp:
 							lout += "%s = %s\n" % (pp["name"], pp["defaltValue"])
@@ -114,6 +116,8 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 				if len(pps) > 0:
 					lout += "function %s:__index__(name)\n" % ckey
 					for pp in pps:
+						pp["type"] = pp["type"].replace("Polycode::", "")
+						pp["type"] = pp["type"].replace("std::", "")
 						if pidx == 0:
 							lout += "\tif name == \"%s\" then\n" % (pp["name"])
 						else:
@@ -169,6 +173,8 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 				if len(pps) > 0:
 					lout += "function %s:__set_callback(name,value)\n" % ckey
 					for pp in pps:
+						pp["type"] = pp["type"].replace("Polycode::", "")
+						pp["type"] = pp["type"].replace("std::", "")
 						if pp["type"] == "Number" or  pp["type"] == "String" or pp["type"] == "int" or pp["type"] == "bool":
 							if pidx == 0:
 								lout += "\tif name == \"%s\" then\n" % (pp["name"])
@@ -233,6 +239,13 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 								continue
 							if param["type"] == "0":
 								continue
+							param["type"] = param["type"].replace("Polycode::", "")
+							param["type"] = param["type"].replace("std::", "")
+							param["type"] = param["type"].replace("const", "")
+							param["type"] = param["type"].replace("&", "")
+							param["type"] = param["type"].replace(" ", "")
+							param["type"] = param["type"].replace("long", "long ")
+							param["type"] = param["type"].replace("unsigned", "unsigned ")
 
 							param["name"] = param["name"].replace("end", "_end").replace("repeat", "_repeat")
 							if"type" in param:

Modules/Bindings/2DPhysics/Include/Physics2DLUAWrappers.h

@@ -35,7 +35,7 @@ static int Physics2D_PhysicsScreen_addPhysicsChild(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * newEntity = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* newEntity = (ScreenEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
 	int entType = lua_tointeger(L, 3);
 	luaL_checktype(L, 4, LUA_TBOOLEAN);
@@ -83,7 +83,7 @@ static int Physics2D_PhysicsScreen_removePhysicsChild(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	PhysicsScreenEntity * entityToRemove = (PhysicsScreenEntity *)lua_topointer(L, 2);
+	PhysicsScreenEntity* entityToRemove = (PhysicsScreenEntity*)lua_topointer(L, 2);
 	inst->removePhysicsChild(entityToRemove);
 	return 0;
 }
@@ -92,7 +92,7 @@ static int Physics2D_PhysicsScreen_addCollisionChild(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * newEntity = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* newEntity = (ScreenEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
 	int entType = lua_tointeger(L, 3);
 	void *ptrRetVal = (void*)inst->addCollisionChild(newEntity, entType);
@@ -108,7 +108,7 @@ static int Physics2D_PhysicsScreen_destroyJoint(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	PhysicsJoint * joint = (PhysicsJoint *)lua_topointer(L, 2);
+	PhysicsJoint* joint = (PhysicsJoint*)lua_topointer(L, 2);
 	inst->destroyJoint(joint);
 	return 0;
 }
@@ -117,9 +117,9 @@ static int Physics2D_PhysicsScreen_createDistanceJoint(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent1 = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* ent1 = (ScreenEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent2 = (ScreenEntity *)lua_topointer(L, 3);
+	ScreenEntity* ent2 = (ScreenEntity*)lua_topointer(L, 3);
 	luaL_checktype(L, 4, LUA_TBOOLEAN);
 	bool collideConnected = lua_toboolean(L, 4);
 	void *ptrRetVal = (void*)inst->createDistanceJoint(ent1, ent2, collideConnected);
@@ -135,9 +135,9 @@ static int Physics2D_PhysicsScreen_createPrismaticJoint(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent1 = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* ent1 = (ScreenEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent2 = (ScreenEntity *)lua_topointer(L, 3);
+	ScreenEntity* ent2 = (ScreenEntity*)lua_topointer(L, 3);
 	luaL_checktype(L, 4, LUA_TLIGHTUSERDATA);
 	Vector2 worldAxis = *(Vector2*)lua_topointer(L, 4);
 	luaL_checktype(L, 5, LUA_TNUMBER);
@@ -199,9 +199,9 @@ static int Physics2D_PhysicsScreen_createRevoluteJoint(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent1 = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* ent1 = (ScreenEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent2 = (ScreenEntity *)lua_topointer(L, 3);
+	ScreenEntity* ent2 = (ScreenEntity*)lua_topointer(L, 3);
 	luaL_checktype(L, 4, LUA_TNUMBER);
 	Number ax = lua_tonumber(L, 4);
 	luaL_checktype(L, 5, LUA_TNUMBER);
@@ -261,7 +261,7 @@ static int Physics2D_PhysicsScreen_applyForce(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* ent = (ScreenEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
 	Number fx = lua_tonumber(L, 3);
 	luaL_checktype(L, 4, LUA_TNUMBER);
@@ -274,7 +274,7 @@ static int Physics2D_PhysicsScreen_applyImpulse(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* ent = (ScreenEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
 	Number fx = lua_tonumber(L, 3);
 	luaL_checktype(L, 4, LUA_TNUMBER);
@@ -296,7 +296,7 @@ static int Physics2D_PhysicsScreen_setTransform(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* ent = (ScreenEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TLIGHTUSERDATA);
 	Vector2 pos = *(Vector2*)lua_topointer(L, 3);
 	luaL_checktype(L, 4, LUA_TNUMBER);
@@ -309,7 +309,7 @@ static int Physics2D_PhysicsScreen_getPhysicsEntityByShape(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	b2Shape * shape = (b2Shape *)lua_topointer(L, 2);
+	b2Shape* shape = (b2Shape*)lua_topointer(L, 2);
 	void *ptrRetVal = (void*)inst->getPhysicsEntityByShape(shape);
 	if(ptrRetVal == NULL) {
 		lua_pushnil(L);
@@ -323,7 +323,7 @@ static int Physics2D_PhysicsScreen_getPhysicsEntityByFixture(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	b2Fixture * fixture = (b2Fixture *)lua_topointer(L, 2);
+	b2Fixture* fixture = (b2Fixture*)lua_topointer(L, 2);
 	void *ptrRetVal = (void*)inst->getPhysicsEntityByFixture(fixture);
 	if(ptrRetVal == NULL) {
 		lua_pushnil(L);
@@ -337,7 +337,7 @@ static int Physics2D_PhysicsScreen_setVelocity(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* ent = (ScreenEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
 	Number fx = lua_tonumber(L, 3);
 	luaL_checktype(L, 4, LUA_TNUMBER);
@@ -350,7 +350,7 @@ static int Physics2D_PhysicsScreen_setVelocityX(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* ent = (ScreenEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
 	Number fx = lua_tonumber(L, 3);
 	inst->setVelocityX(ent, fx);
@@ -361,7 +361,7 @@ static int Physics2D_PhysicsScreen_setVelocityY(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* ent = (ScreenEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
 	Number fy = lua_tonumber(L, 3);
 	inst->setVelocityY(ent, fy);
@@ -372,7 +372,7 @@ static int Physics2D_PhysicsScreen_setSpin(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* ent = (ScreenEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
 	Number spin = lua_tonumber(L, 3);
 	inst->setSpin(ent, spin);
@@ -383,7 +383,7 @@ static int Physics2D_PhysicsScreen_getVelocity(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* ent = (ScreenEntity*)lua_topointer(L, 2);
 	Vector2 *retInst = new Vector2();
 	*retInst = inst->getVelocity(ent);
 	lua_pushlightuserdata(L, retInst);
@@ -394,7 +394,7 @@ static int Physics2D_PhysicsScreen_BeginContact(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	b2Contact * contact = (b2Contact *)lua_topointer(L, 2);
+	b2Contact* contact = (b2Contact*)lua_topointer(L, 2);
 	inst->BeginContact(contact);
 	return 0;
 }
@@ -403,7 +403,7 @@ static int Physics2D_PhysicsScreen_EndContact(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	b2Contact * contact = (b2Contact *)lua_topointer(L, 2);
+	b2Contact* contact = (b2Contact*)lua_topointer(L, 2);
 	inst->EndContact(contact);
 	return 0;
 }
@@ -412,9 +412,9 @@ static int Physics2D_PhysicsScreen_PostSolve(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	b2Contact * contact = (b2Contact *)lua_topointer(L, 2);
+	b2Contact* contact = (b2Contact*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TLIGHTUSERDATA);
-	const b2ContactImpulse * impulse = (const b2ContactImpulse *)lua_topointer(L, 3);
+	b2ContactImpulse* impulse = (b2ContactImpulse*)lua_topointer(L, 3);
 	inst->PostSolve(contact, impulse);
 	return 0;
 }
@@ -423,7 +423,7 @@ static int Physics2D_PhysicsScreen_wakeUp(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* ent = (ScreenEntity*)lua_topointer(L, 2);
 	inst->wakeUp(ent);
 	return 0;
 }
@@ -448,7 +448,7 @@ static int Physics2D_PhysicsScreen_testEntityAtPosition(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* ent = (ScreenEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
 	Number x = lua_tonumber(L, 3);
 	luaL_checktype(L, 4, LUA_TNUMBER);
@@ -468,7 +468,7 @@ static int Physics2D_PhysicsScreen_getPhysicsByScreenEntity(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	ScreenEntity * ent = (ScreenEntity *)lua_topointer(L, 2);
+	ScreenEntity* ent = (ScreenEntity*)lua_topointer(L, 2);
 	void *ptrRetVal = (void*)inst->getPhysicsByScreenEntity(ent);
 	if(ptrRetVal == NULL) {
 		lua_pushnil(L);
@@ -482,7 +482,7 @@ static int Physics2D_PhysicsScreen_destroyMouseJoint(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScreen *inst = (PhysicsScreen*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	b2MouseJoint * mJoint = (b2MouseJoint *)lua_topointer(L, 2);
+	b2MouseJoint* mJoint = (b2MouseJoint*)lua_topointer(L, 2);
 	inst->destroyMouseJoint(mJoint);
 	return 0;
 }
@@ -612,9 +612,9 @@ static int Physics2D_PhysicsScreenEntity_set_collisionOnly(lua_State *L) {
 
 static int Physics2D_PhysicsScreenEntity(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-	ScreenEntity * entity = (ScreenEntity *)lua_topointer(L, 1);
+	ScreenEntity* entity = (ScreenEntity*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	b2World * world = (b2World *)lua_topointer(L, 2);
+	b2World* world = (b2World*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
 	Number worldScale = lua_tonumber(L, 3);
 	luaL_checktype(L, 4, LUA_TNUMBER);

Modules/Bindings/3DPhysics/Include/Physics3DLUAWrappers.h

@@ -40,7 +40,7 @@ static int Physics3D_CollisionScene_getCollisionEntityByObject(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	CollisionScene *inst = (CollisionScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	btCollisionObject * collisionObject = (btCollisionObject *)lua_topointer(L, 2);
+	btCollisionObject* collisionObject = (btCollisionObject*)lua_topointer(L, 2);
 	void *ptrRetVal = (void*)inst->getCollisionEntityByObject(collisionObject);
 	if(ptrRetVal == NULL) {
 		lua_pushnil(L);
@@ -54,9 +54,9 @@ static int Physics3D_CollisionScene_getFirstEntityInRay(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	CollisionScene *inst = (CollisionScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	const Vector3 & origin = *( Vector3 *)lua_topointer(L, 2);
+	Vector3 origin = *(Vector3*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TLIGHTUSERDATA);
-	const Vector3 & dest = *( Vector3 *)lua_topointer(L, 3);
+	Vector3 dest = *(Vector3*)lua_topointer(L, 3);
 	RayTestResult *retInst = new RayTestResult();
 	*retInst = inst->getFirstEntityInRay(origin, dest);
 	lua_pushlightuserdata(L, retInst);
@@ -67,7 +67,7 @@ static int Physics3D_CollisionScene_enableCollision(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	CollisionScene *inst = (CollisionScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	SceneEntity * entity = (SceneEntity *)lua_topointer(L, 2);
+	SceneEntity* entity = (SceneEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TBOOLEAN);
 	bool val = lua_toboolean(L, 3);
 	inst->enableCollision(entity, val);
@@ -78,7 +78,7 @@ static int Physics3D_CollisionScene_getCollisionByScreenEntity(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	CollisionScene *inst = (CollisionScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	SceneEntity * ent = (SceneEntity *)lua_topointer(L, 2);
+	SceneEntity* ent = (SceneEntity*)lua_topointer(L, 2);
 	void *ptrRetVal = (void*)inst->getCollisionByScreenEntity(ent);
 	if(ptrRetVal == NULL) {
 		lua_pushnil(L);
@@ -92,9 +92,9 @@ static int Physics3D_CollisionScene_testCollision(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	CollisionScene *inst = (CollisionScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	SceneEntity * ent1 = (SceneEntity *)lua_topointer(L, 2);
+	SceneEntity* ent1 = (SceneEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TLIGHTUSERDATA);
-	SceneEntity * ent2 = (SceneEntity *)lua_topointer(L, 3);
+	SceneEntity* ent2 = (SceneEntity*)lua_topointer(L, 3);
 	CollisionResult *retInst = new CollisionResult();
 	*retInst = inst->testCollision(ent1, ent2);
 	lua_pushlightuserdata(L, retInst);
@@ -105,9 +105,9 @@ static int Physics3D_CollisionScene_testCollisionOnCollisionChild(lua_State *L)
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	CollisionScene *inst = (CollisionScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	CollisionSceneEntity * cEnt1 = (CollisionSceneEntity *)lua_topointer(L, 2);
+	CollisionSceneEntity* cEnt1 = (CollisionSceneEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TLIGHTUSERDATA);
-	CollisionSceneEntity * cEnt2 = (CollisionSceneEntity *)lua_topointer(L, 3);
+	CollisionSceneEntity* cEnt2 = (CollisionSceneEntity*)lua_topointer(L, 3);
 	CollisionResult *retInst = new CollisionResult();
 	*retInst = inst->testCollisionOnCollisionChild(cEnt1, cEnt2);
 	lua_pushlightuserdata(L, retInst);
@@ -118,9 +118,9 @@ static int Physics3D_CollisionScene_testCollisionOnCollisionChild_Convex(lua_Sta
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	CollisionScene *inst = (CollisionScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	CollisionSceneEntity * cEnt1 = (CollisionSceneEntity *)lua_topointer(L, 2);
+	CollisionSceneEntity* cEnt1 = (CollisionSceneEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TLIGHTUSERDATA);
-	CollisionSceneEntity * cEnt2 = (CollisionSceneEntity *)lua_topointer(L, 3);
+	CollisionSceneEntity* cEnt2 = (CollisionSceneEntity*)lua_topointer(L, 3);
 	CollisionResult *retInst = new CollisionResult();
 	*retInst = inst->testCollisionOnCollisionChild_Convex(cEnt1, cEnt2);
 	lua_pushlightuserdata(L, retInst);
@@ -131,7 +131,7 @@ static int Physics3D_CollisionScene_stopTrackingCollision(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	CollisionScene *inst = (CollisionScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	SceneEntity * entity = (SceneEntity *)lua_topointer(L, 2);
+	SceneEntity* entity = (SceneEntity*)lua_topointer(L, 2);
 	inst->stopTrackingCollision(entity);
 	return 0;
 }
@@ -140,7 +140,7 @@ static int Physics3D_CollisionScene_addCollisionChild(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	CollisionScene *inst = (CollisionScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	SceneEntity * newEntity = (SceneEntity *)lua_topointer(L, 2);
+	SceneEntity* newEntity = (SceneEntity*)lua_topointer(L, 2);
 	int type;
 	if(lua_isnumber(L, 3)) {
 		type = lua_tointeger(L, 3);
@@ -166,7 +166,7 @@ static int Physics3D_CollisionScene_trackCollision(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	CollisionScene *inst = (CollisionScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	SceneEntity * newEntity = (SceneEntity *)lua_topointer(L, 2);
+	SceneEntity* newEntity = (SceneEntity*)lua_topointer(L, 2);
 	int type;
 	if(lua_isnumber(L, 3)) {
 		type = lua_tointeger(L, 3);
@@ -192,7 +192,7 @@ static int Physics3D_CollisionScene_removeCollision(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	CollisionScene *inst = (CollisionScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	SceneEntity * entity = (SceneEntity *)lua_topointer(L, 2);
+	SceneEntity* entity = (SceneEntity*)lua_topointer(L, 2);
 	inst->removeCollision(entity);
 	return 0;
 }
@@ -201,7 +201,7 @@ static int Physics3D_CollisionScene_adjustForCollision(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	CollisionScene *inst = (CollisionScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	CollisionSceneEntity * collisionEntity = (CollisionSceneEntity *)lua_topointer(L, 2);
+	CollisionSceneEntity* collisionEntity = (CollisionSceneEntity*)lua_topointer(L, 2);
 	inst->adjustForCollision(collisionEntity);
 	return 0;
 }
@@ -237,7 +237,7 @@ static int Physics3D_CollisionSceneEntity_set_enabled(lua_State *L) {
 
 static int Physics3D_CollisionSceneEntity(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-	SceneEntity * entity = (SceneEntity *)lua_topointer(L, 1);
+	SceneEntity* entity = (SceneEntity*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TNUMBER);
 	int type = lua_tointeger(L, 2);
 	CollisionSceneEntity *inst = new CollisionSceneEntity(entity, type);
@@ -287,7 +287,7 @@ static int Physics3D_CollisionSceneEntity_createCollisionShape(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	SceneEntity * entity = (SceneEntity *)lua_topointer(L, 2);
+	SceneEntity* entity = (SceneEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
 	int type = lua_tointeger(L, 3);
 	void *ptrRetVal = (void*)inst->createCollisionShape(entity, type);
@@ -323,7 +323,7 @@ static int Physics3D_PhysicsScene_removePhysicsChild(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScene *inst = (PhysicsScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	SceneEntity * entity = (SceneEntity *)lua_topointer(L, 2);
+	SceneEntity* entity = (SceneEntity*)lua_topointer(L, 2);
 	inst->removePhysicsChild(entity);
 	return 0;
 }
@@ -332,7 +332,7 @@ static int Physics3D_PhysicsScene_getPhysicsEntityBySceneEntity(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScene *inst = (PhysicsScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	SceneEntity * entity = (SceneEntity *)lua_topointer(L, 2);
+	SceneEntity* entity = (SceneEntity*)lua_topointer(L, 2);
 	void *ptrRetVal = (void*)inst->getPhysicsEntityBySceneEntity(entity);
 	if(ptrRetVal == NULL) {
 		lua_pushnil(L);
@@ -346,7 +346,7 @@ static int Physics3D_PhysicsScene_addPhysicsChild(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScene *inst = (PhysicsScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	SceneEntity * newEntity = (SceneEntity *)lua_topointer(L, 2);
+	SceneEntity* newEntity = (SceneEntity*)lua_topointer(L, 2);
 	int type;
 	if(lua_isnumber(L, 3)) {
 		type = lua_tointeger(L, 3);
@@ -390,7 +390,7 @@ static int Physics3D_PhysicsScene_trackPhysicsChild(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScene *inst = (PhysicsScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	SceneEntity * newEntity = (SceneEntity *)lua_topointer(L, 2);
+	SceneEntity* newEntity = (SceneEntity*)lua_topointer(L, 2);
 	int type;
 	if(lua_isnumber(L, 3)) {
 		type = lua_tointeger(L, 3);
@@ -434,7 +434,7 @@ static int Physics3D_PhysicsScene_addCharacterChild(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScene *inst = (PhysicsScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	SceneEntity * newEntity = (SceneEntity *)lua_topointer(L, 2);
+	SceneEntity* newEntity = (SceneEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
 	Number mass = lua_tonumber(L, 3);
 	luaL_checktype(L, 4, LUA_TNUMBER);
@@ -460,7 +460,7 @@ static int Physics3D_PhysicsScene_removeCharacterChild(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScene *inst = (PhysicsScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	PhysicsCharacter * character = (PhysicsCharacter *)lua_topointer(L, 2);
+	PhysicsCharacter* character = (PhysicsCharacter*)lua_topointer(L, 2);
 	inst->removeCharacterChild(character);
 	return 0;
 }
@@ -469,7 +469,7 @@ static int Physics3D_PhysicsScene_addVehicleChild(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsScene *inst = (PhysicsScene*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	SceneEntity * newEntity = (SceneEntity *)lua_topointer(L, 2);
+	SceneEntity* newEntity = (SceneEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
 	Number mass = lua_tonumber(L, 3);
 	luaL_checktype(L, 4, LUA_TNUMBER);
@@ -513,7 +513,7 @@ static int Physics3D_PhysicsSceneEntity_set_enabled(lua_State *L) {
 
 static int Physics3D_PhysicsSceneEntity(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-	SceneEntity * entity = (SceneEntity *)lua_topointer(L, 1);
+	SceneEntity* entity = (SceneEntity*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TNUMBER);
 	int type = lua_tointeger(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
@@ -578,13 +578,13 @@ static int Physics3D_PhysicsVehicle_get_tuning(lua_State *L) {
 
 static int Physics3D_PhysicsVehicle(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-	SceneEntity * entity = (SceneEntity *)lua_topointer(L, 1);
+	SceneEntity* entity = (SceneEntity*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TNUMBER);
 	Number mass = lua_tonumber(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);
 	Number friction = lua_tonumber(L, 3);
 	luaL_checktype(L, 4, LUA_TLIGHTUSERDATA);
-	btDefaultVehicleRaycaster * rayCaster = (btDefaultVehicleRaycaster *)lua_topointer(L, 4);
+	btDefaultVehicleRaycaster* rayCaster = (btDefaultVehicleRaycaster*)lua_topointer(L, 4);
 	PhysicsVehicle *inst = new PhysicsVehicle(entity, mass, friction, rayCaster);
 	lua_pushlightuserdata(L, (void*)inst);
 	return 1;
@@ -594,7 +594,7 @@ static int Physics3D_PhysicsVehicle_addWheel(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsVehicle *inst = (PhysicsVehicle*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TLIGHTUSERDATA);
-	SceneEntity * entity = (SceneEntity *)lua_topointer(L, 2);
+	SceneEntity* entity = (SceneEntity*)lua_topointer(L, 2);
 	luaL_checktype(L, 3, LUA_TLIGHTUSERDATA);
 	Vector3 connection = *(Vector3*)lua_topointer(L, 3);
 	luaL_checktype(L, 4, LUA_TLIGHTUSERDATA);
@@ -699,7 +699,7 @@ static int Physics3D_delete_PhysicsVehicle(lua_State *L) {
 
 static int Physics3D_PhysicsCharacter(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-	SceneEntity * entity = (SceneEntity *)lua_topointer(L, 1);
+	SceneEntity* entity = (SceneEntity*)lua_topointer(L, 1);
 	luaL_checktype(L, 2, LUA_TNUMBER);
 	Number mass = lua_tonumber(L, 2);
 	luaL_checktype(L, 3, LUA_TNUMBER);

Player/Contents/CMakeLists.txt

@@ -4,6 +4,7 @@ INCLUDE_DIRECTORIES(
     ${LUA_INCLUDE_DIR}
     ${Polycode_SOURCE_DIR}/Bindings/Contents/LUA/Include
     Include
+    ../../Core/Contents/PolycodeView/Mac\ OS\ X/
 )
 
 SET(CMAKE_DEBUG_POSTFIX "_d")
@@ -55,12 +56,14 @@ ELSEIF(APPLE)
         Platform/Darwin/main.m
         Platform/Darwin/MyDocument.mm
         Platform/Darwin/PPlayerDocumentController.mm
+	../../Core/Contents/PolycodeView/Mac\ OS\ X/PolycodeView.mm
     )
     SET(polycodeplayer_HDRS 
         Include/PolycodePlayer.h
         Include/PolycodeCocoaPlayer.h
         Platform/Darwin/MyDocument.h
         Platform/Darwin/PPlayerDocumentController.h
+	../../Core/Contents/PolycodeView/Mac\ OS\ X/PolycodeView.h
     )
   
     SET(polycodeplayerstandalone_SRCS 
@@ -68,11 +71,13 @@ ELSEIF(APPLE)
         Source/PolycodeCocoaPlayer.mm
         Platform/Darwin/Standalone/main.m
         Platform/Darwin/Standalone/StandalonePlayerAppDelegate.mm
+	../../Core/Contents/PolycodeView/Mac\ OS\ X/PolycodeView.mm
     )
     SET(polycodeplayerstandalone_HDRS 
         Include/PolycodePlayer.h
         Include/PolycodeCocoaPlayer.h
         Platform/Darwin/Standalone/StandalonePlayerAppDelegate.h
+	../../Core/Contents/PolycodeView/Mac\ OS\ X/PolycodeView.h
     )
   
     INCLUDE_DIRECTORIES(Include)