Updates to Box2D source from SVN trunk.

diff --git a/libs/box2d/box2d-iphone.xcodeproj/project.pbxproj b/libs/box2d/box2d-iphone.xcodeproj/project.pbxproj
index 3eda5e3..6e1af9d 100644 (file)
--- a/libs/box2d/box2d-iphone.xcodeproj/project.pbxproj
+++ b/libs/box2d/box2d-iphone.xcodeproj/project.pbxproj
@@ -16,9 +16,7 @@
                491331AD1372653600DFB46D /* iPhoneTestEntries.mm in Sources */ = {isa = PBXBuildFile; fileRef = 491331A21372653600DFB46D /* iPhoneTestEntries.mm */; };
                491331AE1372653600DFB46D /* TestEntriesViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 491331A41372653600DFB46D /* TestEntriesViewController.mm */; };
                491331AF1372653600DFB46D /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 491331A51372653600DFB46D /* Icon.png */; };
-               491331B01372653600DFB46D /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 491331A61372653600DFB46D /* Info.plist */; };
                491331B11372653600DFB46D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 491331A71372653600DFB46D /* main.m */; };
-               491331B21372653600DFB46D /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 491331A81372653600DFB46D /* MainWindow.xib */; };
                4913323813726B1F00DFB46D /* ApplyForce.h in Headers */ = {isa = PBXBuildFile; fileRef = 4913320D13726B1F00DFB46D /* ApplyForce.h */; };
                4913323913726B1F00DFB46D /* BodyTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 4913320E13726B1F00DFB46D /* BodyTypes.h */; };
                4913323A13726B1F00DFB46D /* Breakable.h in Headers */ = {isa = PBXBuildFile; fileRef = 4913320F13726B1F00DFB46D /* Breakable.h */; };
@@ -430,8 +428,6 @@
                        buildActionMask = 2147483647;
                        files = (
                                491331AF1372653600DFB46D /* Icon.png in Resources */,
-                               491331B01372653600DFB46D /* Info.plist in Resources */,
-                               491331B21372653600DFB46D /* MainWindow.xib in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/libs/box2d/src/Box2D/Box2D.h b/libs/box2d/src/Box2D/Box2D.h
index dc5701f..0414477 100644 (file)
--- a/libs/box2d/src/Box2D/Box2D.h
+++ b/libs/box2d/src/Box2D/Box2D.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2006-2009 Erin Catto http://www.gphysics.com\r
+* Copyright (c) 2006-2009 Erin Catto http://www.box2d.org\r
 *\r
 * This software is provided 'as-is', without any express or implied\r
 * warranty.  In no event will the authors be held liable for any damages\r
@@ -32,8 +32,12 @@ For discussion please visit http://box2d.org/forum
 // These include files constitute the main Box2D API\r
 \r
 #include <Box2D/Common/b2Settings.h>\r
+#include <Box2D/Common/b2Draw.h>\r
+#include <Box2D/Common/b2Timer.h>\r
 \r
 #include <Box2D/Collision/Shapes/b2CircleShape.h>\r
+#include <Box2D/Collision/Shapes/b2EdgeShape.h>\r
+#include <Box2D/Collision/Shapes/b2LoopShape.h>\r
 #include <Box2D/Collision/Shapes/b2PolygonShape.h>\r
 \r
 #include <Box2D/Collision/b2BroadPhase.h>\r
@@ -52,11 +56,14 @@ For discussion please visit http://box2d.org/forum
 #include <Box2D/Dynamics/Joints/b2DistanceJoint.h>\r
 #include <Box2D/Dynamics/Joints/b2FrictionJoint.h>\r
 #include <Box2D/Dynamics/Joints/b2GearJoint.h>\r
-#include <Box2D/Dynamics/Joints/b2LineJoint.h>\r
+#include <Box2D/Dynamics/Joints/b2WheelJoint.h>\r
 #include <Box2D/Dynamics/Joints/b2MouseJoint.h>\r
 #include <Box2D/Dynamics/Joints/b2PrismaticJoint.h>\r
 #include <Box2D/Dynamics/Joints/b2PulleyJoint.h>\r
 #include <Box2D/Dynamics/Joints/b2RevoluteJoint.h>\r
+#include <Box2D/Dynamics/Joints/b2Rope