From 49499c49be8283682d849157765644a57f895c71 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sun, 31 Jul 2005 14:40:51 +0000 Subject: updated vc7 projectfiles so they work with bullet --- extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj | 5 +- extern/bullet/Bullet/CollisionShapes/BoxShape.cpp | 13 +- extern/bullet/Bullet/CollisionShapes/BoxShape.h | 11 +- .../ConvexConcaveCollisionAlgorithm.cpp | 2 +- extern/make/msvc_7_0/build_install_all.vcproj | 5 +- extern/make/msvc_7_0/extern.sln | 28 +--- extern/qhull/make/msvc_7_0/qhull.vcproj | 5 +- extern/solid/make/msvc_7_0/broad/broad.vcproj | 5 +- extern/solid/make/msvc_7_0/complex/complex.vcproj | 5 +- extern/solid/make/msvc_7_0/convex/convex.vcproj | 5 +- extern/solid/make/msvc_7_0/solid.vcproj | 5 +- .../SoundSystem/make/msvc_7_0/SoundSystem.vcproj | 5 +- .../make/msvc_7_0/dummy/DummySoundSystem.vcproj | 5 +- .../make/msvc_7_0/openal/OpenALSoundSystem.vcproj | 5 +- intern/bmfont/make/msvc_7_0/bmfont.vcproj | 5 +- intern/bsp/make/msvc_7_0/bsplib.vcproj | 5 +- intern/container/make/msvc_7_0/container.vcproj | 5 +- intern/decimation/make/msvc_7_0/decimation.vcproj | 5 +- intern/ghost/make/msvc_7_0/ghost.vcproj | 5 +- .../guardedalloc/make/msvc_7_0/guardedalloc.vcproj | 5 +- intern/iksolver/make/msvc_7_0/iksolver.vcproj | 5 +- intern/keymaker/make/msvc_7_0/blenkey.vcproj | 5 +- intern/make/msvc_7_0/build_install_all.vcproj | 5 +- intern/make/msvc_7_0/intern.sln | 2 +- intern/memutil/make/msvc_7_0/memutil.vcproj | 5 +- intern/moto/make/msvc_7_0/moto.vcproj | 5 +- intern/opennl/make/msvc_7_0/opennl.vcproj | 5 +- intern/string/make/msvc_7_0/string.vcproj | 5 +- .../BLO_readblenfile/BLO_readblenfile.vcproj | 5 +- .../blender/BPY_python/BPY_python.vcproj | 8 +- projectfiles_vc7/blender/avi/BL_avi.vcproj | 5 +- projectfiles_vc7/blender/blender.sln | 177 ++++++++++++++++++++- projectfiles_vc7/blender/blender.vcproj | 9 +- .../blender/blenkernel/BKE_blenkernel.vcproj | 5 +- .../blender/blenlib/BLI_blenlib.vcproj | 5 +- .../blenpluginapi/blenpluginapi.vcproj | 5 +- projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj | 5 +- projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj | 5 +- projectfiles_vc7/blender/img/BL_img.vcproj | 5 +- projectfiles_vc7/blender/loader/BLO_loader.vcproj | 5 +- .../blender/makesdna/DNA_makesdna.vcproj | 5 +- .../blender/radiosity/BRA_radiosity.vcproj | 5 +- projectfiles_vc7/blender/render/BRE_render.vcproj | 5 +- .../renderconverter/BRE_renderconverter.vcproj | 5 +- projectfiles_vc7/blender/src/BL_src.vcproj | 5 +- projectfiles_vc7/blender/src/BL_src_cre.vcproj | 5 +- projectfiles_vc7/blender/yafray/BRE_yafray.vcproj | 5 +- .../gameengine/blenderhook/KX_blenderhook.vcproj | 5 +- .../gameengine/converter/KX_converter.vcproj | 17 +- .../gameengine/expression/EXP_expressions.vcproj | 5 +- .../gameengine/gamelogic/SCA_GameLogic.vcproj | 5 +- .../gameengine/gameplayer/axctl/GP_axctl.vcproj | 5 +- .../gameengine/gameplayer/common/GP_common.vcproj | 5 +- .../gameengine/gameplayer/ghost/GP_ghost.vcproj | 5 +- .../gameengine/ketsji/KX_ketsji.vcproj | 17 +- .../gameengine/ketsji/network/KX_network.vcproj | 5 +- .../physics/PHY_Physics/PHY_Dummy/PHY_Dummy.vcproj | 5 +- .../physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj | 5 +- .../physics/PHY_Physics/PHY_Physics.vcproj | 5 +- .../physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj | 5 +- .../gameengine/rasterizer/RAS_rasterizer.vcproj | 5 +- .../openglrasterizer/RAS_openglrasterizer.vcproj | 5 +- .../gameengine/scenegraph/SG_SceneGraph.vcproj | 5 +- .../kernel/gen_messaging/gen_messaging.vcproj | 5 +- projectfiles_vc7/kernel/system/SYS_system.vcproj | 5 +- .../Converter/KX_BlenderSceneConverter.cpp | 3 + .../gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp | 3 + 67 files changed, 390 insertions(+), 175 deletions(-) diff --git a/extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj b/extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj index aedcbc35764..a2dcf685ed2 100644 --- a/extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj +++ b/extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj @@ -1,7 +1,7 @@ - + + GetMargin(); + float collisionMarginTriangle = 0.02f;//triangleMesh->GetMargin(); m_boxTriangleCallback.SetTimeStepAndCounters(timeStep,stepCount, collisionMarginTriangle,useContinuous); #ifdef USE_BOX_TRIANGLE diff --git a/extern/make/msvc_7_0/build_install_all.vcproj b/extern/make/msvc_7_0/build_install_all.vcproj index 334acec91c2..3396ecbb799 100644 --- a/extern/make/msvc_7_0/build_install_all.vcproj +++ b/extern/make/msvc_7_0/build_install_all.vcproj @@ -1,7 +1,7 @@ - + + diff --git a/extern/make/msvc_7_0/extern.sln b/extern/make/msvc_7_0/extern.sln index 19bbaa60d11..f62217f94ee 100644 --- a/extern/make/msvc_7_0/extern.sln +++ b/extern/make/msvc_7_0/extern.sln @@ -1,9 +1,7 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 +Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build_install_all", "build_install_all.vcproj", "{9C71A793-C177-4CAB-8EC5-923D500B39F8}" ProjectSection(ProjectDependencies) = postProject - {87D8C006-6DCC-4156-A03E-8CEA1B4C0580} = {87D8C006-6DCC-4156-A03E-8CEA1B4C0580} {F9850C15-FF0A-429E-9D47-89FB433C9BD8} = {F9850C15-FF0A-429E-9D47-89FB433C9BD8} - {E3D57F36-36AC-4E9A-B0E0-2AE4510FCBFE} = {E3D57F36-36AC-4E9A-B0E0-2AE4510FCBFE} {FFD3C64A-30E2-4BC7-BC8F-51818C320400} = {FFD3C64A-30E2-4BC7-BC8F-51818C320400} {D696C86B-0B53-4471-A50D-5B983A6FA4AD} = {D696C86B-0B53-4471-A50D-5B983A6FA4AD} {3427A9EF-FF84-4B3E-9AE5-C37CF44D7DA4} = {3427A9EF-FF84-4B3E-9AE5-C37CF44D7DA4} @@ -41,14 +39,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bullet3ContinuousCollision" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CcdPhysics", "..\..\bullet\make\msvc_7_0\Physics_Interface\CcdPhysics_vc7.vcproj", "{E3D57F36-36AC-4E9A-B0E0-2AE4510FCBFE}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PhysicsInterfaceCommon", "..\..\bullet\make\msvc_7_0\Physics_Interface\PhysicsInterfaceCommon_vc7.vcproj", "{87D8C006-6DCC-4156-A03E-8CEA1B4C0580}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bullet3Dynamics", "..\..\bullet\make\msvc_7_0\Dynamics\BulletDynamics_vc7.vcproj", "{3427A9EF-FF84-4B3E-9AE5-C37CF44D7DA4}" ProjectSection(ProjectDependencies) = postProject EndProjectSection @@ -125,22 +115,6 @@ Global {FFD3C64A-30E2-4BC7-BC8F-51818C320400}.Blender Debug.Build.0 = Blender Debug|Win32 {FFD3C64A-30E2-4BC7-BC8F-51818C320400}.Blender Release.ActiveCfg = Blender Release|Win32 {FFD3C64A-30E2-4BC7-BC8F-51818C320400}.Blender Release.Build.0 = Blender Release|Win32 - {E3D57F36-36AC-4E9A-B0E0-2AE4510FCBFE}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32 - {E3D57F36-36AC-4E9A-B0E0-2AE4510FCBFE}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32 - {E3D57F36-36AC-4E9A-B0E0-2AE4510FCBFE}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32 - {E3D57F36-36AC-4E9A-B0E0-2AE4510FCBFE}.3D Plugin Release.Build.0 = 3D Plugin Release|Win32 - {E3D57F36-36AC-4E9A-B0E0-2AE4510FCBFE}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {E3D57F36-36AC-4E9A-B0E0-2AE4510FCBFE}.Blender Debug.Build.0 = Blender Debug|Win32 - {E3D57F36-36AC-4E9A-B0E0-2AE4510FCBFE}.Blender Release.ActiveCfg = Blender Release|Win32 - {E3D57F36-36AC-4E9A-B0E0-2AE4510FCBFE}.Blender Release.Build.0 = Blender Release|Win32 - {87D8C006-6DCC-4156-A03E-8CEA1B4C0580}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32 - {87D8C006-6DCC-4156-A03E-8CEA1B4C0580}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32 - {87D8C006-6DCC-4156-A03E-8CEA1B4C0580}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32 - {87D8C006-6DCC-4156-A03E-8CEA1B4C0580}.3D Plugin Release.Build.0 = 3D Plugin Release|Win32 - {87D8C006-6DCC-4156-A03E-8CEA1B4C0580}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {87D8C006-6DCC-4156-A03E-8CEA1B4C0580}.Blender Debug.Build.0 = Blender Debug|Win32 - {87D8C006-6DCC-4156-A03E-8CEA1B4C0580}.Blender Release.ActiveCfg = Blender Release|Win32 - {87D8C006-6DCC-4156-A03E-8CEA1B4C0580}.Blender Release.Build.0 = Blender Release|Win32 {3427A9EF-FF84-4B3E-9AE5-C37CF44D7DA4}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32 {3427A9EF-FF84-4B3E-9AE5-C37CF44D7DA4}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32 {3427A9EF-FF84-4B3E-9AE5-C37CF44D7DA4}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32 diff --git a/extern/qhull/make/msvc_7_0/qhull.vcproj b/extern/qhull/make/msvc_7_0/qhull.vcproj index b9f8d8946fe..1b754d8e076 100644 --- a/extern/qhull/make/msvc_7_0/qhull.vcproj +++ b/extern/qhull/make/msvc_7_0/qhull.vcproj @@ -1,7 +1,7 @@ - + + - + + - + + - + + - + + - + + - + + - + + @@ -241,7 +241,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -241,7 +241,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -233,7 +233,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -241,7 +241,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -241,7 +241,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + - + + @@ -241,7 +241,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -239,7 +239,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + - + + diff --git a/intern/make/msvc_7_0/intern.sln b/intern/make/msvc_7_0/intern.sln index 5d95d6d77ed..604cb0bcc74 100644 --- a/intern/make/msvc_7_0/intern.sln +++ b/intern/make/msvc_7_0/intern.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 +Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build_install_all", "build_install_all.vcproj", "{02110D03-59DB-4571-8787-72B3C03B2F2D}" ProjectSection(ProjectDependencies) = postProject EndProjectSection diff --git a/intern/memutil/make/msvc_7_0/memutil.vcproj b/intern/memutil/make/msvc_7_0/memutil.vcproj index d5ba8bff173..c538f85450b 100644 --- a/intern/memutil/make/msvc_7_0/memutil.vcproj +++ b/intern/memutil/make/msvc_7_0/memutil.vcproj @@ -1,7 +1,7 @@ @@ -241,7 +241,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -241,7 +241,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -231,7 +231,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -239,7 +239,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -320,7 +320,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -116,7 +116,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + - - diff --git a/projectfiles_vc7/blender/avi/BL_avi.vcproj b/projectfiles_vc7/blender/avi/BL_avi.vcproj index 023a05a9b04..412ceb9e80f 100644 --- a/projectfiles_vc7/blender/avi/BL_avi.vcproj +++ b/projectfiles_vc7/blender/avi/BL_avi.vcproj @@ -1,7 +1,7 @@ @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -328,7 +328,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -320,7 +320,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -115,7 +115,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -322,7 +322,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -211,7 +211,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -416,7 +416,8 @@ DNA_makesdna.exe dna.c Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -115,7 +115,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -115,7 +115,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -115,7 +115,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -115,7 +115,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -116,7 +116,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + - + + @@ -118,7 +118,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -21,7 +21,7 @@ - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + - + + @@ -217,7 +217,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -159,7 +159,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -21,7 +21,7 @@ - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -320,7 +320,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -217,7 +217,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -320,7 +320,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -300,7 +300,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -320,7 +320,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + setDebugDrawer(new BlenderDebugDraw()); + + //disable / enable debug drawing (contact points, aabb's etc) + // ccdPhysEnv->setDebugMode(1); destinationscene->SetPhysicsEnvironment(ccdPhysEnv); break; } diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index db5d6fa1347..338e9448e94 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -864,6 +864,7 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj, { CcdPhysicsEnvironment* env = (CcdPhysicsEnvironment*)kxscene->GetPhysicsEnvironment(); + assert(env); @@ -928,6 +929,7 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj, ); bm = new CylinderShapeZ(halfExtents); bm->CalculateLocalInertia(ci.m_mass,ci.m_localInertiaTensor); + bm->SetMargin(0.05f); break; } @@ -946,6 +948,7 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj, bm = new ConeShape(objprop->m_boundobject.c.m_radius,objprop->m_boundobject.c.m_height); bm->CalculateLocalInertia(ci.m_mass,ci.m_localInertiaTensor); + bm->SetMargin(0.05f); break; -- cgit v1.2.3