1 files changed, 0 insertions, 127 deletions
diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs
deleted file mode 100644
index d907ed2..0000000
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * 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
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
-{
-    public class FlattenSphere : ITerrainPaintableEffect
-    {
-// TODO: unused
-//         private double GetBilinearInterpolate(double x, double y, ITerrainChannel map)
-//         {
-//             int w = map.Width;
-//             int h = map.Height;
-//             if (x > w - 2.0)
-//                 x = w - 2.0;
-//             if (y > h - 2.0)
-//                 y = h - 2.0;
-//             if (x < 0.0)
-//                 x = 0.0;
-//             if (y < 0.0)
-//                 y = 0.0;
-//             int stepSize = 1;
-//             double h00 = map[(int)x, (int)y];
-//             double h10 = map[(int)x + stepSize, (int)y];
-//             double h01 = map[(int)x, (int)y + stepSize];
-//             double h11 = map[(int)x + stepSize, (int)y + stepSize];
-//             double h1 = h00;
-//             double h2 = h10;
-//             double h3 = h01;
-//             double h4 = h11;
-//             double a00 = h1;
-//             double a10 = h2 - h1;
-//             double a01 = h3 - h1;
-//             double a11 = h1 - h2 - h3 + h4;
-//             double partialx = x - (int)x;
-//             double partialz = y - (int)y;
-//             double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);
-//             return hi;
-//         }
-        #region ITerrainPaintableEffect Members
-        public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
-        {
-            strength = TerrainUtil.MetersToSphericalStrength(strength);
-            int x, y;
-            double[,] tweak = new double[map.Width,map.Height];
-            double area = strength;
-            double step = strength / 4.0;
-            double sum = 0.0;
-            double step2 = 0.0;
-            double avg = 0.0;
-            // compute delta map 
-            for (x = 0; x < map.Width; x++)
-            {
-                for (y = 0; y < map.Height; y++)
-                {
-                    double z = SphericalFactor(x, y, rx, ry, strength);
-                    if (z > 0) // add in non-zero amount 
-                    {
-                        sum += map[x, y] * z;
-                        step2 += z;
-                    }
-                }
-            }
-            avg = sum / step2;
-            // blend in map 
-            for (x = 0; x < map.Width; x++)
-            {
-                for (y = 0; y < map.Height; y++)
-                {
-                    double z = SphericalFactor(x, y, rx, ry, strength) * duration;
-                    if (z > 0) // add in non-zero amount 
-                    {
-                        if (z > 1.0)
-                            z = 1.0;
-                        map[x, y] = (map[x, y] * (1.0 - z)) + (avg * z);
-                    }
-                }
-            }
-        }
-        #endregion
-        private double SphericalFactor(double x, double y, double rx, double ry, double size)
-        {
-            double z = size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));
-            return z;
-        }
-    }
-}
-\ No newline at end of file

diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs deleted file mode 100644 index d907ed2..0000000 --- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs +++ /dev/null
@@ -1,127 +0,0 @@
1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*
5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.
15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
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
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
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*/
27
28	using OpenSim.Region.Environment.Interfaces;
29
30	namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
31	{
32	public class FlattenSphere : ITerrainPaintableEffect
33	{
34	// TODO: unused
35	// private double GetBilinearInterpolate(double x, double y, ITerrainChannel map)
36	// {
37	// int w = map.Width;
38	// int h = map.Height;
39
40	// if (x > w - 2.0)
41	// x = w - 2.0;
42	// if (y > h - 2.0)
43	// y = h - 2.0;
44	// if (x < 0.0)
45	// x = 0.0;
46	// if (y < 0.0)
47	// y = 0.0;
48
49	// int stepSize = 1;
50	// double h00 = map[(int)x, (int)y];
51	// double h10 = map[(int)x + stepSize, (int)y];
52	// double h01 = map[(int)x, (int)y + stepSize];
53	// double h11 = map[(int)x + stepSize, (int)y + stepSize];
54	// double h1 = h00;
55	// double h2 = h10;
56	// double h3 = h01;
57	// double h4 = h11;
58	// double a00 = h1;
59	// double a10 = h2 - h1;
60	// double a01 = h3 - h1;
61	// double a11 = h1 - h2 - h3 + h4;
62	// double partialx = x - (int)x;
63	// double partialz = y - (int)y;
64	// double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);
65	// return hi;
66	// }
67
68	#region ITerrainPaintableEffect Members
69
70	public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength, double duration)
71	{
72	strength = TerrainUtil.MetersToSphericalStrength(strength);
73
74	int x, y;
75	double[,] tweak = new double[map.Width,map.Height];
76
77	double area = strength;
78	double step = strength / 4.0;
79
80	double sum = 0.0;
81	double step2 = 0.0;
82	double avg = 0.0;
83
84	// compute delta map
85	for (x = 0; x < map.Width; x++)
86	{
87	for (y = 0; y < map.Height; y++)
88	{
89	double z = SphericalFactor(x, y, rx, ry, strength);
90
91	if (z > 0) // add in non-zero amount
92	{
93	sum += map[x, y] * z;
94	step2 += z;
95	}
96	}
97	}
98
99	avg = sum / step2;
100
101	// blend in map
102	for (x = 0; x < map.Width; x++)
103	{
104	for (y = 0; y < map.Height; y++)
105	{
106	double z = SphericalFactor(x, y, rx, ry, strength) * duration;
107
108	if (z > 0) // add in non-zero amount
109	{
110	if (z > 1.0)
111	z = 1.0;
112
113	map[x, y] = (map[x, y] * (1.0 - z)) + (avg * z);
114	}
115	}
116	}
117	}
118
119	#endregion
120
121	private double SphericalFactor(double x, double y, double rx, double ry, double size)
122	{
123	double z = size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));
124	return z;
125	}
126	}
127	} \ No newline at end of file