aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorJeff Ames2008-08-16 17:26:25 +0000
committerJeff Ames2008-08-16 17:26:25 +0000
commit6fa26f5b41ab1a455783342c200fe68aeae515aa (patch)
tree6295bd30044aff271f616b178586acfbb5feeeec /OpenSim/Region/ScriptEngine/Shared
parent* Adds Slightly better terrain shading to maptile generation. (diff)
downloadopensim-SC_OLD-6fa26f5b41ab1a455783342c200fe68aeae515aa.zip
opensim-SC_OLD-6fa26f5b41ab1a455783342c200fe68aeae515aa.tar.gz
opensim-SC_OLD-6fa26f5b41ab1a455783342c200fe68aeae515aa.tar.bz2
opensim-SC_OLD-6fa26f5b41ab1a455783342c200fe68aeae515aa.tar.xz
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs150
1 files changed, 75 insertions, 75 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 9a3fc5c..410921a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1019,7 +1019,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1019 LLObject.TextureEntry tex = part.Shape.Textures; 1019 LLObject.TextureEntry tex = part.Shape.Textures;
1020 if (face > -1) 1020 if (face > -1)
1021 { 1021 {
1022 tex.CreateFace((uint) face); 1022 tex.CreateFace((uint) face);
1023 tex.FaceTextures[face].Glow = glow; 1023 tex.FaceTextures[face].Glow = glow;
1024 part.UpdateTexture(tex); 1024 part.UpdateTexture(tex);
1025 return; 1025 return;
@@ -1032,63 +1032,63 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1032 { 1032 {
1033 tex.FaceTextures[i].Glow = glow; 1033 tex.FaceTextures[i].Glow = glow;
1034 } 1034 }
1035 tex.DefaultTexture.Glow = glow; 1035 tex.DefaultTexture.Glow = glow;
1036 } 1036 }
1037 part.UpdateTexture(tex); 1037 part.UpdateTexture(tex);
1038 return; 1038 return;
1039 } 1039 }
1040 } 1040 }
1041 1041
1042 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump) 1042 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump)
1043 { 1043 {
1044 1044
1045 Shininess sval = new Shininess(); 1045 Shininess sval = new Shininess();
1046 1046
1047 switch (shiny) 1047 switch (shiny)
1048 { 1048 {
1049 case 0: 1049 case 0:
1050 sval = Shininess.None; 1050 sval = Shininess.None;
1051 break; 1051 break;
1052 case 1: 1052 case 1:
1053 sval = Shininess.Low; 1053 sval = Shininess.Low;
1054 break; 1054 break;
1055 case 2: 1055 case 2:
1056 sval = Shininess.Medium; 1056 sval = Shininess.Medium;
1057 break; 1057 break;
1058 case 3: 1058 case 3:
1059 sval = Shininess.High; 1059 sval = Shininess.High;
1060 break; 1060 break;
1061 default: 1061 default:
1062 sval = Shininess.None; 1062 sval = Shininess.None;
1063 break; 1063 break;
1064 } 1064 }
1065 1065
1066 LLObject.TextureEntry tex = part.Shape.Textures; 1066 LLObject.TextureEntry tex = part.Shape.Textures;
1067 if (face > -1) 1067 if (face > -1)
1068 { 1068 {
1069 tex.CreateFace((uint) face); 1069 tex.CreateFace((uint) face);
1070 tex.FaceTextures[face].Shiny = sval; 1070 tex.FaceTextures[face].Shiny = sval;
1071 tex.FaceTextures[face].Bump = bump; 1071 tex.FaceTextures[face].Bump = bump;
1072 part.UpdateTexture(tex); 1072 part.UpdateTexture(tex);
1073 return; 1073 return;
1074 } 1074 }
1075 else if (face == -1) 1075 else if (face == -1)
1076 { 1076 {
1077 for (uint i = 0; i < 32; i++) 1077 for (uint i = 0; i < 32; i++)
1078 { 1078 {
1079 if (tex.FaceTextures[i] != null) 1079 if (tex.FaceTextures[i] != null)
1080 { 1080 {
1081 tex.FaceTextures[i].Shiny = sval; 1081 tex.FaceTextures[i].Shiny = sval;
1082 tex.FaceTextures[i].Bump = bump;; 1082 tex.FaceTextures[i].Bump = bump;;
1083 } 1083 }
1084 tex.DefaultTexture.Shiny = sval; 1084 tex.DefaultTexture.Shiny = sval;
1085 tex.DefaultTexture.Bump = bump; 1085 tex.DefaultTexture.Bump = bump;
1086 } 1086 }
1087 part.UpdateTexture(tex); 1087 part.UpdateTexture(tex);
1088 return; 1088 return;
1089 } 1089 }
1090 } 1090 }
1091 1091
1092 public double llGetAlpha(int face) 1092 public double llGetAlpha(int face)
1093 { 1093 {
1094 m_host.AddScriptLPS(1); 1094 m_host.AddScriptLPS(1);
@@ -5484,21 +5484,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5484 return; 5484 return;
5485 face = Convert.ToInt32(rules.Data[idx++]); 5485 face = Convert.ToInt32(rules.Data[idx++]);
5486 float glow = (float)Convert.ToDouble(rules.Data[idx++]); 5486 float glow = (float)Convert.ToDouble(rules.Data[idx++]);
5487 5487
5488 SetGlow(part, face, glow); 5488 SetGlow(part, face, glow);
5489 5489
5490 break; 5490 break;
5491 case (int)ScriptBaseClass.PRIM_BUMP_SHINY: 5491 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
5492 if (remain < 3) 5492 if (remain < 3)
5493 return; 5493 return;
5494 face = Convert.ToInt32(rules.Data[idx++]); 5494 face = Convert.ToInt32(rules.Data[idx++]);
5495 int shiny = Convert.ToInt32(rules.Data[idx++]); 5495 int shiny = Convert.ToInt32(rules.Data[idx++]);
5496 Bumpiness bump = (Bumpiness)Convert.ToByte(rules.Data[idx++]); 5496 Bumpiness bump = (Bumpiness)Convert.ToByte(rules.Data[idx++]);
5497 5497
5498 SetShiny(part, face, shiny, bump); 5498 SetShiny(part, face, shiny, bump);
5499 5499
5500 break; 5500 break;
5501 } 5501 }
5502 } 5502 }
5503 } 5503 }
5504 5504
@@ -5568,12 +5568,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5568 5568
5569 LSL_Types.list l = new LSL_Types.list(); 5569 LSL_Types.list l = new LSL_Types.list();
5570 ScenePresence av = World.GetScenePresence(id); 5570 ScenePresence av = World.GetScenePresence(id);
5571 if( av == null ) 5571 if (av == null)
5572 return l; 5572 return l;
5573 LLUUID[] anims; 5573 LLUUID[] anims;
5574 anims = av.GetAnimationArray(); 5574 anims = av.GetAnimationArray();
5575 foreach( LLUUID foo in anims ) 5575 foreach (LLUUID foo in anims)
5576 l.Add( foo.ToString() ); 5576 l.Add(foo.ToString());
5577 return l; 5577 return l;
5578 } 5578 }
5579 5579
@@ -6662,20 +6662,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6662 public void llParcelMediaCommandList(LSL_Types.list commandList) 6662 public void llParcelMediaCommandList(LSL_Types.list commandList)
6663 { 6663 {
6664 //TO DO: Implement the missing commands 6664 //TO DO: Implement the missing commands
6665 //PARCEL_MEDIA_COMMAND_STOP Stop the media stream and go back to the first frame. 6665 //PARCEL_MEDIA_COMMAND_STOP Stop the media stream and go back to the first frame.
6666 //PARCEL_MEDIA_COMMAND_PAUSE Pause the media stream (stop playing but stay on current frame). 6666 //PARCEL_MEDIA_COMMAND_PAUSE Pause the media stream (stop playing but stay on current frame).
6667 //PARCEL_MEDIA_COMMAND_PLAY Start the media stream playing from the current frame and stop when the end is reached. 6667 //PARCEL_MEDIA_COMMAND_PLAY Start the media stream playing from the current frame and stop when the end is reached.
6668 //PARCEL_MEDIA_COMMAND_LOOP Start the media stream playing from the current frame. When the end is reached, loop to the beginning and continue. 6668 //PARCEL_MEDIA_COMMAND_LOOP Start the media stream playing from the current frame. When the end is reached, loop to the beginning and continue.
6669 //PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture. 6669 //PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture.
6670 //PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url. 6670 //PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url.
6671 //PARCEL_MEDIA_COMMAND_TIME float time Move a media stream to a specific time. 6671 //PARCEL_MEDIA_COMMAND_TIME float time Move a media stream to a specific time.
6672 //PARCEL_MEDIA_COMMAND_AGENT key uuid Applies the media command to the specified agent only. 6672 //PARCEL_MEDIA_COMMAND_AGENT key uuid Applies the media command to the specified agent only.
6673 //PARCEL_MEDIA_COMMAND_UNLOAD Completely unloads the movie and restores the original texture. 6673 //PARCEL_MEDIA_COMMAND_UNLOAD Completely unloads the movie and restores the original texture.
6674 //PARCEL_MEDIA_COMMAND_AUTO_ALIGN integer boolean Sets the parcel option 'Auto scale content'. 6674 //PARCEL_MEDIA_COMMAND_AUTO_ALIGN integer boolean Sets the parcel option 'Auto scale content'.
6675 //PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later) 6675 //PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later)
6676 //PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later) 6676 //PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later)
6677 //PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later) 6677 //PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later)
6678 //PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later) 6678 //PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later)
6679 m_host.AddScriptLPS(1); 6679 m_host.AddScriptLPS(1);
6680 for (int i = 0; i < commandList.Data.Length; i++) 6680 for (int i = 0; i < commandList.Data.Length; i++)
6681 { 6681 {
@@ -6753,12 +6753,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6753 m_host.AddScriptLPS(1); 6753 m_host.AddScriptLPS(1);
6754 LSL_Types.list list = new LSL_Types.list(); 6754 LSL_Types.list list = new LSL_Types.list();
6755 //TO DO: make the implementation for the missing commands 6755 //TO DO: make the implementation for the missing commands
6756 //PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture. 6756 //PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture.
6757 //PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url. 6757 //PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url.
6758 //PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later) 6758 //PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later)
6759 //PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later) 6759 //PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later)
6760 //PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later) 6760 //PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later)
6761 //PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later) 6761 //PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later)
6762 for (int i = 0; i < aList.Data.Length; i++) 6762 for (int i = 0; i < aList.Data.Length; i++)
6763 { 6763 {
6764 6764