improved the freezing system

zhejiushizhuce · Mar 12, 2011 · 2b8be8b · 2b8be8b
1 parent b02e082
commit 2b8be8b
Show file tree

Hide file tree

Showing 14 changed files with 126 additions and 203 deletions.
diff --git a/fp11/examples/Away3DCarDrive.as b/fp11/examples/Away3DCarDrive.as
@@ -18,6 +18,7 @@ package
 	import flash.geom.Vector3D;
 	import flash.ui.Keyboard;
 
+	import jiglib.cof.JConfig;
 	import jiglib.debug.Stats;
 	import jiglib.math.*;
 	import jiglib.physics.*;
@@ -85,7 +86,7 @@ package
 			for (var i:int = 0; i < 3; i++)
 			{
 				boxBody[i] = physics.createCube(materia, 60, 50, 80 );
-				boxBody[i].moveTo(new Vector3D(0, 10 + (30 * i + 30), 0));
+				boxBody[i].moveTo(new Vector3D(0, 10 + (50 * i + 50), 0));
 			}
 
 			ResourceManager.instance.addEventListener(ResourceEvent.RESOURCE_RETRIEVED, onResourceRetrieved);

diff --git a/fp11/examples/Away3DGridSystem.swf b/fp11/examples/Away3DGridSystem.swf
diff --git a/fp11/examples/Away3DStackingTest.swf b/fp11/examples/Away3DStackingTest.swf
diff --git a/fp11/examples/Away3DTerrainTest.swf b/fp11/examples/Away3DTerrainTest.swf
diff --git a/fp11/examples/Away3DTriangleMesh.as b/fp11/examples/Away3DTriangleMesh.as
@@ -116,14 +116,14 @@ package
 				materia = new ColorMaterial(0xeeee00);
 				materia.lights=[mylight];
 				ballBodies = new Vector.<RigidBody>();
-				for (var i:int = 0; i < 10; i++)
+				for (var i:int = 0; i < 15; i++)
 				{
 					ballBodies[i] = physics.createSphere(materia, 50);
 					ballBodies[i].moveTo(new Vector3D( -1000+2500*Math.random(),1000+1000*Math.random(), -1000+2500*Math.random()));
 				}
 
 				boxBodies = new Vector.<RigidBody>();
-				for (i = 0; i < 10; i++)
+				for (i = 0; i < 15; i++)
 				{
 					boxBodies[i] = physics.createCube(materia, 100, 80, 60 );
 					boxBodies[i].moveTo(new Vector3D(-1000+2500*Math.random(), 1000+1000*Math.random(), -1000+2500*Math.random()));

diff --git a/fp11/examples/CollisionEventTest.swf b/fp11/examples/CollisionEventTest.swf
diff --git a/fp11/src/jiglib/collision/CollisionSystemAbstract.as b/fp11/src/jiglib/collision/CollisionSystemAbstract.as
@@ -50,13 +50,13 @@
 
 		public function addCollisionBody(body:RigidBody):void
 		{
-			if (!findBody(body))
+			if (collBody.indexOf(body) < 0)
 				collBody.push(body);
 		}
 
 		public function removeCollisionBody(body:RigidBody):void
 		{
-			if (findBody(body))
+			if (collBody.indexOf(body) >= 0)
 				collBody.splice(collBody.indexOf(body), 1);
 		}
 
@@ -158,11 +158,6 @@
 		{
 			return _numCollisionsChecks;	
 		}
-
-		protected function findBody(body:RigidBody):Boolean
-		{
-			return collBody.indexOf(body) > -1;
-		}
 
 		protected function checkCollidables(body0:RigidBody, body1:RigidBody):Boolean
 		{

diff --git a/fp11/src/jiglib/collision/CollisionSystemGrid.as b/fp11/src/jiglib/collision/CollisionSystemGrid.as
@@ -163,7 +163,7 @@ package jiglib.collision
 
 		override public function addCollisionBody(body:RigidBody):void
 		{
-			if (!findBody(body))
+			if (collBody.indexOf(body) < 0)
 				collBody.push(body);
 
 			body.collisionSystem = this;
@@ -187,7 +187,7 @@ package jiglib.collision
 				body.externalData = null;
 			}
 
-			if (findBody(body))
+			if (collBody.indexOf(body) >= 0)
 				collBody.splice(collBody.indexOf(body), 1);
 		}