diff options
author | Robert Adams | 2013-01-01 16:49:38 -0800 |
---|---|---|
committer | Robert Adams | 2013-01-01 17:27:33 -0800 |
commit | 9d840fd2ee5c3e6c6f788e8145f06701e9ea2724 (patch) | |
tree | 063fd046a04a125671edf147161b34ed95c59329 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | |
parent | BulletSim: fix line endings. (diff) | |
download | opensim-SC-9d840fd2ee5c3e6c6f788e8145f06701e9ea2724.zip opensim-SC-9d840fd2ee5c3e6c6f788e8145f06701e9ea2724.tar.gz opensim-SC-9d840fd2ee5c3e6c6f788e8145f06701e9ea2724.tar.bz2 opensim-SC-9d840fd2ee5c3e6c6f788e8145f06701e9ea2724.tar.xz |
BulletSim: move over and port the interface for BulletXNA.
Copied BulletSNPlugin.BulletSimAPI to a new
BulletSPlugin.BSAPIXNA.cs and then modifyed the latter to
comply with the BSAPITemplate definition. Not totally debugged
but the code is all there for an INI variable to select either
unmanaged C++ Bullet or the C# version of Bullet.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs index 114c0aa..e4fecc3 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | |||
@@ -92,8 +92,8 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys | |||
92 | private void BuildHeightmapTerrain() | 92 | private void BuildHeightmapTerrain() |
93 | { | 93 | { |
94 | // Create the terrain shape from the mapInfo | 94 | // Create the terrain shape from the mapInfo |
95 | m_mapInfo.terrainShape = PhysicsScene.PE.CreateTerrainShape( m_mapInfo.ID, | 95 | m_mapInfo.terrainShape = PhysicsScene.PE.CreateTerrainShape( m_mapInfo.ID, |
96 | new Vector3(m_mapInfo.sizeX, m_mapInfo.sizeY, 0), m_mapInfo.minZ, m_mapInfo.maxZ, | 96 | new Vector3(m_mapInfo.sizeX, m_mapInfo.sizeY, 0), m_mapInfo.minZ, m_mapInfo.maxZ, |
97 | m_mapInfo.heightMap, 1f, BSParam.TerrainCollisionMargin); | 97 | m_mapInfo.heightMap, 1f, BSParam.TerrainCollisionMargin); |
98 | 98 | ||
99 | 99 | ||