* Sorted members for great justice
parent
f1c2dca7c1
commit
ed314e19ff
|
@ -68,31 +68,46 @@ namespace OpenSim.Framework
|
|||
public class PrimitiveBaseShape
|
||||
{
|
||||
private static readonly LLObject.TextureEntry m_defaultTexture;
|
||||
public byte[] ExtraParams;
|
||||
private byte[] m_textureEntry;
|
||||
|
||||
public byte State;
|
||||
public byte PCode;
|
||||
public ushort PathBegin;
|
||||
public byte PathCurve;
|
||||
public ushort PathEnd;
|
||||
public sbyte PathRadiusOffset;
|
||||
public byte PathRevolutions;
|
||||
public byte PathScaleX;
|
||||
public byte PathScaleY;
|
||||
public byte PathShearX;
|
||||
public byte PathShearY;
|
||||
public sbyte PathSkew;
|
||||
public ushort ProfileBegin;
|
||||
public ushort ProfileEnd;
|
||||
public LLVector3 Scale;
|
||||
public byte PathCurve;
|
||||
|
||||
[XmlIgnore] // -- this one is re-constructed from ProfileShape and ProfileHollow
|
||||
public byte ProfileCurve;
|
||||
|
||||
public ushort ProfileHollow;
|
||||
public sbyte PathRadiusOffset;
|
||||
public byte PathRevolutions;
|
||||
public sbyte PathTaperX;
|
||||
public sbyte PathTaperY;
|
||||
public sbyte PathTwist;
|
||||
public sbyte PathTwistBegin;
|
||||
public byte PCode;
|
||||
public ushort ProfileBegin;
|
||||
|
||||
[XmlIgnore] // -- this one is re-constructed from ProfileShape and ProfileHollow
|
||||
public byte ProfileCurve;
|
||||
|
||||
public ushort ProfileEnd;
|
||||
public ushort ProfileHollow;
|
||||
public LLVector3 Scale;
|
||||
public byte State;
|
||||
|
||||
static PrimitiveBaseShape()
|
||||
{
|
||||
m_defaultTexture =
|
||||
new LLObject.TextureEntry(new LLUUID("89556747-24cb-43ed-920b-47caed15465f"));
|
||||
}
|
||||
|
||||
public PrimitiveBaseShape()
|
||||
{
|
||||
PCode = (byte) PCodeEnum.Primitive;
|
||||
ExtraParams = new byte[1];
|
||||
Textures = m_defaultTexture;
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
public LLObject.TextureEntry Textures
|
||||
|
@ -102,8 +117,6 @@ namespace OpenSim.Framework
|
|||
set { m_textureEntry = value.ToBytes(); }
|
||||
}
|
||||
|
||||
private byte[] m_textureEntry;
|
||||
|
||||
public byte[] TextureEntry
|
||||
{
|
||||
get { return m_textureEntry; }
|
||||
|
@ -111,8 +124,6 @@ namespace OpenSim.Framework
|
|||
set { m_textureEntry = value; }
|
||||
}
|
||||
|
||||
public byte[] ExtraParams;
|
||||
|
||||
public ProfileShape ProfileShape
|
||||
{
|
||||
get { return (ProfileShape) (ProfileCurve & 0xf); }
|
||||
|
@ -138,19 +149,18 @@ namespace OpenSim.Framework
|
|||
get { return Scale; }
|
||||
}
|
||||
|
||||
|
||||
static PrimitiveBaseShape()
|
||||
public static PrimitiveBaseShape Default
|
||||
{
|
||||
m_defaultTexture =
|
||||
new LLObject.TextureEntry(new LLUUID("89556747-24cb-43ed-920b-47caed15465f"));
|
||||
get
|
||||
{
|
||||
PrimitiveBaseShape boxShape = CreateBox();
|
||||
|
||||
boxShape.SetScale(0.5f);
|
||||
|
||||
return boxShape;
|
||||
}
|
||||
}
|
||||
|
||||
public PrimitiveBaseShape()
|
||||
{
|
||||
PCode = (byte)PCodeEnum.Primitive;
|
||||
ExtraParams = new byte[1];
|
||||
Textures = m_defaultTexture;
|
||||
}
|
||||
|
||||
public static PrimitiveBaseShape Create()
|
||||
{
|
||||
|
@ -183,18 +193,6 @@ namespace OpenSim.Framework
|
|||
return shape;
|
||||
}
|
||||
|
||||
public static PrimitiveBaseShape Default
|
||||
{
|
||||
get
|
||||
{
|
||||
PrimitiveBaseShape boxShape = CreateBox();
|
||||
|
||||
boxShape.SetScale(0.5f);
|
||||
|
||||
return boxShape;
|
||||
}
|
||||
}
|
||||
|
||||
public void SetScale(float side)
|
||||
{
|
||||
Scale = new LLVector3(side, side, side);
|
||||
|
|
Loading…
Reference in New Issue