ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

BulletSim: fix Mantis 7798: land collisions not working.

Browse Source
This commit is contained in:
Robert Adams
2016-01-10 16:42:23 -08:00
parent d4e88f8883
commit 22501ea06d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs
View File

@@ -463,11 +463,15 @@ public abstract class BSPhysObject : PhysicsActor
bool ret = false;
// if 'collidee' is null, that means it is terrain
uint collideeLocalID = (collidee == null) ? PhysScene.TerrainManager.HighestTerrainID : collidee.LocalID;
uint collideeLocalID = (collidee == null) ? BSScene.TERRAIN_ID : collidee.LocalID;
// All terrain goes by the TERRAIN_ID id when passed up as a collision
if (collideeLocalID <= PhysScene.TerrainManager.HighestTerrainID) {
collideeLocalID = BSScene.TERRAIN_ID;
}
// The following lines make IsColliding(), CollidingGround() and CollidingObj work
CollidingStep = PhysScene.SimulationStep;
if (collideeLocalID <= PhysScene.TerrainManager.HighestTerrainID)
if (collideeLocalID == BSScene.TERRAIN_ID)
{
CollidingGroundStep = PhysScene.SimulationStep;
}