aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorgareth2007-03-27 03:22:40 +0000
committergareth2007-03-27 03:22:40 +0000
commitb43f0801eba5925787f3384bfe510e33e330f724 (patch)
tree589f2bb58fbba1c70c06eb3b60b012b1be4ef02e
parentODE plugin now can fly but sinks through ground when walking (?!!!??!??!) (diff)
downloadopensim-SC_OLD-b43f0801eba5925787f3384bfe510e33e330f724.zip
opensim-SC_OLD-b43f0801eba5925787f3384bfe510e33e330f724.tar.gz
opensim-SC_OLD-b43f0801eba5925787f3384bfe510e33e330f724.tar.bz2
opensim-SC_OLD-b43f0801eba5925787f3384bfe510e33e330f724.tar.xz
Heightfield needs fixing, or i'll re-implement it (probably actually the collisions stuff i'm not doing right)
Why am I using SVN logs to talk? It's bedtime.......
-rw-r--r--OpenSim.Physics/OdePlugin/OdePlugin.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim.Physics/OdePlugin/OdePlugin.cs b/OpenSim.Physics/OdePlugin/OdePlugin.cs
index 01eaf77..8e34a6b 100644
--- a/OpenSim.Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim.Physics/OdePlugin/OdePlugin.cs
@@ -140,6 +140,7 @@ namespace OpenSim.Physics.OdePlugin
140 } 140 }
141 d.SpaceCollide(space, IntPtr.Zero, nearCallback); 141 d.SpaceCollide(space, IntPtr.Zero, nearCallback);
142 d.WorldQuickStep(world, timeStep*5f); 142 d.WorldQuickStep(world, timeStep*5f);
143 d.JointGroupEmpty(contactgroup);
143 foreach (OdeCharacter actor in _characters) 144 foreach (OdeCharacter actor in _characters)
144 { 145 {
145 actor.UpdatePosition(); 146 actor.UpdatePosition();
@@ -167,8 +168,7 @@ namespace OpenSim.Physics.OdePlugin
167 } 168 }
168 IntPtr HeightmapData = d.GeomHeightfieldDataCreate(); 169 IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
169 d.GeomHeightfieldDataBuildDouble(HeightmapData,_heightmap,1,256,256,256,256,1.0f,0.0f,2.0f,0); 170 d.GeomHeightfieldDataBuildDouble(HeightmapData,_heightmap,1,256,256,256,256,1.0f,0.0f,2.0f,0);
170 LandGeom=d.CreateHeightfield(space, HeightmapData, 1); 171 LandGeom=d.CreateHeightfield(space, HeightmapData, 0);
171 d.GeomSetPosition(LandGeom,0,0,0);
172 } 172 }
173 } 173 }
174 174