[Soc-2005-cvs] CVS commit: soc-blender/extern/bullet/Bullet
Bullet3_vc8.vcproj soc-blender/extern/bullet/Bullet/CollisionShapes
BoxShape.cpp soc-blender/extern/bullet/Bullet/NarrowPhaseCollision
ManifoldPoint.h
MinkowskiPenetrationDepthSolver.cpp PersistentManifold.cpp
PersistentManifold.h
soc-blender/extern/bullet/BulletDynamics/CollisionDispatch
ConvexConvexAlgorithm.cpp ToiContactDispatcher.cpp ...
Chris Want
cwant at ualberta.ca
Sun Aug 14 21:27:09 CEST 2005
hos (Chris Want) 2005/08/14 21:27:09 CEST
Modified files:
soc-blender/extern/bullet/Bullet Bullet3_vc8.vcproj
soc-blender/extern/bullet/Bullet/CollisionShapes BoxShape.cpp
soc-blender/extern/bullet/Bullet/NarrowPhaseCollision
ManifoldPoint.h
MinkowskiPenetrationDepthSolver.cpp
PersistentManifold.cpp
PersistentManifold.h
soc-blender/extern/bullet/BulletDynamics/CollisionDispatch
ConvexConvexAlgorithm.cpp
ToiContactDispatcher.cpp
soc-blender/extern/bullet/BulletDynamics/ConstraintSolver
ContactConstraint.cpp
ContactConstraint.h
OdeConstraintSolver.cpp
SimpleConstraintSolver.cpp
SorLcp.cpp
soc-blender/extern/bullet/BulletDynamics/Dynamics
ContactJoint.cpp
RigidBody.cpp
RigidBody.h
soc-blender/extern/bullet/Demos/CcdPhysicsDemo
CcdPhysicsDemo.cpp
CcdPhysicsDemo_vc8.vcproj
soc-blender/extern/bullet/Demos/CollisionDemo
CollisionDemo.cpp
soc-blender/extern/bullet/Demos/ConcaveDemo
ConcaveDemo_vc8.vcproj
ConcavePhysicsDemo.cpp
soc-blender/extern/bullet/Demos/ContinuousConvexCollision
ContinuousConvexCollisionDemo.cpp
soc-blender/extern/bullet/Demos/ConvexHullDistance
ConvexHullDistanceDemo.cpp
soc-blender/extern/bullet/Demos/GjkConvexCastDemo
LinearConvexCastDemo.cpp
soc-blender/extern/bullet/Demos/OpenGL DebugCastResult.h
GLDebugDrawer.cpp
GLDebugDrawer.h
GL_ShapeDrawer.cpp
GL_ShapeDrawer.h
GlutStuff.cpp
GlutStuff.h
OpenGL_vc8.vcproj
soc-blender/extern/bullet/Demos/Raytracer Raytracer.cpp
soc-blender/extern/bullet/Demos/SimplexDemo SimplexDemo.cpp
soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics
CcdPhysicsController.cpp
CcdPhysicsController.h
CcdPhysicsEnvironment.cpp
CcdPhysics_vc8.vcproj
soc-blender/extern/bullet/LinearMath IDebugDraw.h
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/blender/python/api2_2x/doc TimeLine.py
soc-blender/source/gameengine/Physics/Bullet
CcdPhysicsController.cpp
CcdPhysicsController.h
CcdPhysicsEnvironment.cpp
Log:
Post-merge conflict resolution
Revision Changes Path
1.4 +12 -9 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.3&r2=1.4&cvsroot=soc-2005>
1.3 +0 -4 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.2&r2=1.3&cvsroot=soc-2005>
1.2 +7 -1 soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/ManifoldPoint.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/ManifoldPoint.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +13 -7 soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.3 +2 -1 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.2&r2=1.3&cvsroot=soc-2005>
1.3 +1 -1 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.2&r2=1.3&cvsroot=soc-2005>
1.3 +7 -1 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.2&r2=1.3&cvsroot=soc-2005>
1.3 +0 -1 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.2&r2=1.3&cvsroot=soc-2005>
1.3 +15 -147 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.2&r2=1.3&cvsroot=soc-2005>
1.2 +6 -18 soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.3 +12 -27 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.2&r2=1.3&cvsroot=soc-2005>
1.3 +17 -19 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.2&r2=1.3&cvsroot=soc-2005>
1.3 +2 -2 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.2&r2=1.3&cvsroot=soc-2005>
1.3 +15 -7 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.2&r2=1.3&cvsroot=soc-2005>
1.3 +5 -0 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.2&r2=1.3&cvsroot=soc-2005>
1.3 +3 -0 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.2&r2=1.3&cvsroot=soc-2005>
1.3 +103 -20 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.2&r2=1.3&cvsroot=soc-2005>
1.2 +0 -1 soc-blender/extern/bullet/Demos/CcdPhysicsDemo/CcdPhysicsDemo_vc8.vcproj
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/CcdPhysicsDemo/CcdPhysicsDemo_vc8.vcproj.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +6 -2 soc-blender/extern/bullet/Demos/CollisionDemo/CollisionDemo.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/CollisionDemo/CollisionDemo.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.4 +1 -8 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.3&r2=1.4&cvsroot=soc-2005>
1.3 +8 -4 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.2&r2=1.3&cvsroot=soc-2005>
1.2 +10 -7 soc-blender/extern/bullet/Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +9 -4 soc-blender/extern/bullet/Demos/ConvexHullDistance/ConvexHullDistanceDemo.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/ConvexHullDistance/ConvexHullDistanceDemo.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +5 -2 soc-blender/extern/bullet/Demos/GjkConvexCastDemo/LinearConvexCastDemo.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/GjkConvexCastDemo/LinearConvexCastDemo.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.3 +1 -1 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.2&r2=1.3&cvsroot=soc-2005>
1.2 +25 -1 soc-blender/extern/bullet/Demos/OpenGL/GLDebugDrawer.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/OpenGL/GLDebugDrawer.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +6 -0 soc-blender/extern/bullet/Demos/OpenGL/GLDebugDrawer.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/OpenGL/GLDebugDrawer.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.3 +36 -29 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.2&r2=1.3&cvsroot=soc-2005>
1.3 +1 -1 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.2&r2=1.3&cvsroot=soc-2005>
1.2 +56 -4 soc-blender/extern/bullet/Demos/OpenGL/GlutStuff.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/OpenGL/GlutStuff.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +6 -1 soc-blender/extern/bullet/Demos/OpenGL/GlutStuff.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/OpenGL/GlutStuff.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +16 -5 soc-blender/extern/bullet/Demos/OpenGL/OpenGL_vc8.vcproj
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/OpenGL/OpenGL_vc8.vcproj.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.4 +4 -0 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.3&r2=1.4&cvsroot=soc-2005>
1.2 +6 -1 soc-blender/extern/bullet/Demos/SimplexDemo/SimplexDemo.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/SimplexDemo/SimplexDemo.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.3 +20 -4 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.2&r2=1.3&cvsroot=soc-2005>
1.3 +1 -0 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.2&r2=1.3&cvsroot=soc-2005>
1.3 +16 -7 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.2&r2=1.3&cvsroot=soc-2005>
1.2 +8 -5 soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysics_vc8.vcproj
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysics_vc8.vcproj.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.2 +19 -1 soc-blender/extern/bullet/LinearMath/IDebugDraw.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/LinearMath/IDebugDraw.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.5 +41 -24 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.4&r2=1.5&cvsroot=soc-2005>
1.6 +290 -7 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.5&r2=1.6&cvsroot=soc-2005>
1.5 +30 -2 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.4&r2=1.5&cvsroot=soc-2005>
1.2 +3 -4 soc-blender/source/blender/python/api2_2x/doc/TimeLine.py
<http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/python/api2_2x/doc/TimeLine.py.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
1.4 +21 -34 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.3&r2=1.4&cvsroot=soc-2005>
1.3 +2 -5 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.2&r2=1.3&cvsroot=soc-2005>
1.4 +101 -52 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.3&r2=1.4&cvsroot=soc-2005>
More information about the Soc-2005-cvs
mailing list