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

Kan-Ed fix series. 

XEngine: Change a number of methods to use the new link part method.
Fix ALL_SIDES for llSetColor, llSetTexture, llSetAlpha, llSetPrimitiveParams,
llGetPrimitiveParams(PRIM_TEXTURE, PRIM_COLOR).
0.6.0-stable
Melanie Thielker 2008-09-18 03:38:20 +00:00
parent 553d554e2c
commit deaf0e3814
1 changed files with 63 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1052,7 +1052,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
else if (face == -1) else if (face == -1)
{ {
for (uint i = 0; i < llGetNumberOfSides(); i++) for (uint i = 0; i < GetNumberOfSides(part); i++)
{ {
if (tex.FaceTextures[i] != null) if (tex.FaceTextures[i] != null)
{ {
@ -1085,7 +1085,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
else if (face == -1) else if (face == -1)
{ {
for (uint i = 0; i < 32; i++) for (uint i = 0; i < GetNumberOfSides(part); i++)
{ {
if (tex.FaceTextures[i] != null) if (tex.FaceTextures[i] != null)
{ {
@ -1209,7 +1209,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
else if (face == -1) else if (face == -1)
{ {
for (int i = 0; i < 32; i++) for (int i = 0; i < GetNumberOfSides(part); i++)
{ {
if (tex.FaceTextures[i] != null) if (tex.FaceTextures[i] != null)
{ {
@ -3465,14 +3465,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Types.LSLInteger llGetNumberOfSides() public LSL_Types.LSLInteger llGetNumberOfSides()
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
return GetNumberOfSides(m_host);
}
public LSL_Types.LSLInteger GetNumberOfSides(SceneObjectPart part)
{
int ret = 0; int ret = 0;
bool hasCut; bool hasCut;
bool hasHollow; bool hasHollow;
bool hasDimple; bool hasDimple;
bool hasProfileCut; bool hasProfileCut;
int primType = getScriptPrimType(m_host.Shape); int primType = getScriptPrimType(part.Shape);
hasCutHollowDimpleProfileCut(primType, m_host.Shape, out hasCut, out hasHollow, out hasDimple, out hasProfileCut); hasCutHollowDimpleProfileCut(primType, part.Shape, out hasCut, out hasHollow, out hasDimple, out hasProfileCut);
switch (primType) switch (primType)
{ {
@ -5543,21 +5549,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void llSetPrimitiveParams(LSL_Types.list rules) public void llSetPrimitiveParams(LSL_Types.list rules)
{ {
llSetLinkPrimitiveParams(m_host.LinkNum, rules); SetPrimParams(m_host, rules);
} }
public void llSetLinkPrimitiveParams(int linknumber, LSL_Types.list rules) public void llSetLinkPrimitiveParams(int linknumber, LSL_Types.list rules)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
if (m_host.ParentGroup == null) List<SceneObjectPart> parts = GetLinkParts(linknumber);
return;
SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber); foreach (SceneObjectPart part in parts)
SetPrimParams(part, rules);
if (part == null) }
return;
private void SetPrimParams(SceneObjectPart part, LSL_Types.list rules)
{
int idx = 0; int idx = 0;
while (idx < rules.Length) while (idx < rules.Length)
@ -6235,20 +6241,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return res; return res;
int face = (int)rules.GetLSLIntegerItem(idx++); int face = (int)rules.GetLSLIntegerItem(idx++);
if (face == -1)
face = 0;
Primitive.TextureEntry tex = m_host.Shape.Textures; Primitive.TextureEntry tex = m_host.Shape.Textures;
Primitive.TextureEntryFace texface = tex.GetFace((uint)face); if (face == -1) // ALL_SIDES
{
for (face = 0 ; face < GetNumberOfSides(m_host) ; face++)
{
Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
res.Add(new LSL_Types.LSLString(texface.TextureID.ToString())); res.Add(new LSL_Types.LSLString(texface.TextureID.ToString()));
res.Add(new LSL_Types.Vector3(texface.RepeatU, res.Add(new LSL_Types.Vector3(texface.RepeatU,
texface.RepeatV, texface.RepeatV,
0)); 0));
res.Add(new LSL_Types.Vector3(texface.OffsetU, res.Add(new LSL_Types.Vector3(texface.OffsetU,
texface.OffsetV, texface.OffsetV,
0)); 0));
res.Add(new LSL_Types.LSLFloat(texface.Rotation)); res.Add(new LSL_Types.LSLFloat(texface.Rotation));
}
}
else
{
Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
res.Add(new LSL_Types.LSLString(texface.TextureID.ToString()));
res.Add(new LSL_Types.Vector3(texface.RepeatU,
texface.RepeatV,
0));
res.Add(new LSL_Types.Vector3(texface.OffsetU,
texface.OffsetV,
0));
res.Add(new LSL_Types.LSLFloat(texface.Rotation));
}
break; break;
case (int)ScriptBaseClass.PRIM_COLOR: case (int)ScriptBaseClass.PRIM_COLOR:
@ -6259,14 +6281,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
tex = m_host.Shape.Textures; tex = m_host.Shape.Textures;
Color4 texcolor; Color4 texcolor;
if (face == -1) // TMP: Until we can determine number of sides, ALL_SIDES (-1) will return default color if (face == -1) // ALL_SIDES
texcolor = tex.DefaultTexture.RGBA; {
for (face = 0 ; face < GetNumberOfSides(m_host) ; face++)
{
texcolor = tex.GetFace((uint)face).RGBA;
res.Add(new LSL_Types.Vector3((255 - (texcolor.R * 255)) / 255,
(255 - (texcolor.G * 255)) / 255,
(255 - (texcolor.B * 255)) / 255));
res.Add(new LSL_Types.LSLFloat((texcolor.A * 255) / 255));
}
}
else else
{
texcolor = tex.GetFace((uint)face).RGBA; texcolor = tex.GetFace((uint)face).RGBA;
res.Add(new LSL_Types.Vector3((255 - (texcolor.R * 255)) / 255, res.Add(new LSL_Types.Vector3((255 - (texcolor.R * 255)) / 255,
(255 - (texcolor.G * 255)) / 255, (255 - (texcolor.G * 255)) / 255,
(255 - (texcolor.B * 255)) / 255)); (255 - (texcolor.B * 255)) / 255));
res.Add(new LSL_Types.LSLFloat((texcolor.A * 255) / 255)); res.Add(new LSL_Types.LSLFloat((texcolor.A * 255) / 255));
}
break; break;
case (int)ScriptBaseClass.PRIM_BUMP_SHINY: case (int)ScriptBaseClass.PRIM_BUMP_SHINY: