Skip to content

Commit d84bd0f

Browse files
crabmusketcrabmusket
committed
Merge branch 'release-3.7'
2 parents cda7097 + 0759fe5 commit d84bd0f

File tree

2,761 files changed

+423771
-26554
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,761 files changed

+423771
-26554
lines changed

‎.gitattributes‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,16 @@
33

44
# Set to always use Windows line endings
55
*.cs text eol=crlf
6+
7+
# Explicitly declare text files we want to always be normalized and converted
8+
# to native line endings on checkout.
9+
*.c text
10+
*.h text
11+
*.cpp text
12+
*.hpp text
13+
*.ppm text
14+
*.nsh text
15+
*.nlf text
16+
*.command
17+
*.txt
18+
*.ini

‎Engine/lib/bullet/CMakeLists.txt‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
55
SET(MSVC_INCREMENTAL_DEFAULT ON)
66

77
PROJECT(BULLET_PHYSICS)
8-
SET(BULLET_VERSION 2.81)
8+
SET(BULLET_VERSION 2.82)
99

1010
IF(COMMAND cmake_policy)
1111
cmake_policy(SET CMP0003 NEW)
@@ -113,7 +113,7 @@ IF (BUILD_MULTITHREADING)
113113
ELSE(CMAKE_CL_64)
114114
SET(CMAKE_NVSDKCOMPUTE_LIBPATH ${NVIDIA_OPENCL_BASE_DIR}/lib/Win32 )
115115
ENDIF(CMAKE_CL_64)
116-
SET(NVIDIA_OPENCL_LIBRARIES ${CMAKE_NVSDKCOMPUTE_LIBPATH}/OpenCL.lib)
116+
SET(NVIDIA_OPENCL_LIBRARIES ${CMAKE_NVSDKCOMPUTE_LIBPATH}/OpenCL.lib)
117117

118118
OPTION(BUILD_NVIDIA_OPENCL_DEMOS "Build OpenCL demos for NVidia (GPU)" ON)
119119
ELSE()
@@ -214,9 +214,13 @@ IF(MSVC)
214214
ENDFOREACH(flag_var)
215215
ENDIF (NOT USE_MSVC_RUNTIME_LIBRARY_DLL)
216216

217-
OPTION(USE_MSVC_SSE "Use MSVC /arch:sse option" ON)
218-
IF (USE_MSVC_SSE)
217+
IF (CMAKE_CL_64)
218+
ADD_DEFINITIONS(-D_WIN64)
219+
ELSE()
220+
OPTION(USE_MSVC_SSE "Use MSVC /arch:sse option" ON)
221+
IF (USE_MSVC_SSE)
219222
ADD_DEFINITIONS(/arch:SSE)
223+
ENDIF()
220224
ENDIF()
221225
OPTION(USE_MSVC_FAST_FLOATINGPOINT "Use MSVC /fp:fast option" ON)
222226
IF (USE_MSVC_FAST_FLOATINGPOINT)
@@ -418,3 +422,18 @@ OPTION(BUILD_UNIT_TESTS "Build Unit Tests" OFF)
418422
IF (BUILD_UNIT_TESTS)
419423
SUBDIRS(UnitTests)
420424
ENDIF()
425+
426+
set (BULLET_CONFIG_CMAKE_PATH lib${LIB_SUFFIX}/cmake/bullet )
427+
list (APPEND BULLET_LIBRARIES LinearMath)
428+
list (APPEND BULLET_LIBRARIES BulletCollisions)
429+
list (APPEND BULLET_LIBRARIES BulletDynamics)
430+
list (APPEND BULLET_LIBRARIES BulletSoftBody)
431+
set (BULLET_USE_FILE ${CMAKE_INSTALL_PREFIX}/${BULLET_CONFIG_CMAKE_PATH}/UseBullet.cmake)
432+
configure_file ( ${CMAKE_SOURCE_DIR}/BulletConfig.cmake.in
433+
${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
434+
@ONLY ESCAPE_QUOTES
435+
)
436+
install ( FILES ${CMAKE_SOURCE_DIR}/UseBullet.cmake
437+
${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
438+
DESTINATION ${BULLET_CONFIG_CMAKE_PATH}
439+
)

‎Engine/lib/bullet/COPYING‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/*
2+
Bullet Continuous Collision Detection and Physics Library
3+
Copyright (c) 2003-2011 Erwin Coumans http://bulletphysics.org
4+
5+
This software is provided 'as-is', without any express or implied warranty.
6+
In no event will the authors be held liable for any damages arising from the use of this software.
7+
Permission is granted to anyone to use this software for any purpose,
8+
including commercial applications, and to alter it and redistribute it freely,
9+
subject to the following restrictions:
10+
11+
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
12+
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
13+
3. This notice may not be removed or altered from any source distribution.
14+
*/
15+
16+
All files in the Bullet/src folder are under this Zlib license.
17+
Files in the Extras and Demos folder may have a different license, see the respective files.

‎Engine/lib/bullet/ChangeLog‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ Primary author and maintainer: Erwin Coumans
44
This ChangeLog is incomplete, for an up-to-date list of all fixed issues see http://bullet.googlecode.com
55
using http://tinyurl.com/yabmjjj
66

7+
2013 October 23
8+
- Bullet 2.82 release
9+
- See docs/BulletQuickstart.pdf or issue tracked for details.
10+
711
2012 September 10
812
- Bullet 2.81 release preparation
913

‎Engine/lib/bullet/RELEASING.TXT‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ This document details the steps necessary to package a release of Bullet.
22

33
1) Preparing for release:
44

5-
update VERSION in several places
6-
update ChangeLog
7-
regenerate MSVC project files
5+
update VERSION in several places (/VERSION file, /CMakeLists.txt, /configure.ac, /src/LinearMath/btScalar.h, /src/LinearMath/btSerializer.h around line 441)
6+
re-generate serialization structures, if they changed (/src/LinearMath/btSerializer.cpp using makesdna)
7+
update ChangeLog with larger/important changes
8+
regenerate MSVC project files using build/vs_all.bat
9+
create a Subversion tag revision in bullet.googlecode.com/svn/tags/bullet-<VERSION>
810

911
2) Generating the release .zip:
1012
Do an SVN export on a Windows machine into the directory: bullet-X.YY

‎Engine/lib/bullet/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.81
1+
2.82

‎Engine/lib/bullet/configure.ac‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ AC_PREREQ([2.54])
99
#----------------------------------------------------------------------------
1010
AC_INIT(
1111
[bullet],
12-
[2.81],
13-
[bullet@erwincoumans.com])
12+
[2.82],
13+
[erwin.coumans@gmail.com])
1414
AC_CANONICAL_HOST
1515
AC_CONFIG_SRCDIR([configure.ac])
1616
AM_INIT_AUTOMAKE
@@ -163,7 +163,7 @@ CXXFLAGS="$ARCH_SPECIFIC_CFLAGS $CXXFLAGS $CFLAGS"
163163
#----------------------------------------------------------------------------
164164
# Emit generated files.
165165
#----------------------------------------------------------------------------
166-
AC_CONFIG_FILES([bullet.pc Makefile Demos/Makefile Demos/SoftDemo/Makefile Demos/AllBulletDemos/Makefile Demos/MultiThreadedDemo/Makefile Demos/OpenGL/Makefile Demos/BasicDemo/Makefile Demos/CcdPhysicsDemo/Makefile Demos/VehicleDemo/Makefile Demos/TerrainDemo/Makefile src/Makefile Extras/Makefile])
166+
AC_CONFIG_FILES([bullet.pc Makefile Demos/Makefile Demos/SoftDemo/Makefile Demos/AllBulletDemos/Makefile Demos/MultiThreadedDemo/Makefile Demos/OpenGL/Makefile Demos/ForkLiftDemo/Makefile Demos/FeatherstoneMultiBodyDemo/Makefile Demos/BasicDemo/Makefile Demos/CcdPhysicsDemo/Makefile Demos/VehicleDemo/Makefile Demos/TerrainDemo/Makefile src/Makefile Extras/Makefile])
167167
AC_OUTPUT
168168

169169
AC_MSG_NOTICE([

‎Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDispatcher.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ class btOverlappingPairCache;
2525
struct btCollisionObjectWrapper;
2626

2727
class btPersistentManifold;
28-
class btStackAlloc;
2928
class btPoolAllocator;
3029

3130
struct btDispatcherInfo
@@ -47,8 +46,7 @@ struct btDispatcherInfo
4746
m_useEpa(true),
4847
m_allowedCcdPenetration(btScalar(0.04)),
4948
m_useConvexConservativeDistanceUtil(false),
50-
m_convexConservativeDistanceThreshold(0.0f),
51-
m_stackAllocator(0)
49+
m_convexConservativeDistanceThreshold(0.0f)
5250
{
5351

5452
}
@@ -64,7 +62,6 @@ struct btDispatcherInfo
6462
btScalar m_allowedCcdPenetration;
6563
bool m_useConvexConservativeDistanceUtil;
6664
btScalar m_convexConservativeDistanceThreshold;
67-
btStackAlloc* m_stackAllocator;
6865
};
6966

7067
///The btDispatcher interface class can be used in combination with broadphase to dispatch calculations for overlapping pairs.

‎Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ btHashedOverlappingPairCache::~btHashedOverlappingPairCache()
5353

5454
void btHashedOverlappingPairCache::cleanOverlappingPair(btBroadphasePair& pair,btDispatcher* dispatcher)
5555
{
56-
if (pair.m_algorithm)
56+
if (pair.m_algorithm && dispatcher)
5757
{
5858
{
5959
pair.m_algorithm->~btCollisionAlgorithm();

‎Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,12 @@ class btHashedOverlappingPairCache : public btOverlappingPairCache
9696
btOverlapFilterCallback* m_overlapFilterCallback;
9797
bool m_blockedForChanges;
9898

99+
protected:
100+
101+
btAlignedObjectArray<int> m_hashTable;
102+
btAlignedObjectArray<int> m_next;
103+
btOverlappingPairCallback* m_ghostPairCallback;
104+
99105

100106
public:
101107
btHashedOverlappingPairCache();
@@ -265,11 +271,6 @@ class btHashedOverlappingPairCache : public btOverlappingPairCache
265271
virtual void sortOverlappingPairs(btDispatcher* dispatcher);
266272

267273

268-
protected:
269-
270-
btAlignedObjectArray<int> m_hashTable;
271-
btAlignedObjectArray<int> m_next;
272-
btOverlappingPairCallback* m_ghostPairCallback;
273274

274275
};
275276

0 commit comments

Comments
 (0)