mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 17:05:55 +08:00
Merge branch 'ubitwork'
Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
This commit is contained in:
Melanie
File diff suppressed because it is too large
Load Diff
@@ -1736,6 +1736,23 @@ namespace OpenSim.Region.Physics.OdePlugin
|
||||
return newPrim;
|
||||
}
|
||||
|
||||
private PhysicsActor AddPrim(String name, Vector3 position, PhysicsActor parent,
|
||||
PrimitiveBaseShape pbs, uint localid, byte[] sdata)
|
||||
{
|
||||
Vector3 pos = position;
|
||||
|
||||
OdePrim newPrim;
|
||||
lock (OdeLock)
|
||||
{
|
||||
newPrim = new OdePrim(name, this, pos, parent, pbs, ode, localid, sdata);
|
||||
lock (_prims)
|
||||
_prims.Add(newPrim);
|
||||
}
|
||||
|
||||
return newPrim;
|
||||
}
|
||||
|
||||
|
||||
public void addActivePrim(OdePrim activatePrim)
|
||||
{
|
||||
// adds active prim.. (ones that should be iterated over in collisions_optimized
|
||||
@@ -1762,6 +1779,17 @@ namespace OpenSim.Region.Physics.OdePlugin
|
||||
return result;
|
||||
}
|
||||
|
||||
public override PhysicsActor AddPrimShape(string primName, PhysicsActor parent, PrimitiveBaseShape pbs, Vector3 position,
|
||||
uint localid, byte[] sdata)
|
||||
{
|
||||
PhysicsActor result;
|
||||
|
||||
result = AddPrim(primName, position, parent,
|
||||
pbs, localid, sdata);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public override float TimeDilation
|
||||
{
|
||||
get { return m_timeDilation; }
|
||||
@@ -3412,15 +3440,15 @@ namespace OpenSim.Region.Physics.OdePlugin
|
||||
|
||||
int regionsize = (int) Constants.RegionSize; // visible region size eg. 256(M)
|
||||
|
||||
int heightmapWidth = regionsize + 2; // ODE map size 257 x 257 (Meters) (1 extra
|
||||
int heightmapWidth = regionsize + 2; // ODE map size 258 x 258 (Meters) (1 extra each side)
|
||||
int heightmapHeight = regionsize + 2;
|
||||
|
||||
int heightmapWidthSamples = (int)regionsize + 2; // Sample file size, 258 x 258 samples
|
||||
int heightmapHeightSamples = (int)regionsize + 2;
|
||||
int heightmapWidthSamples = (int)regionsize + 3; // to have 258m we need 259 samples
|
||||
int heightmapHeightSamples = (int)regionsize + 3;
|
||||
|
||||
// Array of height samples for ODE
|
||||
float[] _heightmap;
|
||||
_heightmap = new float[(heightmapWidthSamples * heightmapHeightSamples)]; // loaded samples 258 x 258
|
||||
_heightmap = new float[(heightmapWidthSamples * heightmapHeightSamples)]; // loaded samples 259 x 259
|
||||
|
||||
// Other ODE parameters
|
||||
const float scale = 1.0f;
|
||||
|
||||
353
OpenSim/Region/Physics/ChOdePlugin/OdeUtils.cs
Normal file
353
OpenSim/Region/Physics/ChOdePlugin/OdeUtils.cs
Normal file
@@ -0,0 +1,353 @@
|
||||
/* Ubit 2012
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
// no endian conversion. So can't be use to pass information around diferent cpus with diferent endian
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
using OpenMetaverse;
|
||||
|
||||
namespace OpenSim.Region.Physics.OdePlugin
|
||||
{
|
||||
|
||||
unsafe public class wstreamer
|
||||
{
|
||||
byte[] buf;
|
||||
int index;
|
||||
byte* src;
|
||||
|
||||
public wstreamer()
|
||||
{
|
||||
buf = new byte[1024];
|
||||
index = 0;
|
||||
}
|
||||
public wstreamer(int size)
|
||||
{
|
||||
buf = new byte[size];
|
||||
index = 0;
|
||||
}
|
||||
|
||||
public byte[] close()
|
||||
{
|
||||
byte[] data = new byte[index];
|
||||
Buffer.BlockCopy(buf, 0, data, 0, index);
|
||||
return data;
|
||||
}
|
||||
|
||||
public void Seek(int pos)
|
||||
{
|
||||
index = pos;
|
||||
}
|
||||
|
||||
public void Seekrel(int pos)
|
||||
{
|
||||
index += pos;
|
||||
}
|
||||
|
||||
public void Wbyte(byte value)
|
||||
{
|
||||
buf[index++] = value;
|
||||
}
|
||||
public void Wshort(short value)
|
||||
{
|
||||
src = (byte*)&value;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src;
|
||||
}
|
||||
public void Wushort(ushort value)
|
||||
{
|
||||
src = (byte*)&value;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src;
|
||||
}
|
||||
public void Wint(int value)
|
||||
{
|
||||
src = (byte*)&value;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src;
|
||||
}
|
||||
public void Wuint(uint value)
|
||||
{
|
||||
src = (byte*)&value;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src;
|
||||
}
|
||||
public void Wlong(long value)
|
||||
{
|
||||
src = (byte*)&value;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src;
|
||||
}
|
||||
public void Wulong(ulong value)
|
||||
{
|
||||
src = (byte*)&value;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src;
|
||||
}
|
||||
|
||||
public void Wfloat(float value)
|
||||
{
|
||||
src = (byte*)&value;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src;
|
||||
}
|
||||
|
||||
public void Wdouble(double value)
|
||||
{
|
||||
src = (byte*)&value;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src;
|
||||
}
|
||||
|
||||
public void Wvector3(Vector3 value)
|
||||
{
|
||||
src = (byte*)&value.X;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src;
|
||||
src = (byte*)&value.Y; // it may have padding ??
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src;
|
||||
src = (byte*)&value.Z;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src;
|
||||
}
|
||||
public void Wquat(Quaternion value)
|
||||
{
|
||||
src = (byte*)&value.X;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src;
|
||||
src = (byte*)&value.Y; // it may have padding ??
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src;
|
||||
src = (byte*)&value.Z;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src;
|
||||
src = (byte*)&value.W;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src++;
|
||||
buf[index++] = *src;
|
||||
}
|
||||
}
|
||||
|
||||
unsafe public class rstreamer
|
||||
{
|
||||
private byte[] rbuf;
|
||||
private int ptr;
|
||||
private byte* dst;
|
||||
|
||||
public rstreamer(byte[] data)
|
||||
{
|
||||
rbuf = data;
|
||||
ptr = 0;
|
||||
}
|
||||
|
||||
public void close()
|
||||
{
|
||||
}
|
||||
|
||||
public void Seek(int pos)
|
||||
{
|
||||
ptr = pos;
|
||||
}
|
||||
|
||||
public void Seekrel(int pos)
|
||||
{
|
||||
ptr += pos;
|
||||
}
|
||||
|
||||
public byte Rbyte()
|
||||
{
|
||||
return (byte)rbuf[ptr++];
|
||||
}
|
||||
|
||||
public short Rshort()
|
||||
{
|
||||
short v;
|
||||
dst = (byte*)&v;
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst = rbuf[ptr++];
|
||||
return v;
|
||||
}
|
||||
public ushort Rushort()
|
||||
{
|
||||
ushort v;
|
||||
dst = (byte*)&v;
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst = rbuf[ptr++];
|
||||
return v;
|
||||
}
|
||||
public int Rint()
|
||||
{
|
||||
int v;
|
||||
dst = (byte*)&v;
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst = rbuf[ptr++];
|
||||
return v;
|
||||
}
|
||||
public uint Ruint()
|
||||
{
|
||||
uint v;
|
||||
dst = (byte*)&v;
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst = rbuf[ptr++];
|
||||
return v;
|
||||
}
|
||||
public long Rlong()
|
||||
{
|
||||
long v;
|
||||
dst = (byte*)&v;
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst = rbuf[ptr++];
|
||||
return v;
|
||||
}
|
||||
public ulong Rulong()
|
||||
{
|
||||
ulong v;
|
||||
dst = (byte*)&v;
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst = rbuf[ptr++];
|
||||
return v;
|
||||
}
|
||||
public float Rfloat()
|
||||
{
|
||||
float v;
|
||||
dst = (byte*)&v;
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst = rbuf[ptr++];
|
||||
return v;
|
||||
}
|
||||
|
||||
public double Rdouble()
|
||||
{
|
||||
double v;
|
||||
dst = (byte*)&v;
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst = rbuf[ptr++];
|
||||
return v;
|
||||
}
|
||||
|
||||
public Vector3 Rvector3()
|
||||
{
|
||||
Vector3 v;
|
||||
dst = (byte*)&v.X;
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst = rbuf[ptr++];
|
||||
|
||||
dst = (byte*)&v.Y;
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst = rbuf[ptr++];
|
||||
|
||||
dst = (byte*)&v.Z;
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst = rbuf[ptr++];
|
||||
return v;
|
||||
}
|
||||
|
||||
public Quaternion Rquat()
|
||||
{
|
||||
Quaternion v;
|
||||
dst = (byte*)&v.X;
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst = rbuf[ptr++];
|
||||
|
||||
dst = (byte*)&v.Y;
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst = rbuf[ptr++];
|
||||
|
||||
dst = (byte*)&v.Z;
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst = rbuf[ptr++];
|
||||
|
||||
dst = (byte*)&v.W;
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst++ = rbuf[ptr++];
|
||||
*dst = rbuf[ptr++];
|
||||
|
||||
return v;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user