diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2005-07-31 18:40:51 +0400 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2005-07-31 18:40:51 +0400 |
commit | 49499c49be8283682d849157765644a57f895c71 (patch) | |
tree | d1b4b65ed8a19e97ce19b8df3b2e8597c30206ac /extern | |
parent | 3b7d40cfdb524403a094e50128d2b74e822f0351 (diff) |
updated vc7 projectfiles so they work with bullet
Diffstat (limited to 'extern')
-rw-r--r-- | extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj | 5 | ||||
-rw-r--r-- | extern/bullet/Bullet/CollisionShapes/BoxShape.cpp | 13 | ||||
-rw-r--r-- | extern/bullet/Bullet/CollisionShapes/BoxShape.h | 11 | ||||
-rw-r--r-- | extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp | 2 | ||||
-rw-r--r-- | extern/make/msvc_7_0/build_install_all.vcproj | 5 | ||||
-rw-r--r-- | extern/make/msvc_7_0/extern.sln | 28 | ||||
-rw-r--r-- | extern/qhull/make/msvc_7_0/qhull.vcproj | 5 | ||||
-rw-r--r-- | extern/solid/make/msvc_7_0/broad/broad.vcproj | 5 | ||||
-rw-r--r-- | extern/solid/make/msvc_7_0/complex/complex.vcproj | 5 | ||||
-rw-r--r-- | extern/solid/make/msvc_7_0/convex/convex.vcproj | 5 | ||||
-rw-r--r-- | extern/solid/make/msvc_7_0/solid.vcproj | 5 |
11 files changed, 37 insertions, 52 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 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.0" + Version="7.10" Name="ftgl_static_lib" ProjectGUID="{F9850C15-FF0A-429E-9D47-89FB433C9BD8}" SccProjectName="" @@ -242,7 +242,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> - + <References> + </References> <Files> <Filter Name="Source Files" diff --git a/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp b/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp index 37552194df0..12fbd895bb3 100644 --- a/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp @@ -12,12 +12,10 @@ #include "BoxShape.h" SimdVector3 BoxShape::GetHalfExtents() const -{ - SimdVector3 scalingCorrectedHalfExtents = m_boxHalfExtents1 * m_localScaling; - SimdVector3 marginCorrection (CONVEX_DISTANCE_MARGIN,CONVEX_DISTANCE_MARGIN,CONVEX_DISTANCE_MARGIN); - return (scalingCorrectedHalfExtents - marginCorrection).absolute(); +{ + return m_boxHalfExtents1 * m_localScaling; } - +//{ void BoxShape::GetAabb(const SimdTransform& t,SimdVector3& aabbMin,SimdVector3& aabbMax) const @@ -33,9 +31,8 @@ void BoxShape::GetAabb(const SimdTransform& t,SimdVector3& aabbMin,SimdVector3& //todo: this is a quick fix, we need to enlarge the aabb dependent on several criteria - SimdVector3 extra(CONVEX_DISTANCE_MARGIN,CONVEX_DISTANCE_MARGIN,CONVEX_DISTANCE_MARGIN); - extent += extra; - + //extent += SimdVector3(.2f,.2f,.2f); + aabbMin = center - extent; aabbMax = center + extent; diff --git a/extern/bullet/Bullet/CollisionShapes/BoxShape.h b/extern/bullet/Bullet/CollisionShapes/BoxShape.h index 9d7806fc522..755de78dffb 100644 --- a/extern/bullet/Bullet/CollisionShapes/BoxShape.h +++ b/extern/bullet/Bullet/CollisionShapes/BoxShape.h @@ -33,6 +33,10 @@ public: } SimdVector3 GetHalfExtents() const; + //{ return m_boxHalfExtents1 * m_localScaling;} + //const SimdVector3& GetHalfExtents() const{ return m_boxHalfExtents1;} + + virtual int GetShapeType() const { return BOX_SHAPE_PROXYTYPE;} @@ -40,13 +44,14 @@ public: { SimdVector3 halfExtents = GetHalfExtents(); - + SimdVector3 margin(GetMargin(),GetMargin(),GetMargin()); + halfExtents -= margin; + SimdVector3 supVertex; supVertex = SimdPoint3(vec.x() < SimdScalar(0.0f) ? -halfExtents.x() : halfExtents.x(), vec.y() < SimdScalar(0.0f) ? -halfExtents.y() : halfExtents.y(), vec.z() < SimdScalar(0.0f) ? -halfExtents.z() : halfExtents.z()); - if ( GetMargin()!=0.f ) { SimdVector3 vecnorm = vec; @@ -64,6 +69,8 @@ public: virtual SimdVector3 LocalGetSupportingVertexWithoutMargin(const SimdVector3& vec)const { SimdVector3 halfExtents = GetHalfExtents(); + SimdVector3 margin(GetMargin(),GetMargin(),GetMargin()); + halfExtents -= margin; return SimdVector3(vec.x() < SimdScalar(0.0f) ? -halfExtents.x() : halfExtents.x(), vec.y() < SimdScalar(0.0f) ? -halfExtents.y() : halfExtents.y(), diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp index 54cbd6ca5d6..b0415c75d61 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp +++ b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp @@ -143,7 +143,7 @@ void ConvexConcaveCollisionAlgorithm::ProcessCollision (BroadphaseProxy* ,Broadp if (m_convex.IsConvexShape()) { - float collisionMarginTriangle = triangleMesh->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 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.0" + Version="7.10" Name="build_install_all" ProjectGUID="{9C71A793-C177-4CAB-8EC5-923D500B39F8}" RootNamespace="build_install_all" @@ -76,7 +76,8 @@ Name="VCPreBuildEventTool"/> </Configuration> </Configurations> - + <References> + </References> <Files> </Files> <Globals> 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 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.0" + Version="7.10" Name="qhull" ProjectGUID="{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}" SccProjectName="" @@ -234,7 +234,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> - + <References> + </References> <Files> <Filter Name="Source Files" diff --git a/extern/solid/make/msvc_7_0/broad/broad.vcproj b/extern/solid/make/msvc_7_0/broad/broad.vcproj index 24a2cfbabca..adb56424e60 100644 --- a/extern/solid/make/msvc_7_0/broad/broad.vcproj +++ b/extern/solid/make/msvc_7_0/broad/broad.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.0" + Version="7.10" Name="broad" ProjectGUID="{0112CAD5-3584-412A-A2E5-1315A00437B4}" SccProjectName="" @@ -218,7 +218,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> - + <References> + </References> <Files> <Filter Name="Source Files" diff --git a/extern/solid/make/msvc_7_0/complex/complex.vcproj b/extern/solid/make/msvc_7_0/complex/complex.vcproj index efe2d2d640d..2a895fa28d3 100644 --- a/extern/solid/make/msvc_7_0/complex/complex.vcproj +++ b/extern/solid/make/msvc_7_0/complex/complex.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.0" + Version="7.10" Name="complex" ProjectGUID="{B83C6BED-11EC-46C8-AFFA-121EEDE94373}" SccProjectName="" @@ -220,7 +220,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> - + <References> + </References> <Files> <Filter Name="Source Files" diff --git a/extern/solid/make/msvc_7_0/convex/convex.vcproj b/extern/solid/make/msvc_7_0/convex/convex.vcproj index 3375de3e8da..da088b5972f 100644 --- a/extern/solid/make/msvc_7_0/convex/convex.vcproj +++ b/extern/solid/make/msvc_7_0/convex/convex.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.0" + Version="7.10" Name="convex" ProjectGUID="{524264F4-DF21-4B79-847F-E7CA643ECD0B}" SccProjectName="" @@ -218,7 +218,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> - + <References> + </References> <Files> <Filter Name="Source Files" diff --git a/extern/solid/make/msvc_7_0/solid.vcproj b/extern/solid/make/msvc_7_0/solid.vcproj index 74539d9778d..d9e6332987c 100644 --- a/extern/solid/make/msvc_7_0/solid.vcproj +++ b/extern/solid/make/msvc_7_0/solid.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.0" + Version="7.10" Name="solid" ProjectGUID="{D696C86B-0B53-4471-A50D-5B983A6FA4AD}" SccProjectName="" @@ -242,7 +242,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> - + <References> + </References> <Files> <Filter Name="Source Files" |