1 files changed, 128 insertions, 128 deletions
diff --git a/libraries/ModifiedBulletX/ModifiedBulletX/Collision/BroadphaseCollision/SimpleBroadphase.cs b/libraries/ModifiedBulletX/ModifiedBulletX/Collision/BroadphaseCollision/SimpleBroadphase.cs
index 1dc3f34..f37b3f5 100644
--- a/libraries/ModifiedBulletX/ModifiedBulletX/Collision/BroadphaseCollision/SimpleBroadphase.cs
+++ b/libraries/ModifiedBulletX/ModifiedBulletX/Collision/BroadphaseCollision/SimpleBroadphase.cs
@@ -1,128 +1,128 @@
-/*
+/*
-  Bullet for XNA Copyright (c) 2003-2007 Vsevolod Klementjev http://www.codeplex.com/xnadevru
+  Bullet for XNA Copyright (c) 2003-2007 Vsevolod Klementjev http://www.codeplex.com/xnadevru
-  Bullet original C++ version Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com
+  Bullet original C++ version Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com
-  This software is provided 'as-is', without any express or implied
+  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
+  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
+  arising from the use of this software.
-  Permission is granted to anyone to use this software for any purpose,
+  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
+  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
+  freely, subject to the following restrictions:
-  1. The origin of this software must not be misrepresented; you must not
+  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
+     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
+     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
+     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
+  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
+     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
+  3. This notice may not be removed or altered from any source distribution.
-*/
+*/
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Text;
+using System.Text;
-using MonoXnaCompactMaths;
+using MonoXnaCompactMaths;
-namespace XnaDevRu.BulletX
+namespace XnaDevRu.BulletX
-{
+{
-        public class SimpleBroadphase : OverlappingPairCache
+        public class SimpleBroadphase : OverlappingPairCache
-        {
+        {
-                private int _maxProxies;
+                private int _maxProxies;
-                private List<SimpleBroadphaseProxy> _proxies = new List<SimpleBroadphaseProxy>();
+                private List<SimpleBroadphaseProxy> _proxies = new List<SimpleBroadphaseProxy>();
-                public SimpleBroadphase()
+                public SimpleBroadphase()
-                        : this(16384) { }
+                        : this(16384) { }
-                public SimpleBroadphase(int maxProxies)
+                public SimpleBroadphase(int maxProxies)
-                        : base()
+                        : base()
-                {
+                {
-                        _maxProxies = maxProxies;
+                        _maxProxies = maxProxies;
-                }
+                }
-                public override BroadphaseProxy CreateProxy(Vector3 min, Vector3 max, BroadphaseNativeTypes shapeType, object userData, BroadphaseProxy.CollisionFilterGroups collisionFilterGroup, BroadphaseProxy.CollisionFilterGroups collisionFilterMask)
+                public override BroadphaseProxy CreateProxy(Vector3 min, Vector3 max, BroadphaseNativeTypes shapeType, object userData, BroadphaseProxy.CollisionFilterGroups collisionFilterGroup, BroadphaseProxy.CollisionFilterGroups collisionFilterMask)
-                {
+                {
-                        if (_proxies.Count >= _maxProxies)
+                        if (_proxies.Count >= _maxProxies)
-                        {
+                        {
-                BulletDebug.Assert(false);
+                BulletDebug.Assert(false);
-                                return null; //should never happen, but don't let the game crash ;-)
+                                return null; //should never happen, but don't let the game crash ;-)
-                        }
+                        }
-            BulletDebug.Assert(min.X <= max.X && min.Y <= max.Y && min.Z <= max.Z);
+            BulletDebug.Assert(min.X <= max.X && min.Y <= max.Y && min.Z <= max.Z);
-                        SimpleBroadphaseProxy proxy = new SimpleBroadphaseProxy(min, max, shapeType, userData, collisionFilterGroup, collisionFilterMask);
+                        SimpleBroadphaseProxy proxy = new SimpleBroadphaseProxy(min, max, shapeType, userData, collisionFilterGroup, collisionFilterMask);
-                        _proxies.Add(proxy);
+                        _proxies.Add(proxy);
-                        return proxy;
+                        return proxy;
-                }
+                }
-                public override void DestroyProxy(BroadphaseProxy proxy)
+                public override void DestroyProxy(BroadphaseProxy proxy)
-                {
+                {
-                        RemoveOverlappingPairsContainingProxy(proxy);
+                        RemoveOverlappingPairsContainingProxy(proxy);
-                        _proxies.Remove(proxy as SimpleBroadphaseProxy);
+                        _proxies.Remove(proxy as SimpleBroadphaseProxy);
-                }
+                }
-                public override void SetAabb(BroadphaseProxy proxy, Vector3 aabbMin, Vector3 aabbMax)
+                public override void SetAabb(BroadphaseProxy proxy, Vector3 aabbMin, Vector3 aabbMax)
-                {
+                {
-                        SimpleBroadphaseProxy simpleProxy = GetSimpleProxyFromProxy(proxy);
+                        SimpleBroadphaseProxy simpleProxy = GetSimpleProxyFromProxy(proxy);
-                        simpleProxy.Minimum = aabbMin;
+                        simpleProxy.Minimum = aabbMin;
-                        simpleProxy.Maximum = aabbMax;
+                        simpleProxy.Maximum = aabbMax;
-                }
+                }
-                private SimpleBroadphaseProxy GetSimpleProxyFromProxy(BroadphaseProxy proxy)
+                private SimpleBroadphaseProxy GetSimpleProxyFromProxy(BroadphaseProxy proxy)
-                {
+                {
-                        return proxy as SimpleBroadphaseProxy;
+                        return proxy as SimpleBroadphaseProxy;
-                }
+                }
-                public override void RefreshOverlappingPairs()
+                public override void RefreshOverlappingPairs()
-                {
+                {
-                        for (int i = 0; i < _proxies.Count; i++)
+                        for (int i = 0; i < _proxies.Count; i++)
-                        {
+                        {
-                                SimpleBroadphaseProxy proxyA = _proxies[i];
+                                SimpleBroadphaseProxy proxyA = _proxies[i];
-                                for (int j = i + 1; j < _proxies.Count; j++)
+                                for (int j = i + 1; j < _proxies.Count; j++)
-                                {
+                                {
-                                        SimpleBroadphaseProxy proxyB = _proxies[j];
+                                        SimpleBroadphaseProxy proxyB = _proxies[j];
-                                        if (AabbOverlap(proxyA, proxyB))
+                                        if (AabbOverlap(proxyA, proxyB))
-                                        {
+                                        {
-                                                if (FindPair(proxyA, proxyB) == null)
+                                                if (FindPair(proxyA, proxyB) == null)
-                                                {
+                                                {
-                                                        AddOverlappingPair(proxyA, proxyB);
+                                                        AddOverlappingPair(proxyA, proxyB);
-                                                }
+                                                }
-                                        }
+                                        }
-                                }
+                                }
-                        }
+                        }
-                        CheckOverlapCallback check = new CheckOverlapCallback();
+                        CheckOverlapCallback check = new CheckOverlapCallback();
-                        ProcessAllOverlappingPairs(check);
+                        ProcessAllOverlappingPairs(check);
-                }
+                }
-                public static bool AabbOverlap(SimpleBroadphaseProxy proxyA, SimpleBroadphaseProxy proxyB)
+                public static bool AabbOverlap(SimpleBroadphaseProxy proxyA, SimpleBroadphaseProxy proxyB)
-                {
+                {
-                        return proxyA.Minimum.X <= proxyB.Maximum.X && proxyB.Minimum.X <= proxyA.Maximum.X &&
+                        return proxyA.Minimum.X <= proxyB.Maximum.X && proxyB.Minimum.X <= proxyA.Maximum.X &&
-                                   proxyA.Minimum.Y <= proxyB.Maximum.Y && proxyB.Minimum.Y <= proxyA.Maximum.Y &&
+                                   proxyA.Minimum.Y <= proxyB.Maximum.Y && proxyB.Minimum.Y <= proxyA.Maximum.Y &&
-                                   proxyA.Minimum.Z <= proxyB.Maximum.Z && proxyB.Minimum.Z <= proxyA.Maximum.Z;
+                                   proxyA.Minimum.Z <= proxyB.Maximum.Z && proxyB.Minimum.Z <= proxyA.Maximum.Z;
-                }
+                }
-                private void Validate()
+                private void Validate()
-                {
+                {
-                        for (int i = 0; i < _proxies.Count; i++)
+                        for (int i = 0; i < _proxies.Count; i++)
-                        {
+                        {
-                                for (int j = i + 1; j < _proxies.Count; j++)
+                                for (int j = i + 1; j < _proxies.Count; j++)
-                                {
+                                {
-                                        if (_proxies[i] == _proxies[j])
+                                        if (_proxies[i] == _proxies[j])
-                                                throw new BulletException();
+                                                throw new BulletException();
-                                }
+                                }
-                        }
+                        }
-                }
+                }
-        }
+        }
-        public class CheckOverlapCallback : IOverlapCallback
+        public class CheckOverlapCallback : IOverlapCallback
-        {
+        {
-                public bool ProcessOverlap(ref BroadphasePair pair)
+                public bool ProcessOverlap(ref BroadphasePair pair)
-                {
+                {
-                        return (!SimpleBroadphase.AabbOverlap(pair.ProxyA as SimpleBroadphaseProxy, pair.ProxyB as SimpleBroadphaseProxy));
+                        return (!SimpleBroadphase.AabbOverlap(pair.ProxyA as SimpleBroadphaseProxy, pair.ProxyB as SimpleBroadphaseProxy));
-                }
+                }
-        }
+        }
-}
+}

diff --git a/libraries/ModifiedBulletX/ModifiedBulletX/Collision/BroadphaseCollision/SimpleBroadphase.cs b/libraries/ModifiedBulletX/ModifiedBulletX/Collision/BroadphaseCollision/SimpleBroadphase.cs index 1dc3f34..f37b3f5 100644 --- a/libraries/ModifiedBulletX/ModifiedBulletX/Collision/BroadphaseCollision/SimpleBroadphase.cs +++ b/libraries/ModifiedBulletX/ModifiedBulletX/Collision/BroadphaseCollision/SimpleBroadphase.cs
@@ -1,128 +1,128 @@
1	/*	1	/*
2	Bullet for XNA Copyright (c) 2003-2007 Vsevolod Klementjev http://www.codeplex.com/xnadevru	2	Bullet for XNA Copyright (c) 2003-2007 Vsevolod Klementjev http://www.codeplex.com/xnadevru
3	Bullet original C++ version Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com	3	Bullet original C++ version Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com
4		4
5	This software is provided 'as-is', without any express or implied	5	This software is provided 'as-is', without any express or implied
6	warranty. In no event will the authors be held liable for any damages	6	warranty. In no event will the authors be held liable for any damages
7	arising from the use of this software.	7	arising from the use of this software.
8		8
9	Permission is granted to anyone to use this software for any purpose,	9	Permission is granted to anyone to use this software for any purpose,
10	including commercial applications, and to alter it and redistribute it	10	including commercial applications, and to alter it and redistribute it
11	freely, subject to the following restrictions:	11	freely, subject to the following restrictions:
12		12
13	1. The origin of this software must not be misrepresented; you must not	13	1. The origin of this software must not be misrepresented; you must not
14	claim that you wrote the original software. If you use this software	14	claim that you wrote the original software. If you use this software
15	in a product, an acknowledgment in the product documentation would be	15	in a product, an acknowledgment in the product documentation would be
16	appreciated but is not required.	16	appreciated but is not required.
17	2. Altered source versions must be plainly marked as such, and must not be	17	2. Altered source versions must be plainly marked as such, and must not be
18	misrepresented as being the original software.	18	misrepresented as being the original software.
19	3. This notice may not be removed or altered from any source distribution.	19	3. This notice may not be removed or altered from any source distribution.
20	*/	20	*/
21		21
22	using System;	22	using System;
23	using System.Collections.Generic;	23	using System.Collections.Generic;
24	using System.Text;	24	using System.Text;
25	using MonoXnaCompactMaths;	25	using MonoXnaCompactMaths;
26		26
27	namespace XnaDevRu.BulletX	27	namespace XnaDevRu.BulletX
28	{	28	{
29	public class SimpleBroadphase : OverlappingPairCache	29	public class SimpleBroadphase : OverlappingPairCache
30	{	30	{
31	private int _maxProxies;	31	private int _maxProxies;
32	private List<SimpleBroadphaseProxy> _proxies = new List<SimpleBroadphaseProxy>();	32	private List<SimpleBroadphaseProxy> _proxies = new List<SimpleBroadphaseProxy>();
33		33
34	public SimpleBroadphase()	34	public SimpleBroadphase()
35	: this(16384) { }	35	: this(16384) { }
36		36
37	public SimpleBroadphase(int maxProxies)	37	public SimpleBroadphase(int maxProxies)
38	: base()	38	: base()
39	{	39	{
40	_maxProxies = maxProxies;	40	_maxProxies = maxProxies;
41	}	41	}
42		42
43	public override BroadphaseProxy CreateProxy(Vector3 min, Vector3 max, BroadphaseNativeTypes shapeType, object userData, BroadphaseProxy.CollisionFilterGroups collisionFilterGroup, BroadphaseProxy.CollisionFilterGroups collisionFilterMask)	43	public override BroadphaseProxy CreateProxy(Vector3 min, Vector3 max, BroadphaseNativeTypes shapeType, object userData, BroadphaseProxy.CollisionFilterGroups collisionFilterGroup, BroadphaseProxy.CollisionFilterGroups collisionFilterMask)
44	{	44	{
45	if (_proxies.Count >= _maxProxies)	45	if (_proxies.Count >= _maxProxies)
46	{	46	{
47	BulletDebug.Assert(false);	47	BulletDebug.Assert(false);
48	return null; //should never happen, but don't let the game crash ;-)	48	return null; //should never happen, but don't let the game crash ;-)
49	}	49	}
50	BulletDebug.Assert(min.X <= max.X && min.Y <= max.Y && min.Z <= max.Z);	50	BulletDebug.Assert(min.X <= max.X && min.Y <= max.Y && min.Z <= max.Z);
51		51
52	SimpleBroadphaseProxy proxy = new SimpleBroadphaseProxy(min, max, shapeType, userData, collisionFilterGroup, collisionFilterMask);	52	SimpleBroadphaseProxy proxy = new SimpleBroadphaseProxy(min, max, shapeType, userData, collisionFilterGroup, collisionFilterMask);
53	_proxies.Add(proxy);	53	_proxies.Add(proxy);
54		54
55	return proxy;	55	return proxy;
56	}	56	}
57		57
58		58
59	public override void DestroyProxy(BroadphaseProxy proxy)	59	public override void DestroyProxy(BroadphaseProxy proxy)
60	{	60	{
61	RemoveOverlappingPairsContainingProxy(proxy);	61	RemoveOverlappingPairsContainingProxy(proxy);
62	_proxies.Remove(proxy as SimpleBroadphaseProxy);	62	_proxies.Remove(proxy as SimpleBroadphaseProxy);
63	}	63	}
64		64
65	public override void SetAabb(BroadphaseProxy proxy, Vector3 aabbMin, Vector3 aabbMax)	65	public override void SetAabb(BroadphaseProxy proxy, Vector3 aabbMin, Vector3 aabbMax)
66	{	66	{
67	SimpleBroadphaseProxy simpleProxy = GetSimpleProxyFromProxy(proxy);	67	SimpleBroadphaseProxy simpleProxy = GetSimpleProxyFromProxy(proxy);
68	simpleProxy.Minimum = aabbMin;	68	simpleProxy.Minimum = aabbMin;
69	simpleProxy.Maximum = aabbMax;	69	simpleProxy.Maximum = aabbMax;
70	}	70	}
71		71
72	private SimpleBroadphaseProxy GetSimpleProxyFromProxy(BroadphaseProxy proxy)	72	private SimpleBroadphaseProxy GetSimpleProxyFromProxy(BroadphaseProxy proxy)
73	{	73	{
74	return proxy as SimpleBroadphaseProxy;	74	return proxy as SimpleBroadphaseProxy;
75	}	75	}
76		76
77	public override void RefreshOverlappingPairs()	77	public override void RefreshOverlappingPairs()
78	{	78	{
79	for (int i = 0; i < _proxies.Count; i++)	79	for (int i = 0; i < _proxies.Count; i++)
80	{	80	{
81	SimpleBroadphaseProxy proxyA = _proxies[i];	81	SimpleBroadphaseProxy proxyA = _proxies[i];
82		82
83	for (int j = i + 1; j < _proxies.Count; j++)	83	for (int j = i + 1; j < _proxies.Count; j++)
84	{	84	{
85	SimpleBroadphaseProxy proxyB = _proxies[j];	85	SimpleBroadphaseProxy proxyB = _proxies[j];
86		86
87	if (AabbOverlap(proxyA, proxyB))	87	if (AabbOverlap(proxyA, proxyB))
88	{	88	{
89	if (FindPair(proxyA, proxyB) == null)	89	if (FindPair(proxyA, proxyB) == null)
90	{	90	{
91	AddOverlappingPair(proxyA, proxyB);	91	AddOverlappingPair(proxyA, proxyB);
92	}	92	}
93	}	93	}
94	}	94	}
95	}	95	}
96		96
97	CheckOverlapCallback check = new CheckOverlapCallback();	97	CheckOverlapCallback check = new CheckOverlapCallback();
98	ProcessAllOverlappingPairs(check);	98	ProcessAllOverlappingPairs(check);
99	}	99	}
100		100
101	public static bool AabbOverlap(SimpleBroadphaseProxy proxyA, SimpleBroadphaseProxy proxyB)	101	public static bool AabbOverlap(SimpleBroadphaseProxy proxyA, SimpleBroadphaseProxy proxyB)
102	{	102	{
103	return proxyA.Minimum.X <= proxyB.Maximum.X && proxyB.Minimum.X <= proxyA.Maximum.X &&	103	return proxyA.Minimum.X <= proxyB.Maximum.X && proxyB.Minimum.X <= proxyA.Maximum.X &&
104	proxyA.Minimum.Y <= proxyB.Maximum.Y && proxyB.Minimum.Y <= proxyA.Maximum.Y &&	104	proxyA.Minimum.Y <= proxyB.Maximum.Y && proxyB.Minimum.Y <= proxyA.Maximum.Y &&
105	proxyA.Minimum.Z <= proxyB.Maximum.Z && proxyB.Minimum.Z <= proxyA.Maximum.Z;	105	proxyA.Minimum.Z <= proxyB.Maximum.Z && proxyB.Minimum.Z <= proxyA.Maximum.Z;
106	}	106	}
107		107
108	private void Validate()	108	private void Validate()
109	{	109	{
110	for (int i = 0; i < _proxies.Count; i++)	110	for (int i = 0; i < _proxies.Count; i++)
111	{	111	{
112	for (int j = i + 1; j < _proxies.Count; j++)	112	for (int j = i + 1; j < _proxies.Count; j++)
113	{	113	{
114	if (_proxies[i] == _proxies[j])	114	if (_proxies[i] == _proxies[j])
115	throw new BulletException();	115	throw new BulletException();
116	}	116	}
117	}	117	}
118	}	118	}
119	}	119	}
120		120
121	public class CheckOverlapCallback : IOverlapCallback	121	public class CheckOverlapCallback : IOverlapCallback
122	{	122	{
123	public bool ProcessOverlap(ref BroadphasePair pair)	123	public bool ProcessOverlap(ref BroadphasePair pair)
124	{	124	{
125	return (!SimpleBroadphase.AabbOverlap(pair.ProxyA as SimpleBroadphaseProxy, pair.ProxyB as SimpleBroadphaseProxy));	125	return (!SimpleBroadphase.AabbOverlap(pair.ProxyA as SimpleBroadphaseProxy, pair.ProxyB as SimpleBroadphaseProxy));
126	}	126	}
127	}	127	}
128	}	128	}