From 7d4846462bf5f3c7fe862c7466d0461b6c5d228f Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 20 Feb 2009 02:33:54 +0000 Subject: Update svn properties, add copyright headers, minor formatting cleanup. --- .../Scripting/VectorRender/VectorRenderModule.cs | 92 ++++++++++------------ 1 file changed, 43 insertions(+), 49 deletions(-) (limited to 'OpenSim/Region/CoreModules/Scripting/VectorRender') diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs index 86f836c..7cee0cf 100644 --- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs @@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender int width = 256; int height = 256; int alpha = 255; // 0 is transparent - Color bgColour = Color.White; // Default background color + Color bgColour = Color.White; // Default background color char[] paramDelimiter = { ',' }; char[] nvpDelimiter = { ':' }; @@ -230,18 +230,17 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender } } break; - case "bgcolour": - int hex = 0; - if (Int32.TryParse(value, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex)) - { - bgColour = Color.FromArgb(hex); - } - else - { - - bgColour = Color.FromName(value); - } - break; + case "bgcolour": + int hex = 0; + if (Int32.TryParse(value, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex)) + { + bgColour = Color.FromArgb(hex); + } + else + { + bgColour = Color.FromName(value); + } + break; case "": // blank string has been passed do nothing just use defaults break; @@ -271,7 +270,6 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender } break; } - } Bitmap bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb); @@ -282,8 +280,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender // background color in their scripts, only do when fully opaque if (alpha == 255) { - graph.FillRectangle(new SolidBrush(bgColour), 0, 0, width, height); - + graph.FillRectangle(new SolidBrush(bgColour), 0, 0, width, height); } for (int w = 0; w < bitmap.Width; w++) @@ -294,7 +291,6 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender } } - GDIDraw(data, graph); byte[] imageJ2000 = new byte[0]; @@ -326,10 +322,8 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender } return parsed; - } - /* private void CairoDraw(string data, System.Drawing.Graphics graph) { @@ -462,38 +456,38 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender fontSize = Convert.ToSingle(nextLine, CultureInfo.InvariantCulture); myFont = new Font(fontName, fontSize); } - else if (nextLine.StartsWith("FontProp")) - { - nextLine = nextLine.Remove(0, 8); + else if (nextLine.StartsWith("FontProp")) + { + nextLine = nextLine.Remove(0, 8); nextLine = nextLine.Trim(); - string [] fprops = nextLine.Split(partsDelimiter); - foreach (string prop in fprops) { - - switch (prop) - { - case "B": - if(!(myFont.Bold)) - myFont = new Font(myFont, myFont.Style | FontStyle.Bold); - break; - case "I": - if(!(myFont.Italic)) - myFont = new Font(myFont, myFont.Style | FontStyle.Italic); - break; - case "U": - if(!(myFont.Underline)) - myFont = new Font(myFont, myFont.Style | FontStyle.Underline); - break; - case "S": - if(!(myFont.Strikeout)) - myFont = new Font(myFont, myFont.Style | FontStyle.Strikeout); - break; - case "R": - myFont = new Font(myFont, FontStyle.Regular); - break; - } - } - } + string [] fprops = nextLine.Split(partsDelimiter); + foreach (string prop in fprops) { + + switch (prop) + { + case "B": + if (!(myFont.Bold)) + myFont = new Font(myFont, myFont.Style | FontStyle.Bold); + break; + case "I": + if (!(myFont.Italic)) + myFont = new Font(myFont, myFont.Style | FontStyle.Italic); + break; + case "U": + if (!(myFont.Underline)) + myFont = new Font(myFont, myFont.Style | FontStyle.Underline); + break; + case "S": + if (!(myFont.Strikeout)) + myFont = new Font(myFont, myFont.Style | FontStyle.Strikeout); + break; + case "R": + myFont = new Font(myFont, FontStyle.Regular); + break; + } + } + } else if (nextLine.StartsWith("FontName")) { nextLine = nextLine.Remove(0, 8); -- cgit v1.1