diff options
Diffstat (limited to 'OpenSim/Framework/General/Types/PrimitiveBaseShape.cs')
-rw-r--r-- | OpenSim/Framework/General/Types/PrimitiveBaseShape.cs | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs index 57018b2..1938a90 100644 --- a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs | |||
@@ -21,6 +21,9 @@ namespace OpenSim.Framework.Types | |||
21 | { | 21 | { |
22 | //protected ShapeType m_type = ShapeType.Unknown; | 22 | //protected ShapeType m_type = ShapeType.Unknown; |
23 | 23 | ||
24 | |||
25 | private static byte[] m_defaultTextureEntry; | ||
26 | |||
24 | public byte PCode; | 27 | public byte PCode; |
25 | public ushort PathBegin; | 28 | public ushort PathBegin; |
26 | public ushort PathEnd; | 29 | public ushort PathEnd; |
@@ -60,9 +63,15 @@ namespace OpenSim.Framework.Types | |||
60 | } | 63 | } |
61 | } | 64 | } |
62 | 65 | ||
66 | static PrimitiveBaseShape() | ||
67 | { | ||
68 | m_defaultTextureEntry = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005")).ToBytes(); | ||
69 | } | ||
70 | |||
63 | public PrimitiveBaseShape() | 71 | public PrimitiveBaseShape() |
64 | { | 72 | { |
65 | ExtraParams = new byte[1]; | 73 | ExtraParams = new byte[1]; |
74 | TextureEntry = m_defaultTextureEntry; | ||
66 | } | 75 | } |
67 | 76 | ||
68 | //void returns need to change of course | 77 | //void returns need to change of course |
@@ -91,29 +100,15 @@ namespace OpenSim.Framework.Types | |||
91 | { | 100 | { |
92 | get | 101 | get |
93 | { | 102 | { |
94 | BoxShape primShape = new BoxShape(); | 103 | BoxShape boxShape = new BoxShape(); |
95 | 104 | ||
96 | primShape.Scale = new LLVector3(0.5f, 0.5f, 0.5f); | 105 | boxShape.Scale = new LLVector3(0.5f, 0.5f, 0.5f); |
97 | primShape.PathBegin = 0; | ||
98 | primShape.PathEnd = 0; | ||
99 | primShape.PathScaleX = 0; | ||
100 | primShape.PathScaleY = 0; | ||
101 | primShape.PathShearX = 0; | ||
102 | primShape.PathShearY = 0; | ||
103 | primShape.PathSkew = 0; | ||
104 | primShape.ProfileBegin = 0; | ||
105 | primShape.ProfileEnd = 0; | ||
106 | primShape.ProfileHollow = 0; | ||
107 | primShape.PathRadiusOffset = 0; | ||
108 | primShape.PathRevolutions = 0; | ||
109 | primShape.PathTaperX = 0; | ||
110 | primShape.PathTaperY = 0; | ||
111 | primShape.PathTwist = 0; | ||
112 | primShape.PathTwistBegin = 0; | ||
113 | LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005")); | ||
114 | primShape.TextureEntry = ntex.ToBytes(); | ||
115 | 106 | ||
116 | return primShape; | 107 | //boxShape.PathTaperX = 1; |
108 | //boxShape.PathTaperY = 1; | ||
109 | boxShape.PathSkew = 1; | ||
110 | |||
111 | return boxShape; | ||
117 | } | 112 | } |
118 | } | 113 | } |
119 | } | 114 | } |