Merge pull request #72 from moisesjpelaez/master

Add sleeping thresholds to RigidBody and RigidBodyConfig

demos/src/demo/js/minilib/ODrawMode.hx

@@ -1,8 +1,7 @@
 package demo.js.minilib;
 import js.html.webgl.*;
 
-@:enum
-abstract ODrawMode(Int) to Int {
+enum abstract ODrawMode(Int) to Int {
 	var Points = GL.POINTS;
 	var Lines = GL.LINES;
 	var LineStrip = GL.LINE_STRIP;

demos/src/demo/js/minilib/ODrawUsage.hx

@@ -1,8 +1,7 @@
 package demo.js.minilib;
 import js.html.webgl.*;
 
-@:enum
-abstract ODrawUsage(Int) to Int {
+enum abstract ODrawUsage(Int) to Int {
 	var StaticDraw = GL.STATIC_DRAW;
 	var DynamicDraw = GL.DYNAMIC_DRAW;
 }

demos/src/demo/js/minilib/OIndexBuffer.hx

@@ -1,6 +1,7 @@
 package demo.js.minilib;
 import js.html.*;
 import js.html.webgl.*;
+import js.lib.Int16Array;
 
 class OIndexBuffer {
 	var gl:GL;

demos/src/demo/js/minilib/OVertexBuffer.hx

@@ -1,6 +1,7 @@
 package demo.js.minilib;
 import js.html.*;
 import js.html.webgl.*;
+import js.lib.Float32Array;
 
 class OVertexBuffer {
 	public var numVertices(default, null):Int;

src/oimo/common/Setting.hx

@@ -64,7 +64,7 @@ class Setting {
 	public static var islandInitialRigidBodyArraySize:Int = 128;
 	public static var islandInitialConstraintArraySize:Int = 128;
 
-	// sleeping
+	// sleeping, some are just default values and can be changed through RigidBodyConfig
 	public static var sleepingVelocityThreshold:Float = 0.2;
 	public static var sleepingAngularVelocityThreshold:Float = 0.5;
 	public static var sleepingTimeThreshold:Float = 1.0;

src/oimo/dynamics/Island.hx

@@ -112,7 +112,7 @@ class Island {
 		// update sleep time
 		if (rb._isSleepy()) {
 			rb._sleepTime += dt;
-			if (rb._sleepTime > Setting.sleepingTimeThreshold) {
+			if (rb._sleepTime >= rb._sleepingTimeThreshold) {
 				rb.sleep();
 			}
 		} else {
@@ -172,7 +172,7 @@ class Island {
 			}
 
 			// check if the rigid body is awaken
-			if (rb._sleepTime < Setting.sleepingTimeThreshold) {
+			if (rb._sleepTime < rb._sleepingTimeThreshold) {
 				// awaken the whole island
 				sleepIsland = false;
 			}

src/oimo/dynamics/rigidbody/RigidBody.hx

@@ -40,6 +40,9 @@ class RigidBody {
 	public var _sleepTime:Float;
 	public var _sleeping:Bool;
 	public var _autoSleep:Bool;
+	public var _sleepingVelocityThreshold:Float;
+	public var _sleepingAngularVelocityThreshold:Float;
+	public var _sleepingTimeThreshold:Float;
 
 	public var _mass:Float;
 	public var _invMass:Float;
@@ -112,6 +115,9 @@ class RigidBody {
 		_sleepTime = 0;
 		_sleeping = false;
 		_autoSleep = config.autoSleep;
+		_sleepingVelocityThreshold = config.sleepingVelocityThreshold;
+		_sleepingAngularVelocityThreshold = config.sleepingAngularVelocityThreshold;
+		_sleepingTimeThreshold = config.sleepingTimeThreshold;
 
 		_mass = 0;
 		_invMass = 0;
@@ -209,8 +215,8 @@ class RigidBody {
 
 	extern public inline function _isSleepy():Bool {
 		return _autoSleep
-			&& M.vec3_dot(_vel, _vel) < Setting.sleepingVelocityThreshold * Setting.sleepingVelocityThreshold
-			&& M.vec3_dot(_angVel, _angVel) < Setting.sleepingAngularVelocityThreshold * Setting.sleepingAngularVelocityThreshold;
+			&& M.vec3_dot(_vel, _vel) < _sleepingVelocityThreshold * _sleepingVelocityThreshold
+			&& M.vec3_dot(_angVel, _angVel) < _sleepingAngularVelocityThreshold * _sleepingAngularVelocityThreshold;
 	}
 
 	extern public inline function _isAlone():Bool {

src/oimo/dynamics/rigidbody/RigidBodyConfig.hx

@@ -1,4 +1,6 @@
 package oimo.dynamics.rigidbody;
+
+import oimo.common.Setting;
 import oimo.common.Mat3;
 import oimo.common.Vec3;
 
@@ -33,12 +35,6 @@ class RigidBodyConfig {
 	 */
 	public var type:Int;
 
-	/**
-	 * Whether to automatically sleep the rigid body when it stops moving
-	 * for a certain period of time, namely `Setting.sleepingTimeThreshold`.
-	 */
-	public var autoSleep:Bool;
-
 	/**
 	 * The damping coefficient of the linear velocity. Set positive values to
 	 * gradually reduce the linear velocity.
@@ -51,6 +47,27 @@ class RigidBodyConfig {
 	 */
 	public var angularDamping:Float;
 
+	/**
+	 * Whether to automatically sleep the rigid body when it stops moving
+	 * for a certain period of time, namely `sleepingTimeThreshold`.
+	 */
+	public var autoSleep:Bool;
+
+	/**
+	 * The linear velocity threshold to sleep the rigid body.
+	 */
+	public var sleepingVelocityThreshold:Float;
+
+	/**
+	 * The angular velocity threshold to sleep the rigid body.
+	 */
+	public var sleepingAngularVelocityThreshold:Float;
+
+	/**
+	 * The time threshold to sleep the rigid body.
+	 */
+	public var sleepingTimeThreshold:Float;
+
 	/**
 	 * Default constructor.
 	 */
@@ -60,8 +77,12 @@ class RigidBodyConfig {
 		linearVelocity = new Vec3();
 		angularVelocity = new Vec3();
 		type = RigidBodyType._DYNAMIC;
-		autoSleep = true;
 		linearDamping = 0;
 		angularDamping = 0;
+		autoSleep = true;
+		// inherit default value in Setting
+		sleepingVelocityThreshold = Setting.sleepingVelocityThreshold;
+		sleepingAngularVelocityThreshold = Setting.sleepingAngularVelocityThreshold;
+		sleepingTimeThreshold = Setting.sleepingTimeThreshold;
 	}
 }

src/oimo/m/B.hx

@@ -12,6 +12,7 @@ using Lambda;
 /**
  * Build Macro
  */
+@:haxe.warning("-WDeprecated") // for using @:extern
 @:extern
 class B {