From cd88a4914dc31779a13d673aaaa6a1327ebeb351 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Wed, 25 Jul 2007 10:08:16 +0000
Subject: * Assorted terrain fixes

---
 .../Channel/Manipulators/AerobicErosion.cs         | 37 +++++++++++++++++---
 .../Channel/Manipulators/NavierStokes.cs           | 39 +++++++++++++++++++---
 2 files changed, 68 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators')

diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs
index f4dfe1d..fecb748 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs
@@ -76,13 +76,19 @@ namespace libTerrain
         /// <param name="lowest">Drop sediment at the lowest point?</param>
         public void AerobicErosion(double windspeed, double pickupTalusMinimum, double dropTalusMinimum, double carry, int rounds, bool lowest, bool usingFluidDynamics)
         {
+            bool debugImages = true;
+
             Channel wind = new Channel(w, h) ;
             Channel sediment = new Channel(w, h);
             int x, y, i, j;
 
+            this.Normalise();
+
             wind = this.Copy();
-            wind.Normalise();   // Cheap wind calculations
-            wind *= windspeed;
+            wind.Noise();
+
+            if (debugImages)
+                wind.SaveImage("testimg/wind_start.png");
 
             if (usingFluidDynamics)
             {
@@ -90,9 +96,12 @@ namespace libTerrain
             }
             else
             {
-                wind.Pertubation(30);   // Can do better later
+                wind.Pertubation(30);
             }
 
+            if (debugImages)
+                wind.SaveImage("testimg/wind_begin.png");
+
             for (i = 0; i < rounds; i++)
             {
                 // Convert some rocks to sand
@@ -127,7 +136,14 @@ namespace libTerrain
                 if (usingFluidDynamics)
                 {
                     sediment.navierStokes(7, 0.1, 0.0, 0.1);
-                    wind.navierStokes(10, 0.1, 0.0, 0.0);
+
+                    Channel noiseChan = new Channel(w, h);
+                    noiseChan.Noise();
+                    wind.Blend(noiseChan, 0.01);
+
+                    wind.navierStokes(10, 0.1, 0.01, 0.01);
+
+                    sediment.Distort(wind, windspeed);
                 }
                 else
                 {
@@ -137,6 +153,9 @@ namespace libTerrain
                     sediment.seed++;
                 }
 
+                if (debugImages)
+                    wind.SaveImage("testimg/wind_" + i.ToString() + ".png");
+
                 // Convert some sand to rock
                 for (x = 1; x < w - 1; x++)
                 {
@@ -174,11 +193,21 @@ namespace libTerrain
                     }
                 }
 
+                if (debugImages)
+                    sediment.SaveImage("testimg/sediment_" + i.ToString() + ".png");
+
+                wind.Normalise();
+                wind *= windspeed;
+
+                this.Normalise();
             }
 
             Channel myself = this;
             myself += sediment;
             myself.Normalise();
+
+            if (debugImages)
+                this.SaveImage("testimg/output.png");
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/NavierStokes.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/NavierStokes.cs
index a035098..8a111ed 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/NavierStokes.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/NavierStokes.cs
@@ -211,11 +211,11 @@ namespace libTerrain
             int i;
             int j;
 
-            for (i = 0; i <= N; i++)
+            for (i = 1; i <= N; i++)
             {
-                for (j = 0; j <= N; j++)
+                for (j = 1; j <= N; j++)
                 {
-                    doubles[i, j] = dens[nsIX(i, j, N)];
+                    doubles[i - 1, j - 1] = dens[nsIX(i, j, N)];
                 }
             }
         }
@@ -229,7 +229,7 @@ namespace libTerrain
             {
                 for (j = 1; j <= N; j++)
                 {
-                    dens[nsIX(i, j, N)] = doubles[i, j];
+                    dens[nsIX(i, j, N)] = doubles[i - 1, j - 1];
                 }
             }
         }
@@ -272,5 +272,36 @@ namespace libTerrain
         {
             nsSimulate(this.h, rounds, dt, diff, visc);
         }
+
+        public void navierStokes(int rounds, double dt, double diff, double visc, ref double[,] uret, ref double[,] vret)
+        {
+            int N = this.h;
+
+            int size = (N * 2) * (N * 2);
+
+            double[] u = new double[size]; // Force, X axis
+            double[] v = new double[size]; // Force, Y axis
+            double[] u_prev = new double[size];
+            double[] v_prev = new double[size];
+            double[] dens = new double[size];
+            double[] dens_prev = new double[size];
+
+            nsDoublesToBuffer(this.map, N, ref dens);
+            nsDoublesToBuffer(this.map, N, ref dens_prev);
+
+            for (int i = 0; i < rounds; i++)
+            {
+                u_prev = u;
+                v_prev = v;
+                dens_prev = dens;
+
+                nsVelStep(N, ref u, ref v, ref u_prev, ref v_prev, visc, dt);
+                nsDensStep(N, ref dens, ref dens_prev, ref u, ref v, diff, dt);
+            }
+
+            nsBufferToDoubles(ref u, N, ref uret);
+            nsBufferToDoubles(ref v, N, ref vret);
+            nsBufferToDoubles(ref dens, N, ref this.map);
+        }
     }
 }
\ No newline at end of file
-- 
cgit v1.1