diff options
| author | Adam Frisby | 2007-07-24 05:22:33 +0000 |
|---|---|---|
| committer | Adam Frisby | 2007-07-24 05:22:33 +0000 |
| commit | d8997b59d30b63218f594d840d924a10287ce509 (patch) | |
| tree | f96960b2605c8da0d6b0a0d9a905db28a62fca67 /OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Operators.cs | |
| parent | * Terrain Fracture Generator now produces more appropriate results. (diff) | |
| download | opensim-SC_OLD-d8997b59d30b63218f594d840d924a10287ce509.zip opensim-SC_OLD-d8997b59d30b63218f594d840d924a10287ce509.tar.gz opensim-SC_OLD-d8997b59d30b63218f594d840d924a10287ce509.tar.bz2 opensim-SC_OLD-d8997b59d30b63218f594d840d924a10287ce509.tar.xz | |
* Terrain should now send just updated patches.
Diffstat (limited to 'OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Operators.cs')
| -rw-r--r-- | OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Operators.cs | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Operators.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Operators.cs index 623c85c..3199ddc 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Operators.cs +++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Operators.cs | |||
| @@ -49,6 +49,9 @@ namespace libTerrain | |||
| 49 | { | 49 | { |
| 50 | for (y = 0; y < A.h; y++) | 50 | for (y = 0; y < A.h; y++) |
| 51 | { | 51 | { |
| 52 | if (B.map[x, y] != 0) | ||
| 53 | A.SetDiff(x, y); | ||
| 54 | |||
| 52 | A.map[x, y] += B.map[x, y]; | 55 | A.map[x, y] += B.map[x, y]; |
| 53 | } | 56 | } |
| 54 | } | 57 | } |
| @@ -73,6 +76,8 @@ namespace libTerrain | |||
| 73 | } | 76 | } |
| 74 | } | 77 | } |
| 75 | 78 | ||
| 79 | A.SetDiff(); | ||
| 80 | |||
| 76 | return A; | 81 | return A; |
| 77 | } | 82 | } |
| 78 | 83 | ||
| @@ -89,6 +94,8 @@ namespace libTerrain | |||
| 89 | { | 94 | { |
| 90 | for (y = 0; y < A.h; y++) | 95 | for (y = 0; y < A.h; y++) |
| 91 | { | 96 | { |
| 97 | if (B.map[x, y] != 0) | ||
| 98 | A.SetDiff(x, y); | ||
| 92 | A.map[x, y] -= B.map[x, y]; | 99 | A.map[x, y] -= B.map[x, y]; |
| 93 | } | 100 | } |
| 94 | } | 101 | } |
| @@ -113,6 +120,8 @@ namespace libTerrain | |||
| 113 | } | 120 | } |
| 114 | } | 121 | } |
| 115 | 122 | ||
| 123 | A.SetDiff(); | ||
| 124 | |||
| 116 | return A; | 125 | return A; |
| 117 | } | 126 | } |
| 118 | 127 | ||
| @@ -133,6 +142,8 @@ namespace libTerrain | |||
| 133 | } | 142 | } |
| 134 | } | 143 | } |
| 135 | 144 | ||
| 145 | A.SetDiff(); | ||
| 146 | |||
| 136 | return A; | 147 | return A; |
| 137 | } | 148 | } |
| 138 | 149 | ||
| @@ -151,6 +162,9 @@ namespace libTerrain | |||
| 151 | } | 162 | } |
| 152 | } | 163 | } |
| 153 | 164 | ||
| 165 | if (B != 0) | ||
| 166 | A.SetDiff(); | ||
| 167 | |||
| 154 | return A; | 168 | return A; |
| 155 | } | 169 | } |
| 156 | 170 | ||
| @@ -166,6 +180,9 @@ namespace libTerrain | |||
| 166 | } | 180 | } |
| 167 | } | 181 | } |
| 168 | 182 | ||
| 183 | if (B != 0) | ||
| 184 | A.SetDiff(); | ||
| 185 | |||
| 169 | return A; | 186 | return A; |
| 170 | } | 187 | } |
| 171 | 188 | ||
| @@ -181,6 +198,9 @@ namespace libTerrain | |||
| 181 | } | 198 | } |
| 182 | } | 199 | } |
| 183 | 200 | ||
| 201 | if (B != 1) | ||
| 202 | A.SetDiff(); | ||
| 203 | |||
| 184 | return A; | 204 | return A; |
| 185 | } | 205 | } |
| 186 | 206 | ||
| @@ -196,6 +216,9 @@ namespace libTerrain | |||
| 196 | } | 216 | } |
| 197 | } | 217 | } |
| 198 | 218 | ||
| 219 | if (B != 1) | ||
| 220 | A.SetDiff(); | ||
| 221 | |||
| 199 | return A; | 222 | return A; |
| 200 | } | 223 | } |
| 201 | 224 | ||
| @@ -211,6 +234,8 @@ namespace libTerrain | |||
| 211 | } | 234 | } |
| 212 | } | 235 | } |
| 213 | 236 | ||
| 237 | A.SetDiff(); | ||
| 238 | |||
| 214 | return A; | 239 | return A; |
| 215 | } | 240 | } |
| 216 | 241 | ||