From d362e3dea1e51b5dc53809a3b0dfcdc67db49381 Mon Sep 17 00:00:00 2001 From: Ivan Safrin Date: Sun, 25 Dec 2011 17:24:40 -0500 Subject: [PATCH] Windows fixes --- .../C++/Windows/PolycodeTemplate.cpp | 21 +++++ .../C++/Windows/PolycodeTemplate.sln | 20 ++++ .../C++/Windows/PolycodeTemplate.vcxproj | 93 +++++++++++++++++++ .../C++/Windows/PolycodeTemplateApp.cpp | 16 ++++ .../C++/Windows/PolycodeTemplateApp.h | 15 +++ Assets/Templates/CMakeLists.txt | 3 + CMake/ExternalOpenAL.cmake | 1 - CMake/FindPNG.cmake | 45 +++++++++ CMake/lua51.cmake | 4 +- CMakeLists.txt | 9 +- Core/Contents/Include/PolyWinCore.h | 4 +- Core/Contents/Include/Polycode.h | 3 + Core/Contents/Source/PolyGLRenderer.cpp | 8 ++ Core/Contents/Source/PolyGLSLShader.cpp | 1 + Core/Contents/Source/PolyGLTexture.cpp | 4 + Core/Contents/Source/PolyWinCore.cpp | 4 +- .../PolycodeExamples/2DAudio/2DAudio.vcxproj | 92 ++++++++++++++++++ .../3DMeshParticles/3DMeshParticles.vcxproj | 92 ++++++++++++++++++ .../3DPhysics_Basic/3DPhysics_Basic.vcxproj | 92 ++++++++++++++++++ .../3DPhysics_Contacts.vcxproj | 92 ++++++++++++++++++ .../3DPhysics_Vehicle.vcxproj | 92 ++++++++++++++++++ .../PolycodeExamples/PolycodeExample.cpp | 21 +++++ .../PolycodeExamples/PolycodeExamples.sln | 44 +++++++++ .../PolycodeExamples/PolycodeExamples.vcxproj | 81 ++++++++++++++++ .../3DPhysics/Source/PolyPhysicsScene.cpp | 2 +- .../Source/PolyPhysicsSceneEntity.cpp | 2 +- 26 files changed, 847 insertions(+), 14 deletions(-) create mode 100644 Assets/Templates/C++/Windows/PolycodeTemplate.cpp create mode 100644 Assets/Templates/C++/Windows/PolycodeTemplate.sln create mode 100644 Assets/Templates/C++/Windows/PolycodeTemplate.vcxproj create mode 100644 Assets/Templates/C++/Windows/PolycodeTemplateApp.cpp create mode 100644 Assets/Templates/C++/Windows/PolycodeTemplateApp.h create mode 100644 CMake/FindPNG.cmake create mode 100644 Examples/C++/Build/Windows/PolycodeExamples/2DAudio/2DAudio.vcxproj create mode 100644 Examples/C++/Build/Windows/PolycodeExamples/3DMeshParticles/3DMeshParticles.vcxproj create mode 100644 Examples/C++/Build/Windows/PolycodeExamples/3DPhysics_Basic/3DPhysics_Basic.vcxproj create mode 100644 Examples/C++/Build/Windows/PolycodeExamples/3DPhysics_Contacts/3DPhysics_Contacts.vcxproj create mode 100644 Examples/C++/Build/Windows/PolycodeExamples/3DPhysics_Vehicle/3DPhysics_Vehicle.vcxproj create mode 100644 Examples/C++/Build/Windows/PolycodeExamples/PolycodeExample.cpp create mode 100644 Examples/C++/Build/Windows/PolycodeExamples/PolycodeExamples.sln create mode 100644 Examples/C++/Build/Windows/PolycodeExamples/PolycodeExamples.vcxproj diff --git a/Assets/Templates/C++/Windows/PolycodeTemplate.cpp b/Assets/Templates/C++/Windows/PolycodeTemplate.cpp new file mode 100644 index 000000000..867c05171 --- /dev/null +++ b/Assets/Templates/C++/Windows/PolycodeTemplate.cpp @@ -0,0 +1,21 @@ +#include +#include "PolycodeTemplateApp.h" +#include "PolycodeView.h" +#include "windows.h" + +using namespace Polycode; + +int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +{ + PolycodeView *view = new PolycodeView(hInstance, nCmdShow, L"Polycode Template"); + PolycodeTemplateApp *app = new PolycodeTemplateApp(view); + + MSG Msg; + do { + if(PeekMessage(&Msg, NULL, 0,0,PM_REMOVE)) { + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } + } while(app->Update()); + return Msg.wParam; +} \ No newline at end of file diff --git a/Assets/Templates/C++/Windows/PolycodeTemplate.sln b/Assets/Templates/C++/Windows/PolycodeTemplate.sln new file mode 100644 index 000000000..020feb7a2 --- /dev/null +++ b/Assets/Templates/C++/Windows/PolycodeTemplate.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PolycodeTemplate", "PolycodeTemplate.vcxproj", "{D6C2171B-9167-4FB6-851A-DC1CEDCFC43D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D6C2171B-9167-4FB6-851A-DC1CEDCFC43D}.Debug|Win32.ActiveCfg = Debug|Win32 + {D6C2171B-9167-4FB6-851A-DC1CEDCFC43D}.Debug|Win32.Build.0 = Debug|Win32 + {D6C2171B-9167-4FB6-851A-DC1CEDCFC43D}.Release|Win32.ActiveCfg = Release|Win32 + {D6C2171B-9167-4FB6-851A-DC1CEDCFC43D}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Assets/Templates/C++/Windows/PolycodeTemplate.vcxproj b/Assets/Templates/C++/Windows/PolycodeTemplate.vcxproj new file mode 100644 index 000000000..1f2eb19b1 --- /dev/null +++ b/Assets/Templates/C++/Windows/PolycodeTemplate.vcxproj @@ -0,0 +1,93 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {D6C2171B-9167-4FB6-851A-DC1CEDCFC43D} + Win32Proj + PolycodeTemplate + + + + Application + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + true + $(SolutionDir)..\..\Core\include;$(SolutionDir)..\..\Core\Dependencies\include;$(SolutionDir)..\..\Core\PolycodeView;$(SolutionDir)..\..\Core\Dependencies\include\AL;$(IncludePath) + $(SolutionDir)..\..\Core\lib;$(SolutionDir)..\..\Core\Dependencies\lib;$(LibraryPath) + + + false + $(SolutionDir)..\..\Core\Include;$(SolutionDir)..\..\Core\Dependencies\Include;$(SolutionDir)..\..\Core\Dependencies\Include\AL;$(IncludePath) + $(SolutionDir)..\..\Core\lib;$(SolutionDir)..\..\Core\Dependencies\lib;$(LibraryPath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + + Windows + true + opengl32.lib;glu32.lib;Polycore_d.lib;zlibd.lib;freetype_d.lib;liboggd.lib;libvorbisd.lib;libvorbisfiled.lib;OpenAL32d.lib;kernel32.lib;physfsd.lib;libpng15_staticd.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + true + true + opengl32.lib;glu32.lib;Polycore.lib;zlib.lib;freetype.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;kernel32.lib;physfs.lib;libpng15_static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/Templates/C++/Windows/PolycodeTemplateApp.cpp b/Assets/Templates/C++/Windows/PolycodeTemplateApp.cpp new file mode 100644 index 000000000..45fe6bc84 --- /dev/null +++ b/Assets/Templates/C++/Windows/PolycodeTemplateApp.cpp @@ -0,0 +1,16 @@ +#include "PolycodeTemplateApp.h" + +PolycodeTemplateApp::PolycodeTemplateApp(PolycodeView *view) { + core = new Win32Core(view, 640,480,false, false, 0, 0,60); + CoreServices::getInstance()->getResourceManager()->addArchive("default.pak"); + CoreServices::getInstance()->getResourceManager()->addDirResource("default", false); + + // Write your code here +} +PolycodeTemplateApp::~PolycodeTemplateApp() { + +} + +bool PolycodeTemplateApp::Update() { + return core->Update(); +} \ No newline at end of file diff --git a/Assets/Templates/C++/Windows/PolycodeTemplateApp.h b/Assets/Templates/C++/Windows/PolycodeTemplateApp.h new file mode 100644 index 000000000..b1bc49cd0 --- /dev/null +++ b/Assets/Templates/C++/Windows/PolycodeTemplateApp.h @@ -0,0 +1,15 @@ +#include "PolycodeView.h" +#include "Polycode.h" + +using namespace Polycode; + +class PolycodeTemplateApp { +public: + PolycodeTemplateApp(PolycodeView *view); + ~PolycodeTemplateApp(); + + bool Update(); + +private: + Core *core; +}; \ No newline at end of file diff --git a/Assets/Templates/CMakeLists.txt b/Assets/Templates/CMakeLists.txt index bae912dcd..de77b29a2 100644 --- a/Assets/Templates/CMakeLists.txt +++ b/Assets/Templates/CMakeLists.txt @@ -3,6 +3,9 @@ IF(POLYCODE_INSTALL_TEMPLATE) IF(APPLE) INSTALL(DIRECTORY "C++/Xcode" DESTINATION "Template/") +ELSEIF(MSVC) + INSTALL(DIRECTORY "C++/Windows" + DESTINATION "Template/") ELSE(APPLE) INSTALL(DIRECTORY "C++/Linux" DESTINATION "Template/") diff --git a/CMake/ExternalOpenAL.cmake b/CMake/ExternalOpenAL.cmake index 0abe4f1b6..93da604ad 100644 --- a/CMake/ExternalOpenAL.cmake +++ b/CMake/ExternalOpenAL.cmake @@ -5,7 +5,6 @@ SET(openal_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/openal) SET(openal_CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= - -DLIBTYPE=STATIC -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_DEBUG_POSTFIX=d ) diff --git a/CMake/FindPNG.cmake b/CMake/FindPNG.cmake new file mode 100644 index 000000000..34ef18b45 --- /dev/null +++ b/CMake/FindPNG.cmake @@ -0,0 +1,45 @@ + +set(PNG_FIND_DEBUG TRUE CACHE BOOL "Also search for the debug version of the PNG library") + +SET(LUA_SEARCH_PATHS + ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies/lib + ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies/include + ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies/include/libpng15 + ${POLYCODE_RELEASE_DIR}/Framework/Modules/Dependencies/lib + ${POLYCODE_RELEASE_DIR}/Framework/Tools/Dependencies/lib +) + +if(PNG_FIND_DEBUG) + if(PNG_INCLUDE_DIR AND PNG_LIBRARY AND PNG_LIBRARY_DEBUG) + set(PNG_FIND_QUIETLY TRUE) + endif(PNG_INCLUDE_DIR AND PNG_LIBRARY AND PNG_LIBRARY_DEBUG) +else(PNG_FIND_DEBUG) + if(PNG_INCLUDE_DIR AND PNG_LIBRARY) + set(PNG_FIND_QUIETLY TRUE) + endif(PNG_INCLUDE_DIR AND PNG_LIBRARY) +endif(PNG_FIND_DEBUG) + +find_path(PNG_INCLUDE_DIR png.h DOC "Directory containing png.h") + +find_library(PNG_LIBRARY NAMES png libpng png15 libpng15 libpng15_static DOC "Path to PNG library") +if(PNG_FIND_DEBUG) + find_library(PNG_LIBRARY_DEBUG NAMES pngd libpngd png15d libpng15d libpng15_staticd DOC "Path to PNG debug library") +endif(PNG_FIND_DEBUG) + +# handle the QUIETLY and REQUIRED arguments and set PNG_FOUND to TRUE if +# all listed variables are TRUE +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(PNG DEFAULT_MSG PNG_LIBRARY PNG_INCLUDE_DIR) + +if(PNG_FOUND) + if(PNG_FIND_DEBUG) + if(NOT PNG_LIBRARY_DEBUG) + set(PNG_LIBRARY_DEBUG ${PNG_LIBRARY}) + endif(NOT PNG_LIBRARY_DEBUG) + set(PNG_LIBRARIES debug ${PNG_LIBRARY_DEBUG} optimized ${PNG_LIBRARY}) + else(PNG_FIND_DEBUG) + set(PNG_LIBRARIES ${PNG_LIBRARY}) + endif(PNG_FIND_DEBUG) +else(PNG_FOUND) + SET(PNG_LIBRARIES ) +endif(PNG_FOUND) diff --git a/CMake/lua51.cmake b/CMake/lua51.cmake index b753b3093..8fd0c8a05 100644 --- a/CMake/lua51.cmake +++ b/CMake/lua51.cmake @@ -22,7 +22,9 @@ SET(lualib_SRCS INCLUDE_DIRECTORIES(src) -ADD_DEFINITIONS(-DLUA_USE_POSIX -DLUA_USE_DLOPEN) +IF(NOT MSVC) + ADD_DEFINITIONS(-DLUA_USE_POSIX -DLUA_USE_DLOPEN) +ENDIF(NOT MSVC) # We only want a static lib ADD_LIBRARY(lualib ${lualib_SRCS}) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c4cae9e9..ec2c4063c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,12 +77,9 @@ ENDIF(POLYCODE_BUILD_TOOLS) INSTALL(FILES LICENSE.txt DESTINATION ./) -# No Windows Build yet -IF (NOT WIN32) - INSTALL(DIRECTORY ${Polycode_SOURCE_DIR}/Examples/C++/Build/${CMAKE_SYSTEM_NAME} DESTINATION Examples) - INSTALL(DIRECTORY ${Polycode_SOURCE_DIR}/Examples/C++/Contents DESTINATION Examples/${CMAKE_SYSTEM_NAME}) - INSTALL(DIRECTORY ${Polycode_SOURCE_DIR}/Examples/C++/Resources DESTINATION Examples/${CMAKE_SYSTEM_NAME}) -ENDIF(NOT WIN32) +INSTALL(DIRECTORY ${Polycode_SOURCE_DIR}/Examples/C++/Build/${CMAKE_SYSTEM_NAME} DESTINATION Examples) +INSTALL(DIRECTORY ${Polycode_SOURCE_DIR}/Examples/C++/Contents DESTINATION Examples/${CMAKE_SYSTEM_NAME}) +INSTALL(DIRECTORY ${Polycode_SOURCE_DIR}/Examples/C++/Resources DESTINATION Examples/${CMAKE_SYSTEM_NAME}) INSTALL(DIRECTORY ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies DESTINATION Core) INSTALL(DIRECTORY ${POLYCODE_RELEASE_DIR}/Framework/Modules/Dependencies DESTINATION Modules) diff --git a/Core/Contents/Include/PolyWinCore.h b/Core/Contents/Include/PolyWinCore.h index 2c6116587..0be6316af 100644 --- a/Core/Contents/Include/PolyWinCore.h +++ b/Core/Contents/Include/PolyWinCore.h @@ -126,8 +126,8 @@ namespace Polycode { void handleMouseDown(int mouseCode,LPARAM lParam, WPARAM wParam); void handleMouseUp(int mouseCode,LPARAM lParam, WPARAM wParam); - void setVideoMode(int xRes, int yRes, bool fullScreen, int aaLevel); - + void setVideoMode(int xRes, int yRes, bool fullScreen, bool vSync, int aaLevel, int anisotropyLevel); + void initContext(bool usePixelFormat, unsigned int pixelFormat); void destroyContext(); diff --git a/Core/Contents/Include/Polycode.h b/Core/Contents/Include/Polycode.h index c1f68426c..6f0747843 100755 --- a/Core/Contents/Include/Polycode.h +++ b/Core/Contents/Include/Polycode.h @@ -88,3 +88,6 @@ #include "PolySoundManager.h" #include "PolySceneSound.h" #include "PolyScreenSound.h" +#ifdef _WINDOWS +#include "PolyWinCore.h" +#endif \ No newline at end of file diff --git a/Core/Contents/Source/PolyGLRenderer.cpp b/Core/Contents/Source/PolyGLRenderer.cpp index 5e54c6dd5..83f5d3366 100755 --- a/Core/Contents/Source/PolyGLRenderer.cpp +++ b/Core/Contents/Source/PolyGLRenderer.cpp @@ -55,6 +55,10 @@ PFNGLUNMAPBUFFERARBPROC glUnmapBufferARB; PFNGLGETBUFFERPARAMETERIVARBPROC glGetBufferParameterivARB; PFNGLGETBUFFERPOINTERVARBPROC glGetBufferPointervARB; +PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer; +PFNGLENABLEVERTEXATTRIBARRAYARBPROC glEnableVertexAttribArrayARB; +PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation; + // GL_EXT_framebuffer_object PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT; PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT; @@ -110,6 +114,10 @@ void OpenGLRenderer::initOSSpecific(){ glGetBufferParameterivARB = (PFNGLGETBUFFERPARAMETERIVARBPROC)wglGetProcAddress("glGetBufferParameterivARB"); glGetBufferPointervARB = (PFNGLGETBUFFERPOINTERVARBPROC)wglGetProcAddress("glGetBufferPointervARB"); + glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)wglGetProcAddress("glVertexAttribPointer"); + glEnableVertexAttribArrayARB = (PFNGLENABLEVERTEXATTRIBARRAYARBPROC)wglGetProcAddress("glEnableVertexAttribArrayARB"); + glBindAttribLocation = (PFNGLBINDATTRIBLOCATIONPROC)wglGetProcAddress("glBindAttribLocation"); + glIsRenderbufferEXT = (PFNGLISRENDERBUFFEREXTPROC)wglGetProcAddress("glIsRenderbufferEXT"); glBindRenderbufferEXT = (PFNGLBINDRENDERBUFFEREXTPROC)wglGetProcAddress("glBindRenderbufferEXT"); glDeleteRenderbuffersEXT = (PFNGLDELETERENDERBUFFERSEXTPROC)wglGetProcAddress("glDeleteRenderbuffersEXT"); diff --git a/Core/Contents/Source/PolyGLSLShader.cpp b/Core/Contents/Source/PolyGLSLShader.cpp index ee55dd067..a102919dc 100755 --- a/Core/Contents/Source/PolyGLSLShader.cpp +++ b/Core/Contents/Source/PolyGLSLShader.cpp @@ -62,6 +62,7 @@ extern PFNGLLINKPROGRAMPROC glLinkProgram; extern PFNGLDETACHSHADERPROC glDetachShader; extern PFNGLDELETESHADERPROC glDeleteShader; extern PFNGLDELETEPROGRAMPROC glDeleteProgram; +extern PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation; #endif using namespace Polycode; diff --git a/Core/Contents/Source/PolyGLTexture.cpp b/Core/Contents/Source/PolyGLTexture.cpp index 851d97c22..46e5ad51e 100755 --- a/Core/Contents/Source/PolyGLTexture.cpp +++ b/Core/Contents/Source/PolyGLTexture.cpp @@ -26,6 +26,10 @@ using namespace Polycode; +#ifdef _WINDOWS +extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT; +#endif + OpenGLTexture::OpenGLTexture(unsigned int width, unsigned int height, char *textureData, bool clamp, bool createMipmaps, int filteringMode, int type) : Texture(width, height, textureData,clamp, createMipmaps, type) { this->filteringMode = filteringMode; glTextureLoaded = false; diff --git a/Core/Contents/Source/PolyWinCore.cpp b/Core/Contents/Source/PolyWinCore.cpp index 016b45437..7dd42853b 100644 --- a/Core/Contents/Source/PolyWinCore.cpp +++ b/Core/Contents/Source/PolyWinCore.cpp @@ -73,7 +73,7 @@ Win32Core::Win32Core(PolycodeViewBase *view, int xRes, int yRes, bool fullScreen renderer = new OpenGLRenderer(); services->setRenderer(renderer); - setVideoMode(xRes, yRes, fullScreen, aaLevel); + setVideoMode(xRes, yRes, fullScreen, vSync, aaLevel, anisotropyLevel); // WSADATA WsaData; /// if(WSAStartup( MAKEWORD(2,2), &WsaData ) != NO_ERROR ){ @@ -112,7 +112,7 @@ bool Win32Core::Update() { return running; } -void Win32Core::setVideoMode(int xRes, int yRes, bool fullScreen, int aaLevel) { +void Win32Core::setVideoMode(int xRes, int yRes, bool fullScreen, bool vSync, int aaLevel, int anisotropyLevel) { if(fullScreen) { diff --git a/Examples/C++/Build/Windows/PolycodeExamples/2DAudio/2DAudio.vcxproj b/Examples/C++/Build/Windows/PolycodeExamples/2DAudio/2DAudio.vcxproj new file mode 100644 index 000000000..888df4e4e --- /dev/null +++ b/Examples/C++/Build/Windows/PolycodeExamples/2DAudio/2DAudio.vcxproj @@ -0,0 +1,92 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + {5586530C-8D6D-4ECE-B560-9566A66E359F} + Win32Proj + My2DAudio + + + + Application + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\2DAudio;$(IncludePath) + $(SolutionDir)..\..\..\Core\lib;$(SolutionDir)..\..\..\Core\Dependencies\lib;$(LibraryPath) + + + false + $(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\2DAudio;$(IncludePath) + $(SolutionDir)..\..\..\Core\lib;$(SolutionDir)..\..\..\Core\Dependencies\lib;$(LibraryPath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + opengl32.lib;glu32.lib;Polycore_d.lib;zlibd.lib;freetype_d.lib;liboggd.lib;libvorbisd.lib;libvorbisfiled.lib;OpenAL32d.lib;kernel32.lib;physfsd.lib;libpng15_staticd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + true + true + opengl32.lib;glu32.lib;Polycore.lib;zlib.lib;freetype.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;kernel32.lib;physfs.lib;libpng15_static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/Examples/C++/Build/Windows/PolycodeExamples/3DMeshParticles/3DMeshParticles.vcxproj b/Examples/C++/Build/Windows/PolycodeExamples/3DMeshParticles/3DMeshParticles.vcxproj new file mode 100644 index 000000000..d4b40d1f1 --- /dev/null +++ b/Examples/C++/Build/Windows/PolycodeExamples/3DMeshParticles/3DMeshParticles.vcxproj @@ -0,0 +1,92 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + {2978F8D8-10AA-4335-8FF1-C8499849C182} + Win32Proj + My2DAudio + + + + Application + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\3DMeshParticles;$(IncludePath) + $(SolutionDir)..\..\..\Core\lib;$(SolutionDir)..\..\..\Core\Dependencies\lib;$(LibraryPath) + + + false + $(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\3DMeshParticles;$(IncludePath) + $(SolutionDir)..\..\..\Core\lib;$(SolutionDir)..\..\..\Core\Dependencies\lib;$(LibraryPath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + opengl32.lib;glu32.lib;Polycore_d.lib;zlibd.lib;freetype_d.lib;liboggd.lib;libvorbisd.lib;libvorbisfiled.lib;OpenAL32d.lib;kernel32.lib;physfsd.lib;libpng15_staticd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + true + true + opengl32.lib;glu32.lib;Polycore.lib;zlib.lib;freetype.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;kernel32.lib;physfs.lib;libpng15_static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/Examples/C++/Build/Windows/PolycodeExamples/3DPhysics_Basic/3DPhysics_Basic.vcxproj b/Examples/C++/Build/Windows/PolycodeExamples/3DPhysics_Basic/3DPhysics_Basic.vcxproj new file mode 100644 index 000000000..6d9b1aa71 --- /dev/null +++ b/Examples/C++/Build/Windows/PolycodeExamples/3DPhysics_Basic/3DPhysics_Basic.vcxproj @@ -0,0 +1,92 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + {DC249750-474E-4945-A938-2C93F98B4B92} + Win32Proj + My2DAudio + + + + Application + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Modules\include;$(SolutionDir)..\..\..\Modules\Dependencies\include\bullet;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\3DPhysics_Basic;$(IncludePath) + $(SolutionDir)..\..\..\Core\lib;$(SolutionDir)..\..\..\Core\Dependencies\lib;$(SolutionDir)..\..\..\Modules\lib;$(SolutionDir)..\..\..\Modules\Dependencies\lib;$(LibraryPath) + + + false + $(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Modules\include;$(SolutionDir)..\..\..\Modules\Dependencies\include\bullet;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\3DPhysics_Basic;$(IncludePath) + $(SolutionDir)..\..\..\Core\lib;$(SolutionDir)..\..\..\Core\Dependencies\lib;$(SolutionDir)..\..\..\Modules\lib;$(SolutionDir)..\..\..\Modules\Dependencies\lib;$(LibraryPath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + Polycode3DPhysics_d.lib;LinearMath_d.lib;BulletCollision_d.lib;BulletDynamics_d.lib;opengl32.lib;glu32.lib;Polycore_d.lib;zlibd.lib;freetype_d.lib;liboggd.lib;libvorbisd.lib;libvorbisfiled.lib;OpenAL32d.lib;kernel32.lib;physfsd.lib;libpng15_staticd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + true + true + Polycode3DPhysics.lib;LinearMath.lib;BulletCollision.lib;BulletDynamics.lib;opengl32.lib;glu32.lib;Polycore.lib;zlib.lib;freetype.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;kernel32.lib;physfs.lib;libpng15_static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/Examples/C++/Build/Windows/PolycodeExamples/3DPhysics_Contacts/3DPhysics_Contacts.vcxproj b/Examples/C++/Build/Windows/PolycodeExamples/3DPhysics_Contacts/3DPhysics_Contacts.vcxproj new file mode 100644 index 000000000..4733e2772 --- /dev/null +++ b/Examples/C++/Build/Windows/PolycodeExamples/3DPhysics_Contacts/3DPhysics_Contacts.vcxproj @@ -0,0 +1,92 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + {70C02441-8A71-40E3-B737-C872FFFB0183} + Win32Proj + My2DAudio + + + + Application + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Modules\include;$(SolutionDir)..\..\..\Modules\Dependencies\include\bullet;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\3DPhysics_Contacts;$(IncludePath) + $(SolutionDir)..\..\..\Core\lib;$(SolutionDir)..\..\..\Core\Dependencies\lib;$(SolutionDir)..\..\..\Modules\lib;$(SolutionDir)..\..\..\Modules\Dependencies\lib;$(LibraryPath) + + + false + $(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Modules\include;$(SolutionDir)..\..\..\Modules\Dependencies\include\bullet;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\3DPhysics_Contacts;$(IncludePath) + $(SolutionDir)..\..\..\Core\lib;$(SolutionDir)..\..\..\Core\Dependencies\lib;$(SolutionDir)..\..\..\Modules\lib;$(SolutionDir)..\..\..\Modules\Dependencies\lib;$(LibraryPath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + Polycode3DPhysics_d.lib;LinearMath_d.lib;BulletCollision_d.lib;BulletDynamics_d.lib;opengl32.lib;glu32.lib;Polycore_d.lib;zlibd.lib;freetype_d.lib;liboggd.lib;libvorbisd.lib;libvorbisfiled.lib;OpenAL32d.lib;kernel32.lib;physfsd.lib;libpng15_staticd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + true + true + Polycode3DPhysics.lib;LinearMath.lib;BulletCollision.lib;BulletDynamics.lib;opengl32.lib;glu32.lib;Polycore.lib;zlib.lib;freetype.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;kernel32.lib;physfs.lib;libpng15_static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/Examples/C++/Build/Windows/PolycodeExamples/3DPhysics_Vehicle/3DPhysics_Vehicle.vcxproj b/Examples/C++/Build/Windows/PolycodeExamples/3DPhysics_Vehicle/3DPhysics_Vehicle.vcxproj new file mode 100644 index 000000000..8b0578eb6 --- /dev/null +++ b/Examples/C++/Build/Windows/PolycodeExamples/3DPhysics_Vehicle/3DPhysics_Vehicle.vcxproj @@ -0,0 +1,92 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + {6EB61FF3-51EA-42AF-AC8C-667A5FBF517A} + Win32Proj + My2DAudio + + + + Application + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Modules\include;$(SolutionDir)..\..\..\Modules\Dependencies\include\bullet;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\3DPhysics_Vehicle;$(IncludePath) + $(SolutionDir)..\..\..\Core\lib;$(SolutionDir)..\..\..\Core\Dependencies\lib;$(SolutionDir)..\..\..\Modules\lib;$(SolutionDir)..\..\..\Modules\Dependencies\lib;$(LibraryPath) + + + false + $(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Modules\include;$(SolutionDir)..\..\..\Modules\Dependencies\include\bullet;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\3DPhysics_Vehicle;$(IncludePath) + $(SolutionDir)..\..\..\Core\lib;$(SolutionDir)..\..\..\Core\Dependencies\lib;$(SolutionDir)..\..\..\Modules\lib;$(SolutionDir)..\..\..\Modules\Dependencies\lib;$(LibraryPath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + Polycode3DPhysics_d.lib;BulletDynamics_d.lib;BulletCollision_d.lib;LinearMath_d.lib;opengl32.lib;glu32.lib;Polycore_d.lib;zlibd.lib;freetype_d.lib;liboggd.lib;libvorbisd.lib;libvorbisfiled.lib;OpenAL32d.lib;kernel32.lib;physfsd.lib;libpng15_staticd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + true + true + Polycode3DPhysics.lib;LinearMath.lib;BulletCollision.lib;BulletDynamics.lib;opengl32.lib;glu32.lib;Polycore.lib;zlib.lib;freetype.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;kernel32.lib;physfs.lib;libpng15_static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/Examples/C++/Build/Windows/PolycodeExamples/PolycodeExample.cpp b/Examples/C++/Build/Windows/PolycodeExamples/PolycodeExample.cpp new file mode 100644 index 000000000..c2ea8ca3e --- /dev/null +++ b/Examples/C++/Build/Windows/PolycodeExamples/PolycodeExample.cpp @@ -0,0 +1,21 @@ +#include +#include "HelloPolycodeApp.h" +#include "PolycodeView.h" +#include "windows.h" + +using namespace Polycode; + +int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +{ + PolycodeView *view = new PolycodeView(hInstance, nCmdShow, L"Polycode Template"); + HelloPolycodeApp *app = new HelloPolycodeApp(view); + + MSG Msg; + do { + if(PeekMessage(&Msg, NULL, 0,0,PM_REMOVE)) { + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } + } while(app->Update()); + return Msg.wParam; +} \ No newline at end of file diff --git a/Examples/C++/Build/Windows/PolycodeExamples/PolycodeExamples.sln b/Examples/C++/Build/Windows/PolycodeExamples/PolycodeExamples.sln new file mode 100644 index 000000000..410ea51ad --- /dev/null +++ b/Examples/C++/Build/Windows/PolycodeExamples/PolycodeExamples.sln @@ -0,0 +1,44 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "2DAudio", "2DAudio\2DAudio.vcxproj", "{5586530C-8D6D-4ECE-B560-9566A66E359F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3DMeshParticles", "3DMeshParticles\3DMeshParticles.vcxproj", "{2978F8D8-10AA-4335-8FF1-C8499849C182}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3DPhysics_Vehicle", "3DPhysics_Vehicle\3DPhysics_Vehicle.vcxproj", "{6EB61FF3-51EA-42AF-AC8C-667A5FBF517A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3DPhysics_Basic", "3DPhysics_Basic\3DPhysics_Basic.vcxproj", "{DC249750-474E-4945-A938-2C93F98B4B92}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3DPhysics_Contacts", "3DPhysics_Contacts\3DPhysics_Contacts.vcxproj", "{70C02441-8A71-40E3-B737-C872FFFB0183}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5586530C-8D6D-4ECE-B560-9566A66E359F}.Debug|Win32.ActiveCfg = Debug|Win32 + {5586530C-8D6D-4ECE-B560-9566A66E359F}.Debug|Win32.Build.0 = Debug|Win32 + {5586530C-8D6D-4ECE-B560-9566A66E359F}.Release|Win32.ActiveCfg = Release|Win32 + {5586530C-8D6D-4ECE-B560-9566A66E359F}.Release|Win32.Build.0 = Release|Win32 + {2978F8D8-10AA-4335-8FF1-C8499849C182}.Debug|Win32.ActiveCfg = Debug|Win32 + {2978F8D8-10AA-4335-8FF1-C8499849C182}.Debug|Win32.Build.0 = Debug|Win32 + {2978F8D8-10AA-4335-8FF1-C8499849C182}.Release|Win32.ActiveCfg = Release|Win32 + {2978F8D8-10AA-4335-8FF1-C8499849C182}.Release|Win32.Build.0 = Release|Win32 + {6EB61FF3-51EA-42AF-AC8C-667A5FBF517A}.Debug|Win32.ActiveCfg = Debug|Win32 + {6EB61FF3-51EA-42AF-AC8C-667A5FBF517A}.Debug|Win32.Build.0 = Debug|Win32 + {6EB61FF3-51EA-42AF-AC8C-667A5FBF517A}.Release|Win32.ActiveCfg = Release|Win32 + {6EB61FF3-51EA-42AF-AC8C-667A5FBF517A}.Release|Win32.Build.0 = Release|Win32 + {DC249750-474E-4945-A938-2C93F98B4B92}.Debug|Win32.ActiveCfg = Debug|Win32 + {DC249750-474E-4945-A938-2C93F98B4B92}.Debug|Win32.Build.0 = Debug|Win32 + {DC249750-474E-4945-A938-2C93F98B4B92}.Release|Win32.ActiveCfg = Release|Win32 + {DC249750-474E-4945-A938-2C93F98B4B92}.Release|Win32.Build.0 = Release|Win32 + {70C02441-8A71-40E3-B737-C872FFFB0183}.Debug|Win32.ActiveCfg = Debug|Win32 + {70C02441-8A71-40E3-B737-C872FFFB0183}.Debug|Win32.Build.0 = Debug|Win32 + {70C02441-8A71-40E3-B737-C872FFFB0183}.Release|Win32.ActiveCfg = Release|Win32 + {70C02441-8A71-40E3-B737-C872FFFB0183}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Examples/C++/Build/Windows/PolycodeExamples/PolycodeExamples.vcxproj b/Examples/C++/Build/Windows/PolycodeExamples/PolycodeExamples.vcxproj new file mode 100644 index 000000000..60d5b2954 --- /dev/null +++ b/Examples/C++/Build/Windows/PolycodeExamples/PolycodeExamples.vcxproj @@ -0,0 +1,81 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {DF25B6DE-AF85-4AB9-9C60-67C445341DB7} + Win32Proj + PolycodeExamples + + + + Application + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + true + + + false + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + + + + \ No newline at end of file diff --git a/Modules/Contents/3DPhysics/Source/PolyPhysicsScene.cpp b/Modules/Contents/3DPhysics/Source/PolyPhysicsScene.cpp index f26799398..1792a72f1 100644 --- a/Modules/Contents/3DPhysics/Source/PolyPhysicsScene.cpp +++ b/Modules/Contents/3DPhysics/Source/PolyPhysicsScene.cpp @@ -204,7 +204,7 @@ PhysicsSceneEntity *PhysicsScene::getPhysicsEntityBySceneEntity(SceneEntity *ent PhysicsSceneEntity *PhysicsScene::trackPhysicsChild(SceneEntity *newEntity, int type, Number mass, Number friction, Number restitution, int group) { PhysicsSceneEntity *newPhysicsEntity = new PhysicsSceneEntity(newEntity, type, mass, friction,restitution); physicsWorld->addRigidBody(newPhysicsEntity->rigidBody, group, btBroadphaseProxy::AllFilter); //btBroadphaseProxy::StaticFilter|btBroadphaseProxy::DefaultFilter); - world->addCollisionObject(newPhysicsEntity->collisionObject, group); +// world->addCollisionObject(newPhysicsEntity->collisionObject, group); // newPhysicsEntity->rigidBody->setActivationState(ISLAND_SLEEPING); physicsChildren.push_back(newPhysicsEntity); collisionChildren.push_back(newPhysicsEntity); diff --git a/Modules/Contents/3DPhysics/Source/PolyPhysicsSceneEntity.cpp b/Modules/Contents/3DPhysics/Source/PolyPhysicsSceneEntity.cpp index 298b464f0..2d201a7d7 100644 --- a/Modules/Contents/3DPhysics/Source/PolyPhysicsSceneEntity.cpp +++ b/Modules/Contents/3DPhysics/Source/PolyPhysicsSceneEntity.cpp @@ -229,7 +229,7 @@ void PhysicsSceneEntity::Update() { free(mat); sceneEntity->setTransformByMatrixPure(m); - collisionObject->getWorldTransform().setFromOpenGLMatrix(mat); +// collisionObject->getWorldTransform().setFromOpenGLMatrix(mat); } SceneEntity *PhysicsSceneEntity::getSceneEntity() {