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

Remove casting nastiness in LSL_Api

0.6.0-stable
Melanie Thielker 2008-09-08 23:13:59 +00:00
parent 1034c1cdc1
commit 6ca7afabca
2 changed files with 80 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
View File

@ -329,6 +329,10 @@ namespace OpenSim.Region.Environment.Scenes
/// </param> /// </param>
protected void AddInventoryItem(string name, TaskInventoryItem item) protected void AddInventoryItem(string name, TaskInventoryItem item)
{ {
name = FindAvailableInventoryName(name);
if (name == String.Empty)
return;
item.ParentID = UUID; item.ParentID = UUID;
item.ParentPartID = UUID; item.ParentPartID = UUID;

152
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -5550,7 +5550,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
while (idx < rules.Length) while (idx < rules.Length)
{ {
int code = Convert.ToInt32(rules.Data[idx++].ToString()); int code = rules.GetLSLIntegerItem(idx++);
int remain = rules.Length - idx; int remain = rules.Length - idx;
@ -5563,7 +5563,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 1) if (remain < 1)
return; return;
v=new LSL_Types.Vector3(rules.Data[idx++].ToString()); v=rules.GetVector3Item(idx++);
SetPos(part, v); SetPos(part, v);
break; break;
@ -5571,7 +5571,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 1) if (remain < 1)
return; return;
v=new LSL_Types.Vector3(rules.Data[idx++].ToString()); v=rules.GetVector3Item(idx++);
SetScale(part, v); SetScale(part, v);
break; break;
@ -5579,7 +5579,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 1) if (remain < 1)
return; return;
LSL_Types.Quaternion q = new LSL_Types.Quaternion(rules.Data[idx++].ToString()); LSL_Types.Quaternion q = rules.GetQuaternionItem(idx++);
SetRot(part, q); SetRot(part, q);
break; break;
@ -5588,7 +5588,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 3) if (remain < 3)
return; return;
code = Convert.ToInt32(rules.Data[idx++].ToString()); code = (int)rules.GetLSLIntegerItem(idx++);
remain = rules.Length - idx; remain = rules.Length - idx;
float hollow; float hollow;
@ -5622,12 +5622,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 6) if (remain < 6)
return; return;
face = Convert.ToInt32(rules.Data[idx++].ToString()); // holeshape face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
v = new LSL_Types.Vector3(rules.Data[idx++].ToString()); // cut v = rules.GetVector3Item(idx++); // cut
hollow = (float)Convert.ToDouble(rules.Data[idx++].ToString()); hollow = (float)rules.GetLSLFloatItem(idx++);
twist = new LSL_Types.Vector3(rules.Data[idx++].ToString()); twist = rules.GetVector3Item(idx++);
taper_b = new LSL_Types.Vector3(rules.Data[idx++].ToString()); taper_b = rules.GetVector3Item(idx++);
topshear = new LSL_Types.Vector3(rules.Data[idx++].ToString()); topshear = rules.GetVector3Item(idx++);
part.Shape.ProfileShape = ProfileShape.Circle; part.Shape.ProfileShape = ProfileShape.Circle;
part.Shape.PathCurve = (byte)Extrusion.Straight; part.Shape.PathCurve = (byte)Extrusion.Straight;
SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, topshear, 0); SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, topshear, 0);
@ -5637,12 +5637,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 6) if (remain < 6)
return; return;
face = Convert.ToInt32(rules.Data[idx++].ToString()); // holeshape face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
v = new LSL_Types.Vector3(rules.Data[idx++].ToString()); //cut v = rules.GetVector3Item(idx++); //cut
hollow = (float)Convert.ToDouble(rules.Data[idx++].ToString()); hollow = (float)rules.GetLSLFloatItem(idx++);
twist = new LSL_Types.Vector3(rules.Data[idx++].ToString()); twist = rules.GetVector3Item(idx++);
taper_b = new LSL_Types.Vector3(rules.Data[idx++].ToString()); taper_b = rules.GetVector3Item(idx++);
topshear = new LSL_Types.Vector3(rules.Data[idx++].ToString()); topshear = rules.GetVector3Item(idx++);
part.Shape.PathCurve = (byte)Extrusion.Straight; part.Shape.PathCurve = (byte)Extrusion.Straight;
SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, topshear, 3); SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, topshear, 3);
break; break;
@ -5651,11 +5651,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 5) if (remain < 5)
return; return;
face = Convert.ToInt32(rules.Data[idx++].ToString()); // holeshape face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
v = new LSL_Types.Vector3(rules.Data[idx++].ToString()); // cut v = rules.GetVector3Item(idx++); // cut
hollow = (float)Convert.ToDouble(rules.Data[idx++].ToString()); hollow = (float)rules.GetLSLFloatItem(idx++);
twist = new LSL_Types.Vector3(rules.Data[idx++].ToString()); twist = rules.GetVector3Item(idx++);
taper_b = new LSL_Types.Vector3(rules.Data[idx++].ToString()); // dimple taper_b = rules.GetVector3Item(idx++); // dimple
part.Shape.PathCurve = (byte)Extrusion.Curve1; part.Shape.PathCurve = (byte)Extrusion.Curve1;
SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, 5); SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, 5);
break; break;
@ -5664,17 +5664,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 11) if (remain < 11)
return; return;
face = Convert.ToInt32(rules.Data[idx++].ToString()); // holeshape face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
v = new LSL_Types.Vector3(rules.Data[idx++].ToString()); //cut v = rules.GetVector3Item(idx++); //cut
hollow = (float)Convert.ToDouble(rules.Data[idx++].ToString()); hollow = (float)rules.GetLSLFloatItem(idx++);
twist = new LSL_Types.Vector3(rules.Data[idx++].ToString()); twist = rules.GetVector3Item(idx++);
holesize = new LSL_Types.Vector3(rules.Data[idx++].ToString()); holesize = rules.GetVector3Item(idx++);
topshear = new LSL_Types.Vector3(rules.Data[idx++].ToString()); topshear = rules.GetVector3Item(idx++);
profilecut = new LSL_Types.Vector3(rules.Data[idx++].ToString()); profilecut = rules.GetVector3Item(idx++);
taper_b = new LSL_Types.Vector3(rules.Data[idx++].ToString()); // taper_a taper_b = rules.GetVector3Item(idx++); // taper_a
revolutions = (float)Convert.ToDouble(rules.Data[idx++].ToString()); revolutions = (float)rules.GetLSLFloatItem(idx++);
radiusoffset = (float)Convert.ToDouble(rules.Data[idx++].ToString()); radiusoffset = (float)rules.GetLSLFloatItem(idx++);
skew = (float)Convert.ToDouble(rules.Data[idx++].ToString()); skew = (float)rules.GetLSLFloatItem(idx++);
part.Shape.PathCurve = (byte)Extrusion.Curve1; part.Shape.PathCurve = (byte)Extrusion.Curve1;
SetPrimitiveShapeParams(part, face, v, hollow, twist, holesize, topshear, profilecut, taper_b, revolutions, radiusoffset, skew, 0); SetPrimitiveShapeParams(part, face, v, hollow, twist, holesize, topshear, profilecut, taper_b, revolutions, radiusoffset, skew, 0);
break; break;
@ -5683,17 +5683,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 11) if (remain < 11)
return; return;
face = Convert.ToInt32(rules.Data[idx++].ToString()); // holeshape face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
v = new LSL_Types.Vector3(rules.Data[idx++].ToString()); //cut v = rules.GetVector3Item(idx++); //cut
hollow = (float)Convert.ToDouble(rules.Data[idx++].ToString()); hollow = (float)rules.GetLSLFloatItem(idx++);
twist = new LSL_Types.Vector3(rules.Data[idx++].ToString()); twist = rules.GetVector3Item(idx++);
holesize = new LSL_Types.Vector3(rules.Data[idx++].ToString()); holesize = rules.GetVector3Item(idx++);
topshear = new LSL_Types.Vector3(rules.Data[idx++].ToString()); topshear = rules.GetVector3Item(idx++);
profilecut = new LSL_Types.Vector3(rules.Data[idx++].ToString()); profilecut = rules.GetVector3Item(idx++);
taper_b = new LSL_Types.Vector3(rules.Data[idx++].ToString()); // taper_a taper_b = rules.GetVector3Item(idx++); // taper_a
revolutions = (float)Convert.ToDouble(rules.Data[idx++].ToString()); revolutions = (float)rules.GetLSLFloatItem(idx++);
radiusoffset = (float)Convert.ToDouble(rules.Data[idx++].ToString()); radiusoffset = (float)rules.GetLSLFloatItem(idx++);
skew = (float)Convert.ToDouble(rules.Data[idx++].ToString()); skew = (float)rules.GetLSLFloatItem(idx++);
part.Shape.PathCurve = (byte)Extrusion.Curve1; part.Shape.PathCurve = (byte)Extrusion.Curve1;
SetPrimitiveShapeParams(part, face, v, hollow, twist, holesize, topshear, profilecut, taper_b, revolutions, radiusoffset, skew, 1); SetPrimitiveShapeParams(part, face, v, hollow, twist, holesize, topshear, profilecut, taper_b, revolutions, radiusoffset, skew, 1);
break; break;
@ -5702,17 +5702,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 11) if (remain < 11)
return; return;
face = Convert.ToInt32(rules.Data[idx++].ToString()); // holeshape face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
v = new LSL_Types.Vector3(rules.Data[idx++].ToString()); //cut v = rules.GetVector3Item(idx++); //cut
hollow = (float)Convert.ToDouble(rules.Data[idx++].ToString()); hollow = (float)rules.GetLSLFloatItem(idx++);
twist = new LSL_Types.Vector3(rules.Data[idx++].ToString()); twist = rules.GetVector3Item(idx++);
holesize = new LSL_Types.Vector3(rules.Data[idx++].ToString()); holesize = rules.GetVector3Item(idx++);
topshear = new LSL_Types.Vector3(rules.Data[idx++].ToString()); topshear = rules.GetVector3Item(idx++);
profilecut = new LSL_Types.Vector3(rules.Data[idx++].ToString()); profilecut = rules.GetVector3Item(idx++);
taper_b = new LSL_Types.Vector3(rules.Data[idx++].ToString()); // taper_a taper_b = rules.GetVector3Item(idx++); // taper_a
revolutions = (float)Convert.ToDouble(rules.Data[idx++].ToString()); revolutions = (float)rules.GetLSLFloatItem(idx++);
radiusoffset = (float)Convert.ToDouble(rules.Data[idx++].ToString()); radiusoffset = (float)rules.GetLSLFloatItem(idx++);
skew = (float)Convert.ToDouble(rules.Data[idx++].ToString()); skew = (float)rules.GetLSLFloatItem(idx++);
part.Shape.PathCurve = (byte)Extrusion.Curve1; part.Shape.PathCurve = (byte)Extrusion.Curve1;
SetPrimitiveShapeParams(part, face, v, hollow, twist, holesize, topshear, profilecut, taper_b, revolutions, radiusoffset, skew, 3); SetPrimitiveShapeParams(part, face, v, hollow, twist, holesize, topshear, profilecut, taper_b, revolutions, radiusoffset, skew, 3);
break; break;
@ -5722,7 +5722,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return; return;
string map = rules.Data[idx++].ToString(); string map = rules.Data[idx++].ToString();
face = Convert.ToInt32(rules.Data[idx++].ToString()); // type face = (int)rules.GetLSLIntegerItem(idx++); // type
part.Shape.PathCurve = (byte)Extrusion.Curve1; part.Shape.PathCurve = (byte)Extrusion.Curve1;
SetPrimitiveShapeParams(part, map, face); SetPrimitiveShapeParams(part, map, face);
break; break;
@ -5734,11 +5734,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 5) if (remain < 5)
return; return;
face=Convert.ToInt32(rules.Data[idx++].ToString()); face=(int)rules.GetLSLIntegerItem(idx++);
string tex=rules.Data[idx++].ToString(); string tex=rules.Data[idx++].ToString();
LSL_Types.Vector3 repeats=new LSL_Types.Vector3(rules.Data[idx++].ToString()); LSL_Types.Vector3 repeats=rules.GetVector3Item(idx++);
LSL_Types.Vector3 offsets=new LSL_Types.Vector3(rules.Data[idx++].ToString()); LSL_Types.Vector3 offsets=rules.GetVector3Item(idx++);
double rotation=Convert.ToDouble(rules.Data[idx++].ToString()); double rotation=(double)rules.GetLSLFloatItem(idx++);
SetTexture(part, tex, face); SetTexture(part, tex, face);
ScaleTexture(part, repeats.x, repeats.y, face); ScaleTexture(part, repeats.x, repeats.y, face);
@ -5751,9 +5751,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 3) if (remain < 3)
return; return;
face=Convert.ToInt32(rules.Data[idx++].ToString()); face=(int)rules.GetLSLIntegerItem(idx++);
LSL_Types.Vector3 color=new LSL_Types.Vector3(rules.Data[idx++].ToString()); LSL_Types.Vector3 color=rules.GetVector3Item(idx++);
double alpha=Convert.ToDouble(rules.Data[idx++].ToString()); double alpha=(double)rules.GetLSLFloatItem(idx++);
SetColor(part, color, face); SetColor(part, color, face);
SetAlpha(part, alpha, face); SetAlpha(part, alpha, face);
@ -5793,7 +5793,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// as a raw CLI Int32. When / if this is inserted as an // as a raw CLI Int32. When / if this is inserted as an
// LSL_Types.LSLInteger extract value using LSL_Types.list.GetLSLIntegerItem // LSL_Types.LSLInteger extract value using LSL_Types.list.GetLSLIntegerItem
// face = rules.GetLSLIntegerItem(idx++); // face = rules.GetLSLIntegerItem(idx++);
face = Convert.ToInt32(rules.Data[idx++].ToString()); face = (int)rules.GetLSLIntegerItem(idx++);
float glow = (float)rules.GetLSLFloatItem(idx++); float glow = (float)rules.GetLSLFloatItem(idx++);
SetGlow(part, face, glow); SetGlow(part, face, glow);
@ -5802,9 +5802,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
case (int)ScriptBaseClass.PRIM_BUMP_SHINY: case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
if (remain < 3) if (remain < 3)
return; return;
face = Convert.ToInt32(rules.Data[idx++].ToString()); face = (int)rules.GetLSLIntegerItem(idx++);
int shiny = Convert.ToInt32(rules.Data[idx++].ToString()); int shiny = (int)rules.GetLSLIntegerItem(idx++);
Bumpiness bump = (Bumpiness)Convert.ToByte(rules.Data[idx++].ToString()); Bumpiness bump = (Bumpiness)Convert.ToByte((int)rules.GetLSLIntegerItem(idx++));
SetShiny(part, face, shiny, bump); SetShiny(part, face, shiny, bump);
@ -5816,7 +5816,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// as a raw CLI Int32. When / if this is inserted as an // as a raw CLI Int32. When / if this is inserted as an
// LSL_Types.LSLInteger extract value using LSL_Types.list.GetLSLIntegerItem // LSL_Types.LSLInteger extract value using LSL_Types.list.GetLSLIntegerItem
// face = rules.GetLSLIntegerItem(idx++); // face = rules.GetLSLIntegerItem(idx++);
face = Convert.ToInt32(rules.Data[idx++].ToString()); face = (int)rules.GetLSLIntegerItem(idx++);
bool st = rules.GetLSLIntegerItem(idx++); bool st = rules.GetLSLIntegerItem(idx++);
SetFullBright(part, face , st); SetFullBright(part, face , st);
break; break;
@ -5827,7 +5827,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
/* Unhandled at this time - sends "Unhandled" message /* Unhandled at this time - sends "Unhandled" message
will enable when available will enable when available
byte material = (byte)Convert.ToByte( rules.Data[idx++].ToString()); byte material = Convert.ToByte((int)rules.GetLSLIntegerItem(idx++));
part.Material = material; part.Material = material;
*/ */
return; return;
@ -6115,7 +6115,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
int idx=0; int idx=0;
while (idx < rules.Length) while (idx < rules.Length)
{ {
int code=Convert.ToInt32(rules.Data[idx++].ToString()); int code=(int)rules.GetLSLIntegerItem(idx++);
int remain=rules.Length-idx; int remain=rules.Length-idx;
switch (code) switch (code)
@ -6240,7 +6240,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 1) if (remain < 1)
return res; return res;
int face = Convert.ToInt32(rules.Data[idx++].ToString()); int face = (int)rules.GetLSLIntegerItem(idx++);
if (face == -1) if (face == -1)
face = 0; face = 0;
@ -6261,7 +6261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 1) if (remain < 1)
return res; return res;
face=Convert.ToInt32(rules.Data[idx++].ToString()); face=(int)rules.GetLSLIntegerItem(idx++);
tex = m_host.Shape.Textures; tex = m_host.Shape.Textures;
Color4 texcolor; Color4 texcolor;
@ -6280,7 +6280,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 1) if (remain < 1)
return res; return res;
face=Convert.ToInt32(rules.Data[idx++].ToString()); face=(int)rules.GetLSLIntegerItem(idx++);
res.Add(new LSL_Types.LSLInteger(0)); res.Add(new LSL_Types.LSLInteger(0));
res.Add(new LSL_Types.LSLInteger(0)); res.Add(new LSL_Types.LSLInteger(0));
@ -6291,7 +6291,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 1) if (remain < 1)
return res; return res;
face=Convert.ToInt32(rules.Data[idx++].ToString()); face=(int)rules.GetLSLIntegerItem(idx++);
res.Add(new LSL_Types.LSLInteger(0)); res.Add(new LSL_Types.LSLInteger(0));
break; break;
@ -6319,7 +6319,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 1) if (remain < 1)
return res; return res;
face=Convert.ToInt32(rules.Data[idx++].ToString()); face=(int)rules.GetLSLIntegerItem(idx++);
res.Add(new LSL_Types.LSLInteger(0)); res.Add(new LSL_Types.LSLInteger(0));
break; break;
@ -6344,7 +6344,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 1) if (remain < 1)
return res; return res;
face=Convert.ToInt32(rules.Data[idx++].ToString()); face=(int)rules.GetLSLIntegerItem(idx++);
res.Add(new LSL_Types.LSLFloat(0)); res.Add(new LSL_Types.LSLFloat(0));
break; break;