1 files changed, 0 insertions, 144 deletions
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/HydraulicErosion.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/HydraulicErosion.cs
deleted file mode 100644
index 608e0e3..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/HydraulicErosion.cs
+++ /dev/null
@@ -1,144 +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 System;
-namespace libTerrain
-{
-    partial class Channel
-    {
-        public void HydraulicErosion(Channel rain, double evaporation, double solubility, int frequency, int rounds)
-        {
-            SetDiff();
-            Channel water = new Channel(w, h);
-            Channel sediment = new Channel(w, h);
-            Channel terrain = this;
-            Channel waterFlow = new Channel(w, h);
-            NeighbourSystem type = NeighbourSystem.Moore;
-            int NEIGHBOUR_ME = 4;
-            int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
-            for (int i = 0; i < rounds; i++)
-            {
-                water += rain;
-                sediment = terrain*water;
-                terrain -= sediment;
-                for (int x = 1; x < w - 1; x++)
-                {
-                    for (int y = 1; y < h - 1; y++)
-                    {
-                        double[] heights = new double[NEIGHBOUR_MAX];
-                        double[] diffs = new double[NEIGHBOUR_MAX];
-                        double heightCenter = map[x, y];
-                        for (int j = 0; j < NEIGHBOUR_MAX; j++)
-                        {
-                            if (j != NEIGHBOUR_ME)
-                            {
-                                int[] coords = Neighbours(type, j);
-                                coords[0] += x;
-                                coords[1] += y;
-                                heights[j] = map[coords[0], coords[1]] + water.map[coords[0], coords[1]] +
-                                             sediment.map[coords[0], coords[1]];
-                                diffs[j] = heightCenter - heights[j];
-                            }
-                        }
-                        double totalHeight = 0;
-                        double totalHeightDiff = 0;
-                        int totalCellsCounted = 1;
-                        for (int j = 0; j < NEIGHBOUR_MAX; j++)
-                        {
-                            if (j != NEIGHBOUR_ME)
-                            {
-                                if (diffs[j] > 0)
-                                {
-                                    totalHeight += heights[j];
-                                    totalHeightDiff += diffs[j];
-                                    totalCellsCounted++;
-                                }
-                            }
-                        }
-                        if (totalCellsCounted == 1)
-                            continue;
-                        double averageHeight = totalHeight/totalCellsCounted;
-                        double waterAmount = Math.Min(water.map[x, y], heightCenter - averageHeight);
-                        // TODO: Check this.
-                        waterFlow.map[x, y] += waterFlow.map[x, y] - waterAmount;
-                        double totalInverseDiff = waterAmount/totalHeightDiff;
-                        for (int j = 0; j < NEIGHBOUR_MAX; j++)
-                        {
-                            if (j != NEIGHBOUR_ME)
-                            {
-                                int[] coords = Neighbours(type, j);
-                                coords[0] += x;
-                                coords[1] += y;
-                                if (diffs[j] > 0)
-                                {
-                                    waterFlow.SetWrap(coords[0], coords[1],
-                                                      waterFlow.map[coords[0], coords[1]] + diffs[j]*totalInverseDiff);
-                                }
-                            }
-                        }
-                    }
-                }
-                water += waterFlow;
-                waterFlow.Fill(0);
-                water *= evaporation;
-                for (int x = 0; x < w; x++)
-                {
-                    for (int y = 0; y < h; y++)
-                    {
-                        double deposition = sediment.map[x, y] - water.map[x, y]*solubility;
-                        if (deposition > 0)
-                        {
-                            sediment.map[x, y] -= deposition;
-                            terrain.map[x, y] += deposition;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/HydraulicErosion.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/HydraulicErosion.cs deleted file mode 100644 index 608e0e3..0000000 --- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/HydraulicErosion.cs +++ /dev/null
@@ -1,144 +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 System;
29
30	namespace libTerrain
31	{
32	partial class Channel
33	{
34	public void HydraulicErosion(Channel rain, double evaporation, double solubility, int frequency, int rounds)
35	{
36	SetDiff();
37
38	Channel water = new Channel(w, h);
39	Channel sediment = new Channel(w, h);
40	Channel terrain = this;
41	Channel waterFlow = new Channel(w, h);
42
43	NeighbourSystem type = NeighbourSystem.Moore;
44	int NEIGHBOUR_ME = 4;
45
46	int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
47
48	for (int i = 0; i < rounds; i++)
49	{
50	water += rain;
51
52	sediment = terrain*water;
53	terrain -= sediment;
54
55	for (int x = 1; x < w - 1; x++)
56	{
57	for (int y = 1; y < h - 1; y++)
58	{
59	double[] heights = new double[NEIGHBOUR_MAX];
60	double[] diffs = new double[NEIGHBOUR_MAX];
61
62	double heightCenter = map[x, y];
63
64	for (int j = 0; j < NEIGHBOUR_MAX; j++)
65	{
66	if (j != NEIGHBOUR_ME)
67	{
68	int[] coords = Neighbours(type, j);
69	coords[0] += x;
70	coords[1] += y;
71
72	heights[j] = map[coords[0], coords[1]] + water.map[coords[0], coords[1]] +
73	sediment.map[coords[0], coords[1]];
74	diffs[j] = heightCenter - heights[j];
75	}
76	}
77
78	double totalHeight = 0;
79	double totalHeightDiff = 0;
80	int totalCellsCounted = 1;
81
82	for (int j = 0; j < NEIGHBOUR_MAX; j++)
83	{
84	if (j != NEIGHBOUR_ME)
85	{
86	if (diffs[j] > 0)
87	{
88	totalHeight += heights[j];
89	totalHeightDiff += diffs[j];
90	totalCellsCounted++;
91	}
92	}
93	}
94
95	if (totalCellsCounted == 1)
96	continue;
97
98	double averageHeight = totalHeight/totalCellsCounted;
99	double waterAmount = Math.Min(water.map[x, y], heightCenter - averageHeight);
100
101	// TODO: Check this.
102	waterFlow.map[x, y] += waterFlow.map[x, y] - waterAmount;
103
104	double totalInverseDiff = waterAmount/totalHeightDiff;
105
106	for (int j = 0; j < NEIGHBOUR_MAX; j++)
107	{
108	if (j != NEIGHBOUR_ME)
109	{
110	int[] coords = Neighbours(type, j);
111	coords[0] += x;
112	coords[1] += y;
113
114	if (diffs[j] > 0)
115	{
116	waterFlow.SetWrap(coords[0], coords[1],
117	waterFlow.map[coords[0], coords[1]] + diffs[j]*totalInverseDiff);
118	}
119	}
120	}
121	}
122	}
123
124	water += waterFlow;
125	waterFlow.Fill(0);
126
127	water *= evaporation;
128
129	for (int x = 0; x < w; x++)
130	{
131	for (int y = 0; y < h; y++)
132	{
133	double deposition = sediment.map[x, y] - water.map[x, y]*solubility;
134	if (deposition > 0)
135	{
136	sediment.map[x, y] -= deposition;
137	terrain.map[x, y] += deposition;
138	}
139	}
140	}
141	}
142	}
143	}
144	}