diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 66 |
1 files changed, 25 insertions, 41 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index b646f92..5e4d175 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
@@ -76,7 +76,7 @@ namespace OpenSim.Framework | |||
76 | { | 76 | { |
77 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 77 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
78 | 78 | ||
79 | private static readonly Primitive.TextureEntry m_defaultTexture; | 79 | private static readonly byte[] DEFAULT_TEXTURE = new Primitive.TextureEntry(new UUID("89556747-24cb-43ed-920b-47caed15465f")).GetBytes(); |
80 | 80 | ||
81 | private byte[] m_textureEntry; | 81 | private byte[] m_textureEntry; |
82 | 82 | ||
@@ -104,33 +104,32 @@ namespace OpenSim.Framework | |||
104 | private HollowShape _hollowShape; | 104 | private HollowShape _hollowShape; |
105 | 105 | ||
106 | // Sculpted | 106 | // Sculpted |
107 | [XmlIgnore] private UUID _sculptTexture = UUID.Zero; | 107 | [XmlIgnore] private UUID _sculptTexture; |
108 | [XmlIgnore] private byte _sculptType = (byte)0; | 108 | [XmlIgnore] private byte _sculptType; |
109 | [XmlIgnore] private byte[] _sculptData = new byte[0]; | 109 | [XmlIgnore] private byte[] _sculptData = Utils.EmptyBytes; |
110 | [XmlIgnore] private Image _sculptBitmap = null; | ||
111 | 110 | ||
112 | // Flexi | 111 | // Flexi |
113 | [XmlIgnore] private int _flexiSoftness = 0; | 112 | [XmlIgnore] private int _flexiSoftness; |
114 | [XmlIgnore] private float _flexiTension = 0f; | 113 | [XmlIgnore] private float _flexiTension; |
115 | [XmlIgnore] private float _flexiDrag = 0f; | 114 | [XmlIgnore] private float _flexiDrag; |
116 | [XmlIgnore] private float _flexiGravity = 0f; | 115 | [XmlIgnore] private float _flexiGravity; |
117 | [XmlIgnore] private float _flexiWind = 0f; | 116 | [XmlIgnore] private float _flexiWind; |
118 | [XmlIgnore] private float _flexiForceX = 0f; | 117 | [XmlIgnore] private float _flexiForceX; |
119 | [XmlIgnore] private float _flexiForceY = 0f; | 118 | [XmlIgnore] private float _flexiForceY; |
120 | [XmlIgnore] private float _flexiForceZ = 0f; | 119 | [XmlIgnore] private float _flexiForceZ; |
121 | 120 | ||
122 | //Bright n sparkly | 121 | //Bright n sparkly |
123 | [XmlIgnore] private float _lightColorR = 0f; | 122 | [XmlIgnore] private float _lightColorR; |
124 | [XmlIgnore] private float _lightColorG = 0f; | 123 | [XmlIgnore] private float _lightColorG; |
125 | [XmlIgnore] private float _lightColorB = 0f; | 124 | [XmlIgnore] private float _lightColorB; |
126 | [XmlIgnore] private float _lightColorA = 1f; | 125 | [XmlIgnore] private float _lightColorA = 1.0f; |
127 | [XmlIgnore] private float _lightRadius = 0f; | 126 | [XmlIgnore] private float _lightRadius; |
128 | [XmlIgnore] private float _lightCutoff = 0f; | 127 | [XmlIgnore] private float _lightCutoff; |
129 | [XmlIgnore] private float _lightFalloff = 0f; | 128 | [XmlIgnore] private float _lightFalloff; |
130 | [XmlIgnore] private float _lightIntensity = 1f; | 129 | [XmlIgnore] private float _lightIntensity = 1.0f; |
131 | [XmlIgnore] private bool _flexiEntry = false; | 130 | [XmlIgnore] private bool _flexiEntry; |
132 | [XmlIgnore] private bool _lightEntry = false; | 131 | [XmlIgnore] private bool _lightEntry; |
133 | [XmlIgnore] private bool _sculptEntry = false; | 132 | [XmlIgnore] private bool _sculptEntry; |
134 | 133 | ||
135 | public byte ProfileCurve | 134 | public byte ProfileCurve |
136 | { | 135 | { |
@@ -172,17 +171,11 @@ namespace OpenSim.Framework | |||
172 | } | 171 | } |
173 | } | 172 | } |
174 | 173 | ||
175 | static PrimitiveBaseShape() | ||
176 | { | ||
177 | m_defaultTexture = | ||
178 | new Primitive.TextureEntry(new UUID("89556747-24cb-43ed-920b-47caed15465f")); | ||
179 | } | ||
180 | |||
181 | public PrimitiveBaseShape() | 174 | public PrimitiveBaseShape() |
182 | { | 175 | { |
183 | PCode = (byte) PCodeEnum.Primitive; | 176 | PCode = (byte) PCodeEnum.Primitive; |
184 | ExtraParams = new byte[1]; | 177 | ExtraParams = new byte[1]; |
185 | Textures = m_defaultTexture; | 178 | m_textureEntry = DEFAULT_TEXTURE; |
186 | } | 179 | } |
187 | 180 | ||
188 | public PrimitiveBaseShape(bool noShape) | 181 | public PrimitiveBaseShape(bool noShape) |
@@ -192,7 +185,7 @@ namespace OpenSim.Framework | |||
192 | 185 | ||
193 | PCode = (byte)PCodeEnum.Primitive; | 186 | PCode = (byte)PCodeEnum.Primitive; |
194 | ExtraParams = new byte[1]; | 187 | ExtraParams = new byte[1]; |
195 | Textures = m_defaultTexture; | 188 | m_textureEntry = DEFAULT_TEXTURE; |
196 | } | 189 | } |
197 | 190 | ||
198 | [XmlIgnore] | 191 | [XmlIgnore] |
@@ -577,15 +570,6 @@ namespace OpenSim.Framework | |||
577 | } | 570 | } |
578 | } | 571 | } |
579 | 572 | ||
580 | public Image SculptBitmap { | ||
581 | get { | ||
582 | return _sculptBitmap; | ||
583 | } | ||
584 | set { | ||
585 | _sculptBitmap = value; | ||
586 | } | ||
587 | } | ||
588 | |||
589 | public int FlexiSoftness { | 573 | public int FlexiSoftness { |
590 | get { | 574 | get { |
591 | return _flexiSoftness; | 575 | return _flexiSoftness; |