diff options
| author | Justin Clark-Casey (justincc) | 2013-02-06 01:35:25 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-02-06 01:35:25 +0000 |
| commit | 0d4df99d0444973014e7cf0d5e00a8cd366ead8f (patch) | |
| tree | f57ceb5d8fda2e313647d2ba663d638b626493c4 /OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | |
| parent | refactor: Move functions that lookup asset ids from task inventory or pass th... (diff) | |
| parent | BulletSim: make removing zero width triangles from meshes optional (diff) | |
| download | opensim-SC_OLD-0d4df99d0444973014e7cf0d5e00a8cd366ead8f.zip opensim-SC_OLD-0d4df99d0444973014e7cf0d5e00a8cd366ead8f.tar.gz opensim-SC_OLD-0d4df99d0444973014e7cf0d5e00a8cd366ead8f.tar.bz2 opensim-SC_OLD-0d4df99d0444973014e7cf0d5e00a8cd366ead8f.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs index c7a2f7e..8012d91 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | |||
| @@ -217,6 +217,10 @@ public static class BulletSimData | |||
| 217 | { | 217 | { |
| 218 | 218 | ||
| 219 | // Map of collisionTypes to flags for collision groups and masks. | 219 | // Map of collisionTypes to flags for collision groups and masks. |
| 220 | // An object's 'group' is the collison groups this object belongs to | ||
| 221 | // An object's 'filter' is the groups another object has to belong to in order to collide with me | ||
| 222 | // A collision happens if ((obj1.group & obj2.filter) != 0) || ((obj2.group & obj1.filter) != 0) | ||
| 223 | // | ||
| 220 | // As mentioned above, don't use the CollisionFilterGroups definitions directly in the code | 224 | // As mentioned above, don't use the CollisionFilterGroups definitions directly in the code |
| 221 | // but, instead, use references to this dictionary. Finding and debugging | 225 | // but, instead, use references to this dictionary. Finding and debugging |
| 222 | // collision flag problems will be made easier. | 226 | // collision flag problems will be made easier. |