Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated version to 2.59, fixed 16 byte alignment for BVH serialization

Browse Source
This commit is contained in:
ejcoumans
2007-09-11 06:37:27 +00:00
parent a71e9c3e5a
commit bd2c83e535
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1,3 +1,3 @@
Bullet Collision Detection and Physics Library version 2.58 Bullet Collision Detection and Physics Library version 2.59
http://bullet.sourceforge.net http://bullet.sourceforge.net

20
configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for bullet 2.58. # Generated by GNU Autoconf 2.59 for bullet 2.59.
# #
# Report bugs to <bullet@erwincoumans.com>. # Report bugs to <bullet@erwincoumans.com>.
# #
@@ -271,8 +271,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='bullet' PACKAGE_NAME='bullet'
PACKAGE_TARNAME='bullet' PACKAGE_TARNAME='bullet'
PACKAGE_VERSION='2.58' PACKAGE_VERSION='2.59'
PACKAGE_STRING='bullet 2.58' PACKAGE_STRING='bullet 2.59'
PACKAGE_BUGREPORT='bullet@erwincoumans.com' PACKAGE_BUGREPORT='bullet@erwincoumans.com'
ac_unique_file="mk/jam/build.jam" ac_unique_file="mk/jam/build.jam"
@@ -790,7 +790,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures bullet 2.58 to adapt to many kinds of systems. \`configure' configures bullet 2.59 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -855,7 +855,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of bullet 2.58:";; short | recursive ) echo "Configuration of bullet 2.59:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@@ -980,7 +980,7 @@ fi
test -n "$ac_init_help" && exit 0 test -n "$ac_init_help" && exit 0
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
bullet configure 2.58 bullet configure 2.59
generated by GNU Autoconf 2.59 generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc. Copyright (C) 2003 Free Software Foundation, Inc.
@@ -994,7 +994,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by bullet $as_me 2.58, which was It was created by bullet $as_me 2.59, which was
generated by GNU Autoconf 2.59. Invocation command line was generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@ $ $0 $@
@@ -9898,7 +9898,7 @@ cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_NAME ?= \"$PACKAGE_NAME\" ;
" "
cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_COPYRIGHT ?= \"$PACKAGE_COPYRIGHT\" ; cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_COPYRIGHT ?= \"$PACKAGE_COPYRIGHT\" ;
" "
for cs_veritem in 2 58; do for cs_veritem in 2 59; do
cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_VERSION_LIST += \"$cs_veritem\" ; cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_VERSION_LIST += \"$cs_veritem\" ;
" "
done done
@@ -10275,7 +10275,7 @@ _ASBOX
} >&5 } >&5
cat >&5 <<_CSEOF cat >&5 <<_CSEOF
This file was extended by bullet $as_me 2.58, which was This file was extended by bullet $as_me 2.59, which was
generated by GNU Autoconf 2.59. Invocation command line was generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@@ -10338,7 +10338,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\ ac_cs_version="\\
bullet config.status 2.58 bullet config.status 2.59
configured by $0, generated by GNU Autoconf 2.59, configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

2
configure.ac
View File

@@ -9,7 +9,7 @@ AC_PREREQ([2.54])
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
AC_INIT( AC_INIT(
[bullet], [bullet],
[2.58], [2.59],
[bullet@erwincoumans.com]) [bullet@erwincoumans.com])
CS_PACKAGEINFO( CS_PACKAGEINFO(
[Bullet Continuous Collision Detection and Physics Library], [Bullet Continuous Collision Detection and Physics Library],

8
src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
View File

@@ -956,7 +956,7 @@ bool btOptimizedBvh::serialize(void *o_alignedDataBuffer, unsigned i_dataBufferS
unsigned char *nodeData = (unsigned char *)targetBvh; unsigned char *nodeData = (unsigned char *)targetBvh;
nodeData += sizeof(btOptimizedBvh); nodeData += sizeof(btOptimizedBvh);
unsigned sizeToAdd = (unsigned)nodeData & BVH_ALIGNMENT_MASK; unsigned sizeToAdd = BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK);
nodeData += sizeToAdd; nodeData += sizeToAdd;
int nodeCount = m_curNodeIndex; int nodeCount = m_curNodeIndex;
@@ -1031,7 +1031,7 @@ bool btOptimizedBvh::serialize(void *o_alignedDataBuffer, unsigned i_dataBufferS
nodeData += sizeof(btOptimizedBvhNode) * nodeCount; nodeData += sizeof(btOptimizedBvhNode) * nodeCount;
} }
sizeToAdd = (unsigned)nodeData & BVH_ALIGNMENT_MASK; sizeToAdd = BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK);
nodeData += sizeToAdd; nodeData += sizeToAdd;
// Now serialize the subtree headers // Now serialize the subtree headers
@@ -1106,7 +1106,7 @@ btOptimizedBvh *btOptimizedBvh::deSerializeInPlace(void *i_alignedDataBuffer, un
unsigned char *nodeData = (unsigned char *)bvh; unsigned char *nodeData = (unsigned char *)bvh;
nodeData += sizeof(btOptimizedBvh); nodeData += sizeof(btOptimizedBvh);
unsigned sizeToAdd = (unsigned)nodeData & BVH_ALIGNMENT_MASK; unsigned sizeToAdd = BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK);
nodeData += sizeToAdd; nodeData += sizeToAdd;
int nodeCount = bvh->m_curNodeIndex; int nodeCount = bvh->m_curNodeIndex;
@@ -1155,7 +1155,7 @@ btOptimizedBvh *btOptimizedBvh::deSerializeInPlace(void *i_alignedDataBuffer, un
nodeData += sizeof(btOptimizedBvhNode) * nodeCount; nodeData += sizeof(btOptimizedBvhNode) * nodeCount;
} }
sizeToAdd = (unsigned)nodeData & BVH_ALIGNMENT_MASK; sizeToAdd = BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK);
nodeData += sizeToAdd; nodeData += sizeToAdd;
// Now serialize the subtree headers // Now serialize the subtree headers