mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into allocators

Browse Source
This commit is contained in:
Daniel Chappuis 2019-03-11 11:14:27 +01:00
commit 246f2312b9
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
GenerateNewVersion.py
View File

@ -19,7 +19,7 @@ def findReplaceText(directory, findRegex, substituteExpr, filePattern):
# ----- Code ----- # # ----- Code ----- #
# Read new version number from user # Read old version number from user
oldVersion = raw_input("Enter the old version string: ") oldVersion = raw_input("Enter the old version string: ")
# Read new version number from user # Read new version number from user
@ -32,10 +32,14 @@ file.write(newVersion + "\n")
file.close() file.close()
print("Version number has been updated in VERSION file") print("Version number has been updated in VERSION file")
# Update the RP3D version number in the documentation/API/Doxyfile # Update the RP3D version number in the documentation/API/Doxyfile file
findReplaceText("documentation/API/", r'(PROJECT_NUMBER[ \t]+=[ \t]+)"[\d\.]+"', r'\g<1>"' + newVersion + '"', "Doxyfile") findReplaceText("documentation/API/", r'(PROJECT_NUMBER[ \t]+=[ \t]+)"[\d\.]+"', r'\g<1>"' + newVersion + '"', "Doxyfile")
print("Version number has been updated in documentation/API/Doxyfile file") print("Version number has been updated in documentation/API/Doxyfile file")
# Update the RP3D version number in the documentation/UserManual/title.tex file
findReplaceText("documentation/UserManual/", r'(Version:[\s]+)[\d\.]+', r'\g<1>' + newVersion, "title.tex")
print("Version number has been updated in documentation/API/Doxyfile file")
# Update the RP3D version number in the src/configuration.h file # Update the RP3D version number in the src/configuration.h file
findReplaceText("src/", r'(RP3D_VERSION[ \t]+=[ \t]+std::string\()"[\d\.]+"', r'\g<1>"' + newVersion + '"', "configuration.h") findReplaceText("src/", r'(RP3D_VERSION[ \t]+=[ \t]+std::string\()"[\d\.]+"', r'\g<1>"' + newVersion + '"', "configuration.h")
print("Version number has been updated in src/configuration.h file") print("Version number has been updated in src/configuration.h file")
@ -48,4 +52,3 @@ print("Copyright date has been updated in LICENSE file")
findReplaceText("src/", '(Copyright ' + re.escape("(c)") + r' 2010-)[\d]+', r'\g<1>' + str(date.today().year), "*.h") findReplaceText("src/", '(Copyright ' + re.escape("(c)") + r' 2010-)[\d]+', r'\g<1>' + str(date.today().year), "*.h")
findReplaceText("src/", '(Copyright ' + re.escape("(c)") + r' 2010-)[\d]+', r'\g<1>' + str(date.today().year), "*.cpp") findReplaceText("src/", '(Copyright ' + re.escape("(c)") + r' 2010-)[\d]+', r'\g<1>' + str(date.today().year), "*.cpp")
print("Copyright date in license has been updated in all source code files") print("Copyright date in license has been updated in all source code files")

4
src/body/RigidBody.cpp
View File

@ -552,6 +552,9 @@ void RigidBody::updateBroadPhaseState() const {
// For all the proxy collision shapes of the body // For all the proxy collision shapes of the body
for (ProxyShape* shape = mProxyCollisionShapes; shape != nullptr; shape = shape->mNext) { for (ProxyShape* shape = mProxyCollisionShapes; shape != nullptr; shape = shape->mNext) {
// If the proxy-shape shape is still part of the broad-phase
if (shape->getBroadPhaseId() != -1) {
// Recompute the world-space AABB of the collision shape // Recompute the world-space AABB of the collision shape
AABB aabb; AABB aabb;
shape->getCollisionShape()->computeAABB(aabb, mTransform * shape->getLocalToBodyTransform()); shape->getCollisionShape()->computeAABB(aabb, mTransform * shape->getLocalToBodyTransform());
@ -560,6 +563,7 @@ void RigidBody::updateBroadPhaseState() const {
mWorld.mCollisionDetection.updateProxyCollisionShape(shape, aabb, displacement); mWorld.mCollisionDetection.updateProxyCollisionShape(shape, aabb, displacement);
} }
} }
}
#ifdef IS_PROFILING_ACTIVE #ifdef IS_PROFILING_ACTIVE