OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added simple binary serializer/deserializer to chODE. 100% untested and most like still broken

avinationmerge
UbitUmarov 2012-02-17 21:09:00 +00:00
parent f6c35cf26f
commit 7d77ccc659
5 changed files with 1515 additions and 1010 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2318
OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
View File

File diff suppressed because it is too large Load Diff

28
OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
View File

@ -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; }

167
OpenSim/Region/Physics/ChOdePlugin/OdeUtils.cs Normal file
View File

@ -0,0 +1,167 @@
// adapted from libomv removing cpu endian adjust
// for prims lowlevel serialization
using System;
using System.IO;
using OpenMetaverse;
namespace OpenSim.Region.Physics.OdePlugin
{
public class wstreamer
{
private MemoryStream st;
public wstreamer()
{
st = new MemoryStream();
}
public byte[] close()
{
byte[] data = st.ToArray();
st.Close();
return data;
}
public void Wshort(short value)
{
st.Write(BitConverter.GetBytes(value), 0, 2);
}
public void Wushort(ushort value)
{
byte[] t = BitConverter.GetBytes(value);
st.Write(BitConverter.GetBytes(value), 0, 2);
}
public void Wint(int value)
{
st.Write(BitConverter.GetBytes(value), 0, 4);
}
public void Wuint(uint value)
{
st.Write(BitConverter.GetBytes(value), 0, 4);
}
public void Wlong(long value)
{
st.Write(BitConverter.GetBytes(value), 0, 8);
}
public void Wulong(ulong value)
{
st.Write(BitConverter.GetBytes(value), 0, 8);
}
public void Wfloat(float value)
{
st.Write(BitConverter.GetBytes(value), 0, 4);
}
public void Wdouble(double value)
{
st.Write(BitConverter.GetBytes(value), 0, 8);
}
public void Wvector3(Vector3 value)
{
st.Write(BitConverter.GetBytes(value.X), 0, 4);
st.Write(BitConverter.GetBytes(value.Y), 0, 4);
st.Write(BitConverter.GetBytes(value.Z), 0, 4);
}
public void Wquat(Quaternion value)
{
st.Write(BitConverter.GetBytes(value.X), 0, 4);
st.Write(BitConverter.GetBytes(value.Y), 0, 4);
st.Write(BitConverter.GetBytes(value.Z), 0, 4);
st.Write(BitConverter.GetBytes(value.W), 0, 4);
}
}
public class rstreamer
{
private byte[] rbuf;
private int ptr;
public rstreamer(byte[] data)
{
rbuf = data;
ptr = 0;
}
public void close()
{
}
public short Rshort()
{
short v = BitConverter.ToInt16(rbuf, ptr);
ptr += 2;
return v;
}
public ushort Rushort()
{
ushort v = BitConverter.ToUInt16(rbuf, ptr);
ptr += 2;
return v;
}
public int Rint()
{
int v = BitConverter.ToInt32(rbuf, ptr);
ptr += 4;
return v;
}
public uint Ruint()
{
uint v = BitConverter.ToUInt32(rbuf, ptr);
ptr += 4;
return v;
}
public long Rlong()
{
long v = BitConverter.ToInt64(rbuf, ptr);
ptr += 8;
return v;
}
public ulong Rulong()
{
ulong v = BitConverter.ToUInt64(rbuf, ptr);
ptr += 8;
return v;
}
public float Rfloat()
{
float v = BitConverter.ToSingle(rbuf, ptr);
ptr += 4;
return v;
}
public double Rdouble()
{
double v = BitConverter.ToDouble(rbuf, ptr);
ptr += 8;
return v;
}
public Vector3 Rvector3()
{
Vector3 v;
v.X = BitConverter.ToSingle(rbuf, ptr);
ptr += 4;
v.Y = BitConverter.ToSingle(rbuf, ptr);
ptr += 4;
v.Z = BitConverter.ToSingle(rbuf, ptr);
ptr += 4;
return v;
}
public Quaternion Rquat()
{
Quaternion v;
v.X = BitConverter.ToSingle(rbuf, ptr);
ptr += 4;
v.Y = BitConverter.ToSingle(rbuf, ptr);
ptr += 4;
v.Z = BitConverter.ToSingle(rbuf, ptr);
ptr += 4;
v.W = BitConverter.ToSingle(rbuf, ptr);
ptr += 4;
return v;
}
}
}

6
OpenSim/Region/Physics/Manager/PhysicsActor.cs
View File

@ -214,6 +214,11 @@ namespace OpenSim.Region.Physics.Manager
}
}
public virtual byte[] Serialize(bool PhysIsRunning)
{
return new byte[0];
}
public virtual void RaiseOutOfBounds(Vector3 pos)
{
// Make a temporary copy of the event to avoid possibility of
@ -573,5 +578,6 @@ namespace OpenSim.Region.Physics.Manager
{
return false;
}
}
}

6
OpenSim/Region/Physics/Manager/PhysicsScene.cs
View File

@ -128,6 +128,12 @@ namespace OpenSim.Region.Physics.Manager
public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
Vector3 size, Quaternion rotation, bool isPhysical, uint localid);
public virtual PhysicsActor AddPrimShape(string primName, PhysicsActor parent, PrimitiveBaseShape pbs, Vector3 position,
uint localid, byte[] sdata)
{
return null;
}
public virtual float TimeDilation
{
get { return 1.0f; }