1 files changed, 92 insertions, 92 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
index 305a875..51d5f0e 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -1,93 +1,93 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
-{
+{
-    public class SmoothSphere : ITerrainPaintableEffect
+    public class SmoothSphere : ITerrainPaintableEffect
-    {
+    {
-        #region ITerrainPaintableEffect Members
+        #region ITerrainPaintableEffect Members
-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
-        {
+        {
-            strength = TerrainUtil.MetersToSphericalStrength(strength);
+            strength = TerrainUtil.MetersToSphericalStrength(strength);
-            int x, y;
+            int x, y;
-            double[,] tweak = new double[map.Width,map.Height];
+            double[,] tweak = new double[map.Width,map.Height];
-            double n, l;
+            double n, l;
-            double area = strength;
+            double area = strength;
-            double step = strength / 4.0;
+            double step = strength / 4.0;
-            // compute delta map 
+            // compute delta map 
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
+                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
-                    if (z > 0) // add in non-zero amount 
+                    if (z > 0) // add in non-zero amount 
-                    {
+                    {
-                        double average = 0.0;
+                        double average = 0.0;
-                        int avgsteps = 0;
+                        int avgsteps = 0;
-                        for (n = 0.0 - area; n < area; n += step)
+                        for (n = 0.0 - area; n < area; n += step)
-                        {
+                        {
-                            for (l = 0.0 - area; l < area; l += step)
+                            for (l = 0.0 - area; l < area; l += step)
-                            {
+                            {
-                                avgsteps++;
+                                avgsteps++;
-                                average += TerrainUtil.GetBilinearInterpolate(x + n, y + l, map);
+                                average += TerrainUtil.GetBilinearInterpolate(x + n, y + l, map);
-                            }
+                            }
-                        }
+                        }
-                        tweak[x, y] = average / avgsteps;
+                        tweak[x, y] = average / avgsteps;
-                    }
+                    }
-                }
+                }
-            }
+            }
-            // blend in map 
+            // blend in map 
-            for (x = 0; x < map.Width; x++)
+            for (x = 0; x < map.Width; x++)
-            {
+            {
-                for (y = 0; y < map.Height; y++)
+                for (y = 0; y < map.Height; y++)
-                {
+                {
-                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
+                    double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
-                    if (z > 0) // add in non-zero amount 
+                    if (z > 0) // add in non-zero amount 
-                    {
+                    {
-                        double da = z;
+                        double da = z;
-                        double a = (map[x, y] - tweak[x, y]) * da;
+                        double a = (map[x, y] - tweak[x, y]) * da;
-                        double newz = map[x, y] - (a * duration);
+                        double newz = map[x, y] - (a * duration);
-                        if (newz > 0.0)
+                        if (newz > 0.0)
-                            map[x, y] = newz;
+                            map[x, y] = newz;
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        #endregion
+        #endregion
-    }
+    }
 }
 \ No newline at end of file

diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs index 305a875..51d5f0e 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -1,93 +1,93 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*/	26	*/
27		27
28	using OpenSim.Region.Environment.Interfaces;	28	using OpenSim.Region.Environment.Interfaces;
29		29
30	namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes	30	namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
31	{	31	{
32	public class SmoothSphere : ITerrainPaintableEffect	32	public class SmoothSphere : ITerrainPaintableEffect
33	{	33	{
34	#region ITerrainPaintableEffect Members	34	#region ITerrainPaintableEffect Members
35		35
36	public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)	36	public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
37	{	37	{
38	strength = TerrainUtil.MetersToSphericalStrength(strength);	38	strength = TerrainUtil.MetersToSphericalStrength(strength);
39		39
40	int x, y;	40	int x, y;
41	double[,] tweak = new double[map.Width,map.Height];	41	double[,] tweak = new double[map.Width,map.Height];
42		42
43	double n, l;	43	double n, l;
44	double area = strength;	44	double area = strength;
45	double step = strength / 4.0;	45	double step = strength / 4.0;
46		46
47	// compute delta map	47	// compute delta map
48	for (x = 0; x < map.Width; x++)	48	for (x = 0; x < map.Width; x++)
49	{	49	{
50	for (y = 0; y < map.Height; y++)	50	for (y = 0; y < map.Height; y++)
51	{	51	{
52	double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);	52	double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
53		53
54	if (z > 0) // add in non-zero amount	54	if (z > 0) // add in non-zero amount
55	{	55	{
56	double average = 0.0;	56	double average = 0.0;
57	int avgsteps = 0;	57	int avgsteps = 0;
58		58
59	for (n = 0.0 - area; n < area; n += step)	59	for (n = 0.0 - area; n < area; n += step)
60	{	60	{
61	for (l = 0.0 - area; l < area; l += step)	61	for (l = 0.0 - area; l < area; l += step)
62	{	62	{
63	avgsteps++;	63	avgsteps++;
64	average += TerrainUtil.GetBilinearInterpolate(x + n, y + l, map);	64	average += TerrainUtil.GetBilinearInterpolate(x + n, y + l, map);
65	}	65	}
66	}	66	}
67	tweak[x, y] = average / avgsteps;	67	tweak[x, y] = average / avgsteps;
68	}	68	}
69	}	69	}
70	}	70	}
71	// blend in map	71	// blend in map
72	for (x = 0; x < map.Width; x++)	72	for (x = 0; x < map.Width; x++)
73	{	73	{
74	for (y = 0; y < map.Height; y++)	74	for (y = 0; y < map.Height; y++)
75	{	75	{
76	double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);	76	double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
77		77
78	if (z > 0) // add in non-zero amount	78	if (z > 0) // add in non-zero amount
79	{	79	{
80	double da = z;	80	double da = z;
81	double a = (map[x, y] - tweak[x, y]) * da;	81	double a = (map[x, y] - tweak[x, y]) * da;
82	double newz = map[x, y] - (a * duration);	82	double newz = map[x, y] - (a * duration);
83		83
84	if (newz > 0.0)	84	if (newz > 0.0)
85	map[x, y] = newz;	85	map[x, y] = newz;
86	}	86	}
87	}	87	}
88	}	88	}
89	}	89	}
90		90
91	#endregion	91	#endregion
92	}	92	}
93	} \ No newline at end of file	93	} \ No newline at end of file