diff options
author | lbsa71 | 2008-01-10 13:37:59 +0000 |
---|---|---|
committer | lbsa71 | 2008-01-10 13:37:59 +0000 |
commit | 2f023f6362d7b1cf49a14d05dd39ab8afee4abd8 (patch) | |
tree | 21b200583b64e0066135232a24ff639c83f9b7b9 | |
parent | * Undid XmlIgnore thingy as it did cause breakage (diff) | |
download | opensim-SC-2f023f6362d7b1cf49a14d05dd39ab8afee4abd8.zip opensim-SC-2f023f6362d7b1cf49a14d05dd39ab8afee4abd8.tar.gz opensim-SC-2f023f6362d7b1cf49a14d05dd39ab8afee4abd8.tar.bz2 opensim-SC-2f023f6362d7b1cf49a14d05dd39ab8afee4abd8.tar.xz |
* removed unused PrimScale on PrimitiveBaseShape (use Scale instead)
* ignored bin
-rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index bccc36a..50959f6 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
@@ -103,7 +103,7 @@ namespace OpenSim.Framework | |||
103 | 103 | ||
104 | public PrimitiveBaseShape() | 104 | public PrimitiveBaseShape() |
105 | { | 105 | { |
106 | PCode = (byte)PCodeEnum.Primitive; | 106 | PCode = (byte) PCodeEnum.Primitive; |
107 | ExtraParams = new byte[1]; | 107 | ExtraParams = new byte[1]; |
108 | Textures = m_defaultTexture; | 108 | Textures = m_defaultTexture; |
109 | } | 109 | } |
@@ -125,29 +125,24 @@ namespace OpenSim.Framework | |||
125 | 125 | ||
126 | public ProfileShape ProfileShape | 126 | public ProfileShape ProfileShape |
127 | { | 127 | { |
128 | get { return (ProfileShape)(ProfileCurve & 0xf); } | 128 | get { return (ProfileShape) (ProfileCurve & 0xf); } |
129 | set | 129 | set |
130 | { | 130 | { |
131 | byte oldValueMasked = (byte)(ProfileCurve & 0xf0); | 131 | byte oldValueMasked = (byte) (ProfileCurve & 0xf0); |
132 | ProfileCurve = (byte)(oldValueMasked | (byte)value); | 132 | ProfileCurve = (byte) (oldValueMasked | (byte) value); |
133 | } | 133 | } |
134 | } | 134 | } |
135 | 135 | ||
136 | public HollowShape HollowShape | 136 | public HollowShape HollowShape |
137 | { | 137 | { |
138 | get { return (HollowShape)(ProfileCurve & 0xf0); } | 138 | get { return (HollowShape) (ProfileCurve & 0xf0); } |
139 | set | 139 | set |
140 | { | 140 | { |
141 | byte oldValueMasked = (byte)(ProfileCurve & 0x0f); | 141 | byte oldValueMasked = (byte) (ProfileCurve & 0x0f); |
142 | ProfileCurve = (byte)(oldValueMasked | (byte)value); | 142 | ProfileCurve = (byte) (oldValueMasked | (byte) value); |
143 | } | 143 | } |
144 | } | 144 | } |
145 | 145 | ||
146 | public LLVector3 PrimScale | ||
147 | { | ||
148 | get { return Scale; } | ||
149 | } | ||
150 | |||
151 | public static PrimitiveBaseShape Default | 146 | public static PrimitiveBaseShape Default |
152 | { | 147 | { |
153 | get | 148 | get |
@@ -171,7 +166,7 @@ namespace OpenSim.Framework | |||
171 | { | 166 | { |
172 | PrimitiveBaseShape shape = Create(); | 167 | PrimitiveBaseShape shape = Create(); |
173 | 168 | ||
174 | shape.PathCurve = (byte)Extrusion.Straight; | 169 | shape.PathCurve = (byte) Extrusion.Straight; |
175 | shape.ProfileShape = ProfileShape.Square; | 170 | shape.ProfileShape = ProfileShape.Square; |
176 | shape.PathScaleX = 100; | 171 | shape.PathScaleX = 100; |
177 | shape.PathScaleY = 100; | 172 | shape.PathScaleY = 100; |
@@ -183,7 +178,7 @@ namespace OpenSim.Framework | |||
183 | { | 178 | { |
184 | PrimitiveBaseShape shape = Create(); | 179 | PrimitiveBaseShape shape = Create(); |
185 | 180 | ||
186 | shape.PathCurve = (byte)Extrusion.Curve1; | 181 | shape.PathCurve = (byte) Extrusion.Curve1; |
187 | shape.ProfileShape = ProfileShape.Square; | 182 | shape.ProfileShape = ProfileShape.Square; |
188 | 183 | ||
189 | shape.PathScaleX = 100; | 184 | shape.PathScaleX = 100; |
@@ -204,7 +199,7 @@ namespace OpenSim.Framework | |||
204 | 199 | ||
205 | public void SetRadius(float radius) | 200 | public void SetRadius(float radius) |
206 | { | 201 | { |
207 | Scale.X = Scale.Y = radius * 2f; | 202 | Scale.X = Scale.Y = radius*2f; |
208 | } | 203 | } |
209 | 204 | ||
210 | //void returns need to change of course | 205 | //void returns need to change of course |
@@ -214,7 +209,7 @@ namespace OpenSim.Framework | |||
214 | 209 | ||
215 | public PrimitiveBaseShape Copy() | 210 | public PrimitiveBaseShape Copy() |
216 | { | 211 | { |
217 | return (PrimitiveBaseShape)MemberwiseClone(); | 212 | return (PrimitiveBaseShape) MemberwiseClone(); |
218 | } | 213 | } |
219 | 214 | ||
220 | public static PrimitiveBaseShape CreateCylinder(float radius, float heigth) | 215 | public static PrimitiveBaseShape CreateCylinder(float radius, float heigth) |