Skip to content

Commit 0cc8b59

Browse files
Merge branch 'develop' of https://code.google.com/p/reactphysics3d into develop
2 parents bd40e49 + 7432a87 commit 0cc8b59

File tree

7 files changed

+33
-14
lines changed

7 files changed

+33
-14
lines changed

CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
44
# Project configuration
55
PROJECT(REACTPHYSICS3D)
66

7+
# Default build type
8+
SET(CMAKE_BUILD_TYPE "Debug")
9+
710
# Where to build the library
8-
SET(LIBRARY_OUTPUT_PATH lib/)
11+
SET(LIBRARY_OUTPUT_PATH "lib")
12+
13+
# Where to build the executables
14+
SET(OUR_EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}/bin")
915

1016
# Options
1117
OPTION(COMPILE_EXAMPLES "Select this if you want to build the examples" OFF)

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.3.0
1+
0.4.0

examples/collisionshapes/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ cmake_minimum_required(VERSION 2.6)
44
# Project configuration
55
PROJECT(CollisionShapes)
66

7-
# Where to build the executable
8-
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin/collisionshapes/)
7+
# Where to build the executables
8+
SET(EXECUTABLE_OUTPUT_PATH "${OUR_EXECUTABLE_OUTPUT_PATH}/collisionshapes")
9+
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
10+
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${EXECUTABLE_OUTPUT_PATH})
11+
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${EXECUTABLE_OUTPUT_PATH})
912

1013
# Copy the shaders used for the demo into the build directory
1114
FILE(COPY "${OPENGLFRAMEWORK_DIR}/src/shaders/" DESTINATION "${EXECUTABLE_OUTPUT_PATH}/shaders/")

examples/cubes/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ cmake_minimum_required(VERSION 2.6)
44
# Project configuration
55
PROJECT(Cubes)
66

7-
# Where to build the executable
8-
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin/cubes/)
7+
# Where to build the executables
8+
SET(EXECUTABLE_OUTPUT_PATH "${OUR_EXECUTABLE_OUTPUT_PATH}/cubes")
9+
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
10+
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${EXECUTABLE_OUTPUT_PATH})
11+
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${EXECUTABLE_OUTPUT_PATH})
912

1013
# Copy the shaders used for the demo into the build directory
1114
FILE(COPY "${OPENGLFRAMEWORK_DIR}/src/shaders/" DESTINATION "${EXECUTABLE_OUTPUT_PATH}/shaders/")

examples/joints/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ cmake_minimum_required(VERSION 2.6)
44
# Project configuration
55
PROJECT(Joints)
66

7-
# Where to build the executable
8-
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin/joints/)
7+
# Where to build the executables
8+
SET(EXECUTABLE_OUTPUT_PATH "${OUR_EXECUTABLE_OUTPUT_PATH}/joints")
9+
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
10+
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${EXECUTABLE_OUTPUT_PATH})
11+
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${EXECUTABLE_OUTPUT_PATH})
912

1013
# Copy the shaders used for the demo into the build directory
1114
FILE(COPY "${OPENGLFRAMEWORK_DIR}/src/shaders/" DESTINATION "${EXECUTABLE_OUTPUT_PATH}/shaders/")

src/body/RigidBody.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class RigidBody : public CollisionBody {
188188
/// Apply an external force to the body at its gravity center.
189189
void applyForceToCenter(const Vector3& force);
190190

191-
/// Apply an external force to the body at a given point (in world-coordinates).
191+
/// Apply an external force to the body at a given point (in world-space coordinates).
192192
void applyForce(const Vector3& force, const Vector3& point);
193193

194194
/// Apply an external torque to the body.
@@ -361,7 +361,7 @@ inline void RigidBody::applyForceToCenter(const Vector3& force) {
361361
mExternalForce += force;
362362
}
363363

364-
// Apply an external force to the body at a given point (in world-coordinates).
364+
// Apply an external force to the body at a given point (in world-space coordinates).
365365
/// If the point is not at the center of gravity of the body, it will also
366366
/// generate some torque and therefore, change the angular velocity of the body.
367367
/// If the body is sleeping, calling this method will wake it up. Note that the

src/engine/Material.h

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ class Material {
6666
/// Return the bounciness
6767
decimal getBounciness() const;
6868

69-
/// Set the bounciness
69+
/// Set the bounciness.
7070
void setBounciness(decimal bounciness);
7171

7272
/// Return the friction coefficient
7373
decimal getFrictionCoefficient() const;
7474

75-
/// Set the friction coefficient
75+
/// Set the friction coefficient.
7676
void setFrictionCoefficient(decimal frictionCoefficient);
7777

7878
/// Overloaded assignment operator
@@ -84,7 +84,9 @@ inline decimal Material::getBounciness() const {
8484
return mBounciness;
8585
}
8686

87-
// Set the bounciness
87+
// Set the bounciness.
88+
/// The bounciness should be a value between 0 and 1. The value 1 is used for a
89+
/// very bouncy body and zero is used for a body that is not bouncy at all.
8890
inline void Material::setBounciness(decimal bounciness) {
8991
assert(bounciness >= decimal(0.0) && bounciness <= decimal(1.0));
9092
mBounciness = bounciness;
@@ -95,7 +97,9 @@ inline decimal Material::getFrictionCoefficient() const {
9597
return mFrictionCoefficient;
9698
}
9799

98-
// Set the friction coefficient
100+
// Set the friction coefficient.
101+
/// The friction coefficient has to be a positive value. The value zero is used for no
102+
/// friction at all.
99103
inline void Material::setFrictionCoefficient(decimal frictionCoefficient) {
100104
assert(frictionCoefficient >= decimal(0.0));
101105
mFrictionCoefficient = frictionCoefficient;

0 commit comments

Comments
 (0)