Quellcode durchsuchen

Mac fixes for bitshifter's changes.

Ivan Safrin vor 14 Jahren
Ursprung
Commit
e9c1a6af55

+ 72 - 72
Bindings/Contents/LUA/API/Polycode.lua

@@ -1,87 +1,87 @@
-require "Polycode/SkeletonAnimation"
-require "Polycode/Skeleton"
-require "Polycode/BoneTrack"
-require "Polycode/TweenManager"
+require "Polycode/OSFILE"
+require "Polycode/OSFileEntry"
+require "Polycode/OSBasics"
+require "Polycode/BezierCurve"
+require "Polycode/Bone"
+require "Polycode/Camera"
+require "Polycode/Color"
+require "Polycode/Config"
+require "Polycode/PolycodeViewBase"
+require "Polycode/Core"
+require "Polycode/CoreInput"
+require "Polycode/CoreServices"
+require "Polycode/Cubemap"
+require "Polycode/Data"
+require "Polycode/Entity"
 require "Polycode/Event"
 require "Polycode/Event"
+require "Polycode/EventDispatcher"
 require "Polycode/EventHandler"
 require "Polycode/EventHandler"
-require "Polycode/Particle"
+require "Polycode/FixedShader"
+require "Polycode/FixedShaderBinding"
+require "Polycode/Font"
 require "Polycode/FontManager"
 require "Polycode/FontManager"
-require "Polycode/Renderer"
-require "Polycode/SceneEntity"
-require "Polycode/Texture"
-require "Polycode/Vector3"
-require "Polycode/Scene"
-require "Polycode/Screen"
-require "Polycode/Vertex"
-require "Polycode/ScreenImage"
-require "Polycode/ResourceManager"
-require "Polycode/ScreenMesh"
-require "Polycode/ScenePrimitive"
-require "Polycode/SceneSound"
-require "Polycode/SceneSoundListener"
-require "Polycode/Config"
-require "Polycode/QuaternionTween"
-require "Polycode/Tween"
-require "Polycode/BezierPathTween"
-require "Polycode/QuaternionCurve"
-require "Polycode/SceneManager"
-require "Polycode/Matrix4"
-require "Polycode/SceneLine"
-require "Polycode/ScreenEvent"
-require "Polycode/Bone"
-require "Polycode/SceneMesh"
-require "Polycode/Sound"
-require "Polycode/Shader"
-require "Polycode/ShaderBinding"
-require "Polycode/ObjectEntry"
-require "Polycode/ScreenManager"
-require "Polycode/Vector2"
-require "Polycode/EventDispatcher"
-require "Polycode/SoundManager"
-require "Polycode/Logger"
 require "Polycode/Image"
 require "Polycode/Image"
-require "Polycode/Perlin"
-require "Polycode/ScreenLabel"
-require "Polycode/Cubemap"
-require "Polycode/SceneLabel"
-require "Polycode/TimerManager"
-require "Polycode/Quaternion"
-require "Polycode/Label"
-require "Polycode/ScreenLine"
-require "Polycode/ScreenSoundListener"
-require "Polycode/ScreenSound"
-require "Polycode/String"
-require "Polycode/PolycodeModule"
-require "Polycode/Core"
-require "Polycode/PolycodeViewBase"
 require "Polycode/InputEvent"
 require "Polycode/InputEvent"
+require "Polycode/Label"
+require "Polycode/Logger"
+require "Polycode/Material"
+require "Polycode/MaterialManager"
+require "Polycode/Matrix4"
 require "Polycode/VertexBuffer"
 require "Polycode/VertexBuffer"
 require "Polycode/Mesh"
 require "Polycode/Mesh"
-require "Polycode/MaterialManager"
-require "Polycode/BezierCurve"
-require "Polycode/ScreenShape"
+require "Polycode/PolycodeModule"
+require "Polycode/ObjectEntry"
+require "Polycode/Particle"
 require "Polycode/ScreenParticleEmitter"
 require "Polycode/ScreenParticleEmitter"
 require "Polycode/SceneParticleEmitter"
 require "Polycode/SceneParticleEmitter"
 require "Polycode/ParticleEmitter"
 require "Polycode/ParticleEmitter"
-require "Polycode/Data"
-require "Polycode/ScreenEntity"
-require "Polycode/Timer"
-require "Polycode/CoreInput"
-require "Polycode/OSFILE"
-require "Polycode/OSFileEntry"
-require "Polycode/OSBasics"
+require "Polycode/Perlin"
 require "Polycode/Polygon"
 require "Polycode/Polygon"
-require "Polycode/Font"
-require "Polycode/Entity"
-require "Polycode/Material"
-require "Polycode/Color"
-require "Polycode/ScreenCurve"
+require "Polycode/Quaternion"
+require "Polycode/QuaternionCurve"
 require "Polycode/Rectangle"
 require "Polycode/Rectangle"
-require "Polycode/CoreServices"
+require "Polycode/Renderer"
 require "Polycode/Resource"
 require "Polycode/Resource"
+require "Polycode/ResourceManager"
+require "Polycode/Scene"
+require "Polycode/SceneEntity"
+require "Polycode/SceneLabel"
+require "Polycode/SceneLight"
+require "Polycode/SceneLine"
+require "Polycode/SceneManager"
+require "Polycode/SceneMesh"
+require "Polycode/ScenePrimitive"
 require "Polycode/SceneRenderTexture"
 require "Polycode/SceneRenderTexture"
-require "Polycode/Camera"
+require "Polycode/SceneSound"
+require "Polycode/SceneSoundListener"
+require "Polycode/Screen"
+require "Polycode/ScreenCurve"
+require "Polycode/ScreenEntity"
+require "Polycode/ScreenEvent"
+require "Polycode/ScreenImage"
+require "Polycode/ScreenLabel"
+require "Polycode/ScreenLine"
+require "Polycode/ScreenManager"
+require "Polycode/ScreenMesh"
+require "Polycode/ScreenShape"
+require "Polycode/ScreenSoundListener"
+require "Polycode/ScreenSound"
 require "Polycode/ScreenSprite"
 require "Polycode/ScreenSprite"
-require "Polycode/FixedShader"
-require "Polycode/FixedShaderBinding"
-require "Polycode/SceneLight"
+require "Polycode/Shader"
+require "Polycode/ShaderBinding"
+require "Polycode/SkeletonAnimation"
+require "Polycode/Skeleton"
+require "Polycode/BoneTrack"
+require "Polycode/Sound"
+require "Polycode/SoundManager"
+require "Polycode/String"
+require "Polycode/Texture"
+require "Polycode/Timer"
+require "Polycode/TimerManager"
+require "Polycode/QuaternionTween"
+require "Polycode/Tween"
+require "Polycode/BezierPathTween"
+require "Polycode/TweenManager"
+require "Polycode/Vector2"
+require "Polycode/Vector3"
+require "Polycode/Vertex"

Datei-Diff unterdrückt, da er zu groß ist
+ 518 - 442
Bindings/Contents/LUA/Include/PolycodeLUAWrappers.h


Datei-Diff unterdrückt, da er zu groß ist
+ 132 - 876
Bindings/Contents/LUA/Source/PolycodeLUA.cpp


+ 2 - 2
CMake/PolycodeIncludes.cmake

@@ -1,10 +1,10 @@
 # platform specific defines and include directories for win and sdl
 # platform specific defines and include directories for win and sdl
 IF(MSVC)
 IF(MSVC)
     ADD_DEFINITIONS(/D_UNICODE /DUNICODE)
     ADD_DEFINITIONS(/D_UNICODE /DUNICODE)
-    INCLUDE_DIRECTORIES("${Polycode_SOURCE_DIR}/Core/Contents/PolycodeView/Build/MSVC/Polycore")
+    INCLUDE_DIRECTORIES("${Polycode_SOURCE_DIR}/Core/Contents/PolycodeView/MSVC/Polycore")
 ELSEIF(APPLE)
 ELSEIF(APPLE)
     ADD_DEFINITIONS(-DGL_GLEXT_PROTOTYPES)
     ADD_DEFINITIONS(-DGL_GLEXT_PROTOTYPES)
-    INCLUDE_DIRECTORIES("${Polycode_SOURCE_DIR}/Core/Contents/PolycodeView/Build/Mac OS X")
+    INCLUDE_DIRECTORIES("${Polycode_SOURCE_DIR}/Core/Contents/PolycodeView/Mac OS X")
 ELSE(MSVC)
 ELSE(MSVC)
     ADD_DEFINITIONS(-DGL_GLEXT_PROTOTYPES)
     ADD_DEFINITIONS(-DGL_GLEXT_PROTOTYPES)
     INCLUDE_DIRECTORIES("${Polycode_SOURCE_DIR}/Core/Contents/PolycodeView/Linux")
     INCLUDE_DIRECTORIES("${Polycode_SOURCE_DIR}/Core/Contents/PolycodeView/Linux")

+ 3 - 2
Core/Contents/Include/PolyCocoaCore.h

@@ -32,8 +32,9 @@
 #include "PolyGLRenderer.h"
 #include "PolyGLRenderer.h"
 #include <mach/mach_time.h>
 #include <mach/mach_time.h>
 #include <unistd.h>
 #include <unistd.h>
-
+#include "PolyInputEvent.h"
 #include "PolyGLSLShaderModule.h"
 #include "PolyGLSLShaderModule.h"
+
 #import <Cocoa/Cocoa.h>
 #import <Cocoa/Cocoa.h>
 
 
 using std::vector;
 using std::vector;
@@ -81,7 +82,7 @@ namespace Polycode {
 		void moveDiskItem(const String& itemPath, const String& destItemPath);
 		void moveDiskItem(const String& itemPath, const String& destItemPath);
 		void removeDiskItem(const String& itemPath);
 		void removeDiskItem(const String& itemPath);
 		String openFolderPicker();
 		String openFolderPicker();
-		vector<string> openFilePicker(vector<CoreFileExtension> extensions, bool allowMultiple);
+		vector<String> openFilePicker(vector<CoreFileExtension> extensions, bool allowMultiple);
 		
 		
 		void setCursor(int cursorType);
 		void setCursor(int cursorType);
 		
 		

+ 3 - 3
Core/Contents/Include/PolyCore.h

@@ -26,6 +26,9 @@ THE SOFTWARE.
 #include "PolyRectangle.h"
 #include "PolyRectangle.h"
 #include "PolyVector2.h"
 #include "PolyVector2.h"
 #include "PolyEventDispatcher.h"
 #include "PolyEventDispatcher.h"
+#include "PolyCoreInput.h"
+#include "PolyCoreServices.h"
+#include "PolyThreaded.h"
 
 
 #define CURSOR_ARROW 0
 #define CURSOR_ARROW 0
 #define CURSOR_TEXT 1
 #define CURSOR_TEXT 1
@@ -38,10 +41,7 @@ long getThreadID();
 
 
 namespace Polycode {
 namespace Polycode {
 
 
-	class CoreInput;
-	class CoreServices;
 	class Renderer;
 	class Renderer;
-	class Threaded;
 
 
 	class _PolyExport CoreMutex {
 	class _PolyExport CoreMutex {
 	public:
 	public:

+ 1 - 2
Core/Contents/Include/PolyEventHandler.h

@@ -22,11 +22,10 @@ THE SOFTWARE.
 
 
 #pragma once
 #pragma once
 #include "PolyGlobals.h"
 #include "PolyGlobals.h"
+#include "PolyEvent.h"
 
 
 namespace Polycode {
 namespace Polycode {
 
 
-	class Event;
-
 	/**
 	/**
 	* Can handle events from EventDispatcher classes.
 	* Can handle events from EventDispatcher classes.
 	*/
 	*/

+ 2 - 0
Core/Contents/Include/Polycode.h

@@ -28,6 +28,7 @@
 #include "PolyObject.h"
 #include "PolyObject.h"
 #include "PolyLogger.h"
 #include "PolyLogger.h"
 #include "PolyConfig.h"
 #include "PolyConfig.h"
+#include "PolyPerlin.h"
 #include "PolyEntity.h"
 #include "PolyEntity.h"
 #include "PolyPolygon.h"
 #include "PolyPolygon.h"
 #include "PolyEvent.h"
 #include "PolyEvent.h"
@@ -53,6 +54,7 @@
 #include "PolyScreenMesh.h"
 #include "PolyScreenMesh.h"
 #include "PolyScreenShape.h"
 #include "PolyScreenShape.h"
 #include "PolyImage.h"
 #include "PolyImage.h"
+#include "PolyLabel.h"
 #include "PolyFont.h"
 #include "PolyFont.h"
 #include "PolyFontManager.h"
 #include "PolyFontManager.h"
 #include "PolyScreenImage.h"
 #include "PolyScreenImage.h"

+ 4 - 4
Core/Contents/Source/PolyCocoaCore.mm

@@ -155,8 +155,8 @@ void CocoaCore::copyStringToClipboard(const String& str) {
 	
 	
 	//NSString *nsstr = [NSString stringWithCharacters: (unichar*) str.c_str() length: str.length()];
 	//NSString *nsstr = [NSString stringWithCharacters: (unichar*) str.c_str() length: str.length()];
 	
 	
-	char* data = (char*)str.data();
-	unsigned size = str.size() * sizeof(wchar);
+	char* data = (char*)str.c_str();
+	unsigned size = str.size() * sizeof(char);
 	
 	
 	NSString* nsstr = [[[NSString alloc] initWithBytes:data length:size encoding:NSUTF32LittleEndianStringEncoding] autorelease];
 	NSString* nsstr = [[[NSString alloc] initWithBytes:data length:size encoding:NSUTF32LittleEndianStringEncoding] autorelease];
     [pb setString: nsstr forType:NSStringPboardType];	
     [pb setString: nsstr forType:NSStringPboardType];	
@@ -385,9 +385,9 @@ String CocoaCore::openFolderPicker() {
 	}	
 	}	
 }
 }
 
 
-vector<string> CocoaCore::openFilePicker(vector<CoreFileExtension> extensions, bool allowMultiple) {
+vector<String> CocoaCore::openFilePicker(vector<CoreFileExtension> extensions, bool allowMultiple) {
 	
 	
-	vector<string> retVector;
+	vector<String> retVector;
 	
 	
 	NSOpenPanel *attachmentPanel = [NSOpenPanel openPanel];	
 	NSOpenPanel *attachmentPanel = [NSOpenPanel openPanel];	
 	[attachmentPanel setCanChooseFiles:YES];
 	[attachmentPanel setCanChooseFiles:YES];

+ 5 - 1
Core/Contents/Source/PolyGLVertexBuffer.cpp

@@ -23,7 +23,11 @@
 #include "PolyGLVertexBuffer.h"
 #include "PolyGLVertexBuffer.h"
 #include "PolyPolygon.h"
 #include "PolyPolygon.h"
 
 
-#include "malloc.h"
+#if defined(__APPLE__) && defined(__MACH__)
+
+#else
+	#include "malloc.h"
+#endif
 
 
 using namespace Polycode;
 using namespace Polycode;
 
 

+ 1 - 1
Modules/Bindings/3DPhysics/API/Physics3D.lua

@@ -1,6 +1,6 @@
 require "Physics3D/CollisionScene"
 require "Physics3D/CollisionScene"
-require "Physics3D/PhysicsScene"
 require "Physics3D/CollisionSceneEntity"
 require "Physics3D/CollisionSceneEntity"
+require "Physics3D/PhysicsScene"
 require "Physics3D/PhysicsSceneEntity"
 require "Physics3D/PhysicsSceneEntity"
 require "Physics3D/PhysicsVehicle"
 require "Physics3D/PhysicsVehicle"
 require "Physics3D/PhysicsCharacter"
 require "Physics3D/PhysicsCharacter"

+ 95 - 95
Modules/Bindings/3DPhysics/Include/Physics3DLUAWrappers.h

@@ -8,11 +8,11 @@ extern "C" {
 #include "lauxlib.h"
 #include "lauxlib.h"
 } // extern "C" 
 } // extern "C" 
 
 
+#include "Polycode3DPhysics.h"
 #include "PolyCollisionScene.h"
 #include "PolyCollisionScene.h"
-#include "PolyPhysicsScene.h"
 #include "PolyCollisionSceneEntity.h"
 #include "PolyCollisionSceneEntity.h"
+#include "PolyPhysicsScene.h"
 #include "PolyPhysicsSceneEntity.h"
 #include "PolyPhysicsSceneEntity.h"
-#include "Polycode3DPhysics.h"
 
 
 namespace Polycode {
 namespace Polycode {
 
 
@@ -213,6 +213,99 @@ static int Physics3D_delete_CollisionScene(lua_State *L) {
 	return 0;
 	return 0;
 }
 }
 
 
+static int Physics3D_CollisionSceneEntity_get_lastPosition(lua_State *L) {
+	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
+	lua_pushlightuserdata(L, &inst->lastPosition);
+	return 1;
+}
+
+static int Physics3D_CollisionSceneEntity_get_enabled(lua_State *L) {
+	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
+	lua_pushboolean(L, inst->enabled);
+	return 1;
+}
+
+static int Physics3D_CollisionSceneEntity_set_enabled(lua_State *L) {
+	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
+	bool param = lua_toboolean(L, 2);
+	inst->enabled = param;
+	return 0;
+}
+
+static int Physics3D_CollisionSceneEntity(lua_State *L) {
+	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+	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);
+	lua_pushlightuserdata(L, (void*)inst);
+	return 1;
+}
+
+static int Physics3D_CollisionSceneEntity_getSceneEntity(lua_State *L) {
+	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
+	void *ptrRetVal = (void*)inst->getSceneEntity();
+	if(ptrRetVal == NULL) {
+		lua_pushnil(L);
+	} else {
+		lua_pushlightuserdata(L, ptrRetVal);
+	}
+	return 1;
+}
+
+static int Physics3D_CollisionSceneEntity_getType(lua_State *L) {
+	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
+	lua_pushinteger(L, inst->getType());
+	return 1;
+}
+
+static int Physics3D_CollisionSceneEntity_Update(lua_State *L) {
+	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
+	inst->Update();
+	return 0;
+}
+
+static int Physics3D_CollisionSceneEntity_getConvexShape(lua_State *L) {
+	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
+	void *ptrRetVal = (void*)inst->getConvexShape();
+	if(ptrRetVal == NULL) {
+		lua_pushnil(L);
+	} else {
+		lua_pushlightuserdata(L, ptrRetVal);
+	}
+	return 1;
+}
+
+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);
+	luaL_checktype(L, 3, LUA_TNUMBER);
+	int type = lua_tointeger(L, 3);
+	void *ptrRetVal = (void*)inst->createCollisionShape(entity, type);
+	if(ptrRetVal == NULL) {
+		lua_pushnil(L);
+	} else {
+		lua_pushlightuserdata(L, ptrRetVal);
+	}
+	return 1;
+}
+
+static int Physics3D_delete_CollisionSceneEntity(lua_State *L) {
+	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
+	delete inst;
+	return 0;
+}
+
 static int Physics3D_PhysicsScene(lua_State *L) {
 static int Physics3D_PhysicsScene(lua_State *L) {
 	PhysicsScene *inst = new PhysicsScene();
 	PhysicsScene *inst = new PhysicsScene();
 	lua_pushlightuserdata(L, (void*)inst);
 	lua_pushlightuserdata(L, (void*)inst);
@@ -403,99 +496,6 @@ static int Physics3D_delete_PhysicsScene(lua_State *L) {
 	return 0;
 	return 0;
 }
 }
 
 
-static int Physics3D_CollisionSceneEntity_get_lastPosition(lua_State *L) {
-	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
-	lua_pushlightuserdata(L, &inst->lastPosition);
-	return 1;
-}
-
-static int Physics3D_CollisionSceneEntity_get_enabled(lua_State *L) {
-	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
-	lua_pushboolean(L, inst->enabled);
-	return 1;
-}
-
-static int Physics3D_CollisionSceneEntity_set_enabled(lua_State *L) {
-	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
-	bool param = lua_toboolean(L, 2);
-	inst->enabled = param;
-	return 0;
-}
-
-static int Physics3D_CollisionSceneEntity(lua_State *L) {
-	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-	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);
-	lua_pushlightuserdata(L, (void*)inst);
-	return 1;
-}
-
-static int Physics3D_CollisionSceneEntity_getSceneEntity(lua_State *L) {
-	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
-	void *ptrRetVal = (void*)inst->getSceneEntity();
-	if(ptrRetVal == NULL) {
-		lua_pushnil(L);
-	} else {
-		lua_pushlightuserdata(L, ptrRetVal);
-	}
-	return 1;
-}
-
-static int Physics3D_CollisionSceneEntity_getType(lua_State *L) {
-	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
-	lua_pushinteger(L, inst->getType());
-	return 1;
-}
-
-static int Physics3D_CollisionSceneEntity_Update(lua_State *L) {
-	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
-	inst->Update();
-	return 0;
-}
-
-static int Physics3D_CollisionSceneEntity_getConvexShape(lua_State *L) {
-	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
-	void *ptrRetVal = (void*)inst->getConvexShape();
-	if(ptrRetVal == NULL) {
-		lua_pushnil(L);
-	} else {
-		lua_pushlightuserdata(L, ptrRetVal);
-	}
-	return 1;
-}
-
-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);
-	luaL_checktype(L, 3, LUA_TNUMBER);
-	int type = lua_tointeger(L, 3);
-	void *ptrRetVal = (void*)inst->createCollisionShape(entity, type);
-	if(ptrRetVal == NULL) {
-		lua_pushnil(L);
-	} else {
-		lua_pushlightuserdata(L, ptrRetVal);
-	}
-	return 1;
-}
-
-static int Physics3D_delete_CollisionSceneEntity(lua_State *L) {
-	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-	CollisionSceneEntity *inst = (CollisionSceneEntity*)lua_topointer(L, 1);
-	delete inst;
-	return 0;
-}
-
 static int Physics3D_PhysicsSceneEntity_get_enabled(lua_State *L) {
 static int Physics3D_PhysicsSceneEntity_get_enabled(lua_State *L) {
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	PhysicsSceneEntity *inst = (PhysicsSceneEntity*)lua_topointer(L, 1);
 	PhysicsSceneEntity *inst = (PhysicsSceneEntity*)lua_topointer(L, 1);

+ 10 - 10
Modules/Bindings/3DPhysics/Source/Physics3DLUA.cpp

@@ -23,16 +23,6 @@ CoreServices::setInstance(inst);
 		{"CollisionScene_removeCollision", Physics3D_CollisionScene_removeCollision},
 		{"CollisionScene_removeCollision", Physics3D_CollisionScene_removeCollision},
 		{"CollisionScene_adjustForCollision", Physics3D_CollisionScene_adjustForCollision},
 		{"CollisionScene_adjustForCollision", Physics3D_CollisionScene_adjustForCollision},
 		{"delete_CollisionScene", Physics3D_delete_CollisionScene},
 		{"delete_CollisionScene", Physics3D_delete_CollisionScene},
-		{"PhysicsScene", Physics3D_PhysicsScene},
-		{"PhysicsScene_Update", Physics3D_PhysicsScene_Update},
-		{"PhysicsScene_removePhysicsChild", Physics3D_PhysicsScene_removePhysicsChild},
-		{"PhysicsScene_getPhysicsEntityBySceneEntity", Physics3D_PhysicsScene_getPhysicsEntityBySceneEntity},
-		{"PhysicsScene_addPhysicsChild", Physics3D_PhysicsScene_addPhysicsChild},
-		{"PhysicsScene_trackPhysicsChild", Physics3D_PhysicsScene_trackPhysicsChild},
-		{"PhysicsScene_addCharacterChild", Physics3D_PhysicsScene_addCharacterChild},
-		{"PhysicsScene_removeCharacterChild", Physics3D_PhysicsScene_removeCharacterChild},
-		{"PhysicsScene_addVehicleChild", Physics3D_PhysicsScene_addVehicleChild},
-		{"delete_PhysicsScene", Physics3D_delete_PhysicsScene},
 		{"CollisionSceneEntity_get_lastPosition", Physics3D_CollisionSceneEntity_get_lastPosition},
 		{"CollisionSceneEntity_get_lastPosition", Physics3D_CollisionSceneEntity_get_lastPosition},
 		{"CollisionSceneEntity_get_enabled", Physics3D_CollisionSceneEntity_get_enabled},
 		{"CollisionSceneEntity_get_enabled", Physics3D_CollisionSceneEntity_get_enabled},
 		{"CollisionSceneEntity_set_enabled", Physics3D_CollisionSceneEntity_set_enabled},
 		{"CollisionSceneEntity_set_enabled", Physics3D_CollisionSceneEntity_set_enabled},
@@ -43,6 +33,16 @@ CoreServices::setInstance(inst);
 		{"CollisionSceneEntity_getConvexShape", Physics3D_CollisionSceneEntity_getConvexShape},
 		{"CollisionSceneEntity_getConvexShape", Physics3D_CollisionSceneEntity_getConvexShape},
 		{"CollisionSceneEntity_createCollisionShape", Physics3D_CollisionSceneEntity_createCollisionShape},
 		{"CollisionSceneEntity_createCollisionShape", Physics3D_CollisionSceneEntity_createCollisionShape},
 		{"delete_CollisionSceneEntity", Physics3D_delete_CollisionSceneEntity},
 		{"delete_CollisionSceneEntity", Physics3D_delete_CollisionSceneEntity},
+		{"PhysicsScene", Physics3D_PhysicsScene},
+		{"PhysicsScene_Update", Physics3D_PhysicsScene_Update},
+		{"PhysicsScene_removePhysicsChild", Physics3D_PhysicsScene_removePhysicsChild},
+		{"PhysicsScene_getPhysicsEntityBySceneEntity", Physics3D_PhysicsScene_getPhysicsEntityBySceneEntity},
+		{"PhysicsScene_addPhysicsChild", Physics3D_PhysicsScene_addPhysicsChild},
+		{"PhysicsScene_trackPhysicsChild", Physics3D_PhysicsScene_trackPhysicsChild},
+		{"PhysicsScene_addCharacterChild", Physics3D_PhysicsScene_addCharacterChild},
+		{"PhysicsScene_removeCharacterChild", Physics3D_PhysicsScene_removeCharacterChild},
+		{"PhysicsScene_addVehicleChild", Physics3D_PhysicsScene_addVehicleChild},
+		{"delete_PhysicsScene", Physics3D_delete_PhysicsScene},
 		{"PhysicsSceneEntity_get_enabled", Physics3D_PhysicsSceneEntity_get_enabled},
 		{"PhysicsSceneEntity_get_enabled", Physics3D_PhysicsSceneEntity_get_enabled},
 		{"PhysicsSceneEntity_set_enabled", Physics3D_PhysicsSceneEntity_set_enabled},
 		{"PhysicsSceneEntity_set_enabled", Physics3D_PhysicsSceneEntity_set_enabled},
 		{"PhysicsSceneEntity", Physics3D_PhysicsSceneEntity},
 		{"PhysicsSceneEntity", Physics3D_PhysicsSceneEntity},

+ 1 - 0
Modules/Contents/3DPhysics/Include/Polycode3DPhysics.h

@@ -28,3 +28,4 @@ THE SOFTWARE.
 #include "PolyCollisionScene.h"
 #include "PolyCollisionScene.h"
 #include "PolyCollisionSceneEntity.h"
 #include "PolyCollisionSceneEntity.h"
 #include "PolyPhysicsScene.h"
 #include "PolyPhysicsScene.h"
+#include "PolyPhysicsSceneEntity.h"

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.