[Soc-2005-cvs] CVS commit: soc-blender/extern/bullet SConscript
soc-blender/extern/bullet/Bullet
Bullet3_vc8.vcproj soc-blender/extern/bullet/Bullet/CollisionShapes
BoxShape.cpp
BoxShape.h ConvexHullShape.cpp ConvexShape.cpp CylinderShape.h
SphereShape.cpp SphereShape.h StridingMeshInterface.cpp ...
Chris Want
cwant at ualberta.ca
Tue Aug 9 02:56:34 CEST 2005
hos (Chris Want) 2005/08/09 02:56:34 CEST
Modified files:
soc-blender/extern/bullet SConscript
soc-blender/extern/bullet/Bullet Bullet3_vc8.vcproj
soc-blender/extern/bullet/Bullet/CollisionShapes BoxShape.cpp
BoxShape.h
ConvexHullShape.cpp
ConvexShape.cpp
CylinderShape.h
SphereShape.cpp
SphereShape.h
StridingMeshInterface.cpp
TriangleMeshShape.cpp
soc-blender/extern/bullet/Bullet/NarrowPhaseCollision
CollisionMargin.h
ConvexCast.h
GjkPairDetector.h
PersistentManifold.cpp
PersistentManifold.h
RaycastCallback.cpp
RaycastCallback.h
soc-blender/extern/bullet/BulletDynamics/CollisionDispatch
ConvexConcaveCollisionAlgorithm.cpp
ConvexConvexAlgorithm.cpp
ConvexConvexAlgorithm.h
ToiContactDispatcher.cpp
ToiContactDispatcher.h
soc-blender/extern/bullet/BulletDynamics/ConstraintSolver
ConstraintSolver.h
ContactConstraint.cpp
ContactSolverInfo.h
OdeConstraintSolver.cpp
OdeConstraintSolver.h
Point2PointConstraint.cpp
SimpleConstraintSolver.cpp
SimpleConstraintSolver.h
SorLcp.cpp
soc-blender/extern/bullet/BulletDynamics/Dynamics
ContactJoint.cpp
RigidBody.cpp
RigidBody.h
soc-blender/extern/bullet/Demos/CcdPhysicsDemo
CcdPhysicsDemo.cpp
soc-blender/extern/bullet/Demos/ConcaveDemo
ConcaveDemo_vc8.vcproj
ConcavePhysicsDemo.cpp
soc-blender/extern/bullet/Demos/OpenGL DebugCastResult.h
GL_ShapeDrawer.cpp
GL_ShapeDrawer.h
OpenGL_vc7.vcproj
RenderTexture.cpp
RenderTexture.h
soc-blender/extern/bullet/Demos/Raytracer Raytracer.cpp
soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics
CcdPhysicsController.cpp
CcdPhysicsController.h
CcdPhysicsEnvironment.cpp
CcdPhysicsEnvironment.h
soc-blender/extern/bullet/LinearMath SimdQuadWord.h
soc-blender/extern/bullet/make/msvc_7_0 Bullet3_vc7.vcproj
soc-blender/source/blender/blenkernel BKE_modifier.h
soc-blender/source/blender/blenkernel/intern modifier.c
soc-blender/source/blender/makesdna DNA_modifier_types.h
soc-blender/source/gameengine/Ketsji
KX_BulletPhysicsController.cpp
soc-blender/source/gameengine/Physics/Bullet
CcdPhysicsController.cpp
CcdPhysicsController.h
CcdPhysicsEnvironment.cpp
CcdPhysicsEnvironment.h
Log:
Post-merge conflict resolution
Revision Changes Path
1.2 +2 -2 soc-blender/extern/bullet/SConscript
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/SConscript.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.3 +9 -8 soc-blender/extern/bullet/Bullet/Bullet3_vc8.vcproj
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/Bullet3_vc8.vcproj.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
1.2 +24 -1 soc-blender/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +8 -23 soc-blender/extern/bullet/Bullet/CollisionShapes/BoxShape.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/BoxShape.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +3 -3 soc-blender/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +5 -2 soc-blender/extern/bullet/Bullet/CollisionShapes/ConvexShape.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/ConvexShape.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +17 -0 soc-blender/extern/bullet/Bullet/CollisionShapes/CylinderShape.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/CylinderShape.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +30 -14 soc-blender/extern/bullet/Bullet/CollisionShapes/SphereShape.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/SphereShape.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +1 -1 soc-blender/extern/bullet/Bullet/CollisionShapes/SphereShape.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/SphereShape.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +1 -1 soc-blender/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.3 +2 -1 soc-blender/extern/bullet/Bullet/CollisionShapes/TriangleMeshShape.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/CollisionShapes/TriangleMeshShape.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
1.2 +1 -1 soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/CollisionMargin.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/CollisionMargin.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +9 -3 soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/ConvexCast.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/ConvexCast.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +4 -0 soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +5 -0 soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +7 -5 soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +14 -8 soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +2 -2 soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.3 +8 -4 soc-blender/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
1.2 +43 -8 soc-blender/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +4 -4 soc-blender/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +27 -34 soc-blender/extern/bullet/BulletDynamics/CollisionDispatch/ToiContactDispatcher.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/CollisionDispatch/ToiContactDispatcher.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +22 -4 soc-blender/extern/bullet/BulletDynamics/CollisionDispatch/ToiContactDispatcher.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/CollisionDispatch/ToiContactDispatcher.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +2 -1 soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/ConstraintSolver.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/ConstraintSolver.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +30 -10 soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +2 -1 soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/ContactSolverInfo.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/ContactSolverInfo.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +44 -30 soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +31 -1 soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +1 -1 soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/Point2PointConstraint.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/Point2PointConstraint.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +9 -3 soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +5 -3 soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +19 -11 soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +24 -9 soc-blender/extern/bullet/BulletDynamics/Dynamics/ContactJoint.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/Dynamics/ContactJoint.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +16 -7 soc-blender/extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +26 -2 soc-blender/extern/bullet/BulletDynamics/Dynamics/RigidBody.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/Dynamics/RigidBody.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +8 -21 soc-blender/extern/bullet/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.3 +8 -1 soc-blender/extern/bullet/Demos/ConcaveDemo/ConcaveDemo_vc8.vcproj
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/ConcaveDemo/ConcaveDemo_vc8.vcproj.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
1.2 +4 -14 soc-blender/extern/bullet/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +13 -0 soc-blender/extern/bullet/Demos/OpenGL/DebugCastResult.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/OpenGL/DebugCastResult.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +4 -0 soc-blender/extern/bullet/Demos/OpenGL/GL_ShapeDrawer.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/OpenGL/GL_ShapeDrawer.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +2 -0 soc-blender/extern/bullet/Demos/OpenGL/GL_ShapeDrawer.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/OpenGL/GL_ShapeDrawer.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +6 -0 soc-blender/extern/bullet/Demos/OpenGL/OpenGL_vc7.vcproj
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/OpenGL/OpenGL_vc7.vcproj.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +11 -0 soc-blender/extern/bullet/Demos/OpenGL/RenderTexture.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/OpenGL/RenderTexture.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +11 -0 soc-blender/extern/bullet/Demos/OpenGL/RenderTexture.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/OpenGL/RenderTexture.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.3 +2 -2 soc-blender/extern/bullet/Demos/Raytracer/Raytracer.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/Raytracer/Raytracer.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
1.2 +42 -31 soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +9 -6 soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +244 -33 soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +22 -6 soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.3 +2 -2 soc-blender/extern/bullet/LinearMath/SimdQuadWord.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/LinearMath/SimdQuadWord.h.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
1.2 +38 -39 soc-blender/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.4 +7 -2 soc-blender/source/blender/blenkernel/BKE_modifier.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/blenkernel/BKE_modifier.h.diff?r1=1.3&r2=1.4&cvsroot=soc-2005>
1.5 +179 -97 soc-blender/source/blender/blenkernel/intern/modifier.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/blenkernel/intern/modifier.c.diff?r1=1.4&r2=1.5&cvsroot=soc-2005>
1.4 +4 -0 soc-blender/source/blender/makesdna/DNA_modifier_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/makesdna/DNA_modifier_types.h.diff?r1=1.3&r2=1.4&cvsroot=soc-2005>
1.2 +12 -0 soc-blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.3 +72 -32 soc-blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
1.2 +14 -7 soc-blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.3 +242 -118 soc-blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
1.2 +22 -6 soc-blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
More information about the Soc-2005-cvs
mailing list