Merge branch 'develop'

Author: DanielChappuis

CMakeLists.txt

@@ -4,8 +4,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 # Project configuration
 PROJECT(REACTPHYSICS3D)
 
-# Default build type
-SET(CMAKE_BUILD_TYPE "Debug")
+# Build type
+IF (NOT CMAKE_BUILD_TYPE)
+    SET(CMAKE_BUILD_TYPE "Release")
+ENDIF (NOT CMAKE_BUILD_TYPE)
 
 # Where to build the library
 SET(LIBRARY_OUTPUT_PATH "lib")
@@ -43,12 +45,8 @@ SET (REACTPHYSICS3D_SOURCES
     "src/body/RigidBody.cpp"
     "src/collision/broadphase/BroadPhaseAlgorithm.h"
     "src/collision/broadphase/BroadPhaseAlgorithm.cpp"
-    "src/collision/broadphase/NoBroadPhaseAlgorithm.h"
-    "src/collision/broadphase/NoBroadPhaseAlgorithm.cpp"
-    "src/collision/broadphase/PairManager.h"
-    "src/collision/broadphase/PairManager.cpp"
-    "src/collision/broadphase/SweepAndPruneAlgorithm.h"
-    "src/collision/broadphase/SweepAndPruneAlgorithm.cpp"
+    "src/collision/broadphase/DynamicAABBTree.h"
+    "src/collision/broadphase/DynamicAABBTree.cpp"
     "src/collision/narrowphase/EPA/EdgeEPA.h"
     "src/collision/narrowphase/EPA/EdgeEPA.cpp"
     "src/collision/narrowphase/EPA/EPAAlgorithm.h"
@@ -81,8 +79,10 @@ SET (REACTPHYSICS3D_SOURCES
     "src/collision/shapes/CylinderShape.cpp"
     "src/collision/shapes/SphereShape.h"
     "src/collision/shapes/SphereShape.cpp"
-    "src/collision/BroadPhasePair.h"
-    "src/collision/BroadPhasePair.cpp"
+    "src/collision/RaycastInfo.h"
+    "src/collision/RaycastInfo.cpp"
+    "src/collision/ProxyShape.h"
+    "src/collision/ProxyShape.cpp"
     "src/collision/CollisionDetection.h"
     "src/collision/CollisionDetection.cpp"
     "src/constraint/BallAndSocketJoint.h"
@@ -132,9 +132,11 @@ SET (REACTPHYSICS3D_SOURCES
     "src/mathematics/Vector2.h"
     "src/mathematics/Vector2.cpp"
     "src/mathematics/Vector3.h"
+    "src/mathematics/Ray.h"
     "src/mathematics/Vector3.cpp"
     "src/memory/MemoryAllocator.h"
     "src/memory/MemoryAllocator.cpp"
+    "src/memory/Stack.h"
 )
 
 # Create the library

README.md

@@ -0,0 +1,46 @@
+## ReactPhysics3D
+
+ReactPhysics3D is an open source C++ physics engine library that can be used in 3D simulations and games.
+
+Website : [http://www.reactphysics3d.com](http://www.reactphysics3d.com)
+
+Author : Daniel Chappuis
+
+## Features
+
+ReactPhysics3D has the following features :
+
+- Rigid body dynamics
+- Discrete collision detection
+- Collision shapes (Sphere, Box, Cone, Cylinder, Capsule, Convex Mesh)
+- Multiple collision shapes per body
+- Broadphase collision detection (Dynamic AABB tree)
+- Narrowphase collision detection (GJK/EPA)
+- Collision response and friction (Sequential Impulses Solver)
+- Joints (Ball and Socket, Hinge, Slider, Fixed)
+- Collision filtering with categories
+- Ray casting
+- Sleeping technique for inactive bodies
+- Integrated Profiler
+- Multi-platform (Windows, Linux, Mac OS X)
+- Documentation (User manual and Doxygen API)
+- Examples
+- Unit tests
+
+## License
+
+The ReactPhysics3D library is released under the open-source [ZLib license](http://opensource.org/licenses/zlib).
+
+## Documentation
+
+You can find the User Manual and the Doxygen API Documentation [here](http://www.reactphysics3d.com/documentation.html)
+
+## Branches
+
+The "master" branch always contains the last released version of the library. This is the most stable version. On the other side,
+the "develop" branch is used for development. This branch is frequently updated and can be quite unstable. Therefore, if you want to use the library in
+your application, it is recommended to checkout the "master" branch.
+
+## Issues
+
+If you find any issue with the library, you can report it on the issue tracker [here](https://github.com/DanielChappuis/reactphysics3d/issues).

README.txt

@@ -1 +1 @@
-0.4.0
+0.5.0

VERSION

@@ -32,7 +32,7 @@ PROJECT_NAME           = "ReactPhysics3D"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = "0.4.0"
+PROJECT_NUMBER         = "0.5.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer