diff options
5 files changed, 27 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs index f12286d..5d4d0f5 100644 --- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | |||
@@ -625,6 +625,17 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
625 | startPoint.X += endPoint.X; | 625 | startPoint.X += endPoint.X; |
626 | startPoint.Y += endPoint.Y; | 626 | startPoint.Y += endPoint.Y; |
627 | } | 627 | } |
628 | else if (nextLine.StartsWith("FillEllipse")) | ||
629 | { | ||
630 | float x = 0; | ||
631 | float y = 0; | ||
632 | GetParams(partsDelimiter, ref nextLine, 11, ref x, ref y); | ||
633 | endPoint.X = (int)x; | ||
634 | endPoint.Y = (int)y; | ||
635 | graph.FillEllipse(myBrush, startPoint.X, startPoint.Y, endPoint.X, endPoint.Y); | ||
636 | startPoint.X += endPoint.X; | ||
637 | startPoint.Y += endPoint.Y; | ||
638 | } | ||
628 | else if (nextLine.StartsWith("FontSize")) | 639 | else if (nextLine.StartsWith("FontSize")) |
629 | { | 640 | { |
630 | nextLine = nextLine.Remove(0, 8); | 641 | nextLine = nextLine.Remove(0, 8); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index e51a078..37f8970 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1191,6 +1191,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1191 | return drawList; | 1191 | return drawList; |
1192 | } | 1192 | } |
1193 | 1193 | ||
1194 | public string osDrawFilledEllipse(string drawList, int width, int height) | ||
1195 | { | ||
1196 | CheckThreatLevel(ThreatLevel.None, "osDrawFilledEllipse"); | ||
1197 | |||
1198 | m_host.AddScriptLPS(1); | ||
1199 | drawList += "FillEllipse " + width + "," + height + "; "; | ||
1200 | return drawList; | ||
1201 | } | ||
1202 | |||
1194 | public string osDrawRectangle(string drawList, int width, int height) | 1203 | public string osDrawRectangle(string drawList, int width, int height) |
1195 | { | 1204 | { |
1196 | CheckThreatLevel(ThreatLevel.None, "osDrawRectangle"); | 1205 | CheckThreatLevel(ThreatLevel.None, "osDrawRectangle"); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index bd5d008..da3d6de 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -222,6 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
222 | string osDrawLine(string drawList, int endX, int endY); | 222 | string osDrawLine(string drawList, int endX, int endY); |
223 | string osDrawText(string drawList, string text); | 223 | string osDrawText(string drawList, string text); |
224 | string osDrawEllipse(string drawList, int width, int height); | 224 | string osDrawEllipse(string drawList, int width, int height); |
225 | string osDrawFilledEllipse(string drawList, int width, int height); | ||
225 | string osDrawRectangle(string drawList, int width, int height); | 226 | string osDrawRectangle(string drawList, int width, int height); |
226 | string osDrawFilledRectangle(string drawList, int width, int height); | 227 | string osDrawFilledRectangle(string drawList, int width, int height); |
227 | string osDrawPolygon(string drawList, LSL_List x, LSL_List y); | 228 | string osDrawPolygon(string drawList, LSL_List x, LSL_List y); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 9eac114..1451efc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -355,6 +355,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
355 | return m_OSSL_Functions.osDrawEllipse(drawList, width, height); | 355 | return m_OSSL_Functions.osDrawEllipse(drawList, width, height); |
356 | } | 356 | } |
357 | 357 | ||
358 | public string osDrawFilledEllipse(string drawList, int width, int height) | ||
359 | { | ||
360 | return m_OSSL_Functions.osDrawFilledEllipse(drawList, width, height); | ||
361 | } | ||
362 | |||
358 | public string osDrawRectangle(string drawList, int width, int height) | 363 | public string osDrawRectangle(string drawList, int width, int height) |
359 | { | 364 | { |
360 | return m_OSSL_Functions.osDrawRectangle(drawList, width, height); | 365 | return m_OSSL_Functions.osDrawRectangle(drawList, width, height); |
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini index dca1c0c..f9bfe03 100644 --- a/bin/config-include/osslEnable.ini +++ b/bin/config-include/osslEnable.ini | |||
@@ -68,6 +68,7 @@ | |||
68 | 68 | ||
69 | ; ThreatLevel None | 69 | ; ThreatLevel None |
70 | Allow_osDrawEllipse = true | 70 | Allow_osDrawEllipse = true |
71 | Allow_osDrawFilledEllipse = true | ||
71 | Allow_osDrawFilledPolygon = true | 72 | Allow_osDrawFilledPolygon = true |
72 | Allow_osDrawFilledRectangle = true | 73 | Allow_osDrawFilledRectangle = true |
73 | Allow_osDrawImage = true | 74 | Allow_osDrawImage = true |