aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorAdam Frisby2008-04-06 13:48:28 +0000
committerAdam Frisby2008-04-06 13:48:28 +0000
commit996309a6e1ee47d96d81c0bdfdd5bfc27db66efd (patch)
tree9b9208a28969785a459e30de3ce9f260beb26201 /OpenSim/Region
parent* Fixed up some documentation (diff)
downloadopensim-SC_OLD-996309a6e1ee47d96d81c0bdfdd5bfc27db66efd.zip
opensim-SC_OLD-996309a6e1ee47d96d81c0bdfdd5bfc27db66efd.tar.gz
opensim-SC_OLD-996309a6e1ee47d96d81c0bdfdd5bfc27db66efd.tar.bz2
opensim-SC_OLD-996309a6e1ee47d96d81c0bdfdd5bfc27db66efd.tar.xz
* Various terrain engine fixes
* Includes patch #894 fixes for terrain load-tile * Large number of other terrain fixes and new commands included.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs51
-rw-r--r--OpenSim/Region/Environment/Modules/Terrain/ITerrainEffect.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs13
-rw-r--r--OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs215
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs13
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs19
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs4
9 files changed, 231 insertions, 89 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index be2aafd..c4b3075 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -946,6 +946,7 @@ namespace OpenSim
946 } 946 }
947 break; 947 break;
948 948
949 case "exit":
949 case "quit": 950 case "quit":
950 case "shutdown": 951 case "shutdown":
951 Shutdown(); 952 Shutdown();
diff --git a/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs b/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs
index 946a876..b6775b9 100644
--- a/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs
+++ b/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs
@@ -249,7 +249,7 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework
249 { 249 {
250 if (m_commands.ContainsKey(function)) 250 if (m_commands.ContainsKey(function))
251 { 251 {
252 if (args[0] == "help") 252 if (args.Length > 0 && args[0] == "help")
253 { 253 {
254 m_commands[function].ShowConsoleHelp(); 254 m_commands[function].ShowConsoleHelp();
255 } 255 }
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs
index fc81376..83ee341 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs
@@ -62,30 +62,63 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
62 return "RAW32"; 62 return "RAW32";
63 } 63 }
64 64
65 public ITerrainChannel LoadFile(string filename, int fileStartX, int fileStartY, int fileWidth, int fileHeight, int sectionWidth, int sectionHeight) 65 public ITerrainChannel LoadFile(string filename, int offsetX, int offsetY, int fileWidth, int fileHeight, int sectionWidth, int sectionHeight)
66 { 66 {
67 TerrainChannel retval = new TerrainChannel(sectionWidth, sectionHeight); 67 TerrainChannel retval = new TerrainChannel(sectionWidth, sectionHeight);
68 68
69 FileInfo file = new FileInfo(filename); 69 FileInfo file = new FileInfo(filename);
70 FileStream s = file.Open(FileMode.Open, FileAccess.Read); 70 FileStream s = file.Open(FileMode.Open, FileAccess.Read);
71 BinaryReader bs = new BinaryReader(s); 71 BinaryReader bs = new BinaryReader(s);
72
73 int currFileXOffset = 0;
74 int currFileYOffset = 0;
72 75
73 // Advance to our section of the file 76 // if our region isn't on the first Y section of the areas to be landscaped, then
74 if (fileStartY * sectionHeight > 0) 77 // advance to our section of the file
75 bs.ReadBytes(fileStartY * sectionHeight); 78 while (currFileYOffset < offsetY)
79 {
80 // read a whole strip of regions
81 int heightsToRead = sectionHeight * (fileWidth * sectionWidth);
82 bs.ReadBytes( heightsToRead * 4); // because the floats are 4 bytes in the file
83 currFileYOffset++;
84 }
76 85
86 // got to the Y start offset within the file of our region
87 // so read the file bits associated with our region
77 int x, y; 88 int x, y;
78 for (y = 0; y < retval.Height; y++) 89 // for each Y within our Y offset
90 for (y = 0; y < sectionHeight; y++)
79 { 91 {
80 // Advance the stream if we aren't at the start of the section in the file 92 currFileXOffset = 0;
81 if (fileStartX * sectionWidth > 0) 93
82 bs.ReadBytes(fileStartX * sectionHeight); 94 // if our region isn't the first X section of the areas to be landscaped, then
95 // advance the stream to the X start pos of our section in the file
96 // i.e. eat X upto where we start
97 while (currFileXOffset < offsetX)
98 {
99 bs.ReadBytes( sectionWidth * 4); // 4 bytes = single
100 currFileXOffset++;
101 }
83 102
84 for (x = 0; x < retval.Width; x++) 103 // got to our X offset, so write our regions X line
104 for (x = 0; x < sectionWidth; x++)
85 { 105 {
86 // Read a strip and continue 106 // Read a strip and continue
87 retval[x, y] = bs.ReadSingle(); 107 retval[x, y] = bs.ReadSingle();
88 } 108 }
109 // record that we wrote it
110 currFileXOffset++;
111
112 // if our region isn't the last X section of the areas to be landscaped, then
113 // advance the stream to the end of this Y column
114 while (currFileXOffset < fileWidth )
115 {
116 // eat the next regions x line
117 bs.ReadBytes(sectionWidth * 4); // 4 bytes = single
118 currFileXOffset++;
119 }
120
121
89 } 122 }
90 123
91 bs.Close(); 124 bs.Close();
diff --git a/OpenSim/Region/Environment/Modules/Terrain/ITerrainEffect.cs b/OpenSim/Region/Environment/Modules/Terrain/ITerrainEffect.cs
index 4d51324..5063e46 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/ITerrainEffect.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/ITerrainEffect.cs
@@ -31,6 +31,6 @@ namespace OpenSim.Region.Environment.Modules.Terrain
31{ 31{
32 public interface ITerrainEffect 32 public interface ITerrainEffect
33 { 33 {
34 void RunEffect(ITerrainChannel map, double strength); 34 void RunEffect(ITerrainChannel map);
35 } 35 }
36} 36}
diff --git a/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs
index 6e1a5d6..01f6bdf 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs
@@ -121,13 +121,12 @@ namespace OpenSim.Region.Environment.Modules.Terrain
121 { 121 {
122 for (y = 0; y < Constants.RegionSize; y++) 122 for (y = 0; y < Constants.RegionSize; y++)
123 { 123 {
124 //map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 10; 124 map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 10;
125 // double spherFac = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize, Constants.RegionSize, 20); 125 double spherFac = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize / 2, Constants.RegionSize / 2, 50) * 0.01;
126 // if (map[x, y] < spherFac) 126 if (map[x, y] < spherFac)
127 // { 127 {
128 // map[x, y] = spherFac; 128 map[x, y] = spherFac;
129 // } 129 }
130 map[x, y] = 26;
131 } 130 }
132 } 131 }
133 } 132 }
diff --git a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
index 88d7041..e9f1785 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
@@ -35,10 +35,9 @@ using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Environment.Scenes;
36using OpenSim.Region.Environment.Modules.ModuleFramework; 36using OpenSim.Region.Environment.Modules.ModuleFramework;
37 37
38
39namespace OpenSim.Region.Environment.Modules.Terrain 38namespace OpenSim.Region.Environment.Modules.Terrain
40{ 39{
41 public class TerrainModule : IRegionModule , ITerrainTemp, ICommandableModule 40 public class TerrainModule : IRegionModule, ICommandableModule
42 { 41 {
43 public enum StandardTerrainEffects : byte 42 public enum StandardTerrainEffects : byte
44 { 43 {
@@ -47,7 +46,12 @@ namespace OpenSim.Region.Environment.Modules.Terrain
47 Lower = 2, 46 Lower = 2,
48 Smooth = 3, 47 Smooth = 3,
49 Noise = 4, 48 Noise = 4,
50 Revert = 5 49 Revert = 5,
50
51 // Extended brushes
52 Erode = 255,
53 Weather = 254,
54 Olsen = 253
51 } 55 }
52 56
53 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 57 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
@@ -74,6 +78,9 @@ namespace OpenSim.Region.Environment.Modules.Terrain
74 m_painteffects[StandardTerrainEffects.Noise] = new PaintBrushes.NoiseSphere(); 78 m_painteffects[StandardTerrainEffects.Noise] = new PaintBrushes.NoiseSphere();
75 m_painteffects[StandardTerrainEffects.Flatten] = new PaintBrushes.FlattenSphere(); 79 m_painteffects[StandardTerrainEffects.Flatten] = new PaintBrushes.FlattenSphere();
76 m_painteffects[StandardTerrainEffects.Revert] = new PaintBrushes.RevertSphere(m_revert); 80 m_painteffects[StandardTerrainEffects.Revert] = new PaintBrushes.RevertSphere(m_revert);
81 m_painteffects[StandardTerrainEffects.Erode] = new PaintBrushes.ErodeSphere();
82 m_painteffects[StandardTerrainEffects.Weather] = new PaintBrushes.WeatherSphere();
83 m_painteffects[StandardTerrainEffects.Olsen] = new PaintBrushes.OlsenSphere();
77 84
78 // Area of effect selection effects 85 // Area of effect selection effects
79 m_floodeffects[StandardTerrainEffects.Raise] = new FloodBrushes.RaiseArea(); 86 m_floodeffects[StandardTerrainEffects.Raise] = new FloodBrushes.RaiseArea();
@@ -90,6 +97,11 @@ namespace OpenSim.Region.Environment.Modules.Terrain
90 m_loaders[".raw"] = new FileLoaders.LLRAW(); 97 m_loaders[".raw"] = new FileLoaders.LLRAW();
91 m_loaders[".jpg"] = new FileLoaders.JPEG(); 98 m_loaders[".jpg"] = new FileLoaders.JPEG();
92 m_loaders[".jpeg"] = m_loaders[".jpg"]; 99 m_loaders[".jpeg"] = m_loaders[".jpg"];
100 m_loaders[".bmp"] = new FileLoaders.BMP();
101 m_loaders[".png"] = new FileLoaders.PNG();
102 m_loaders[".gif"] = new FileLoaders.GIF();
103 m_loaders[".tif"] = new FileLoaders.TIFF();
104 m_loaders[".tiff"] = m_loaders[".tif"];
93 } 105 }
94 106
95 public void UpdateRevertMap() 107 public void UpdateRevertMap()
@@ -139,22 +151,26 @@ namespace OpenSim.Region.Environment.Modules.Terrain
139 151
140 public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) 152 public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY)
141 { 153 {
142 fileStartX -= (int)m_scene.RegionInfo.RegionLocX; 154 int offsetX = (int)m_scene.RegionInfo.RegionLocX - fileStartX;
143 fileStartY -= (int)m_scene.RegionInfo.RegionLocY; 155 int offsetY = (int)m_scene.RegionInfo.RegionLocY - fileStartY;
144 156
145 foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders) 157 if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight)
146 { 158 {
147 if (filename.EndsWith(loader.Key)) 159 // this region is included in the tile request
160 foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
148 { 161 {
149 lock (m_scene) 162 if (filename.EndsWith(loader.Key))
150 { 163 {
151 ITerrainChannel channel = loader.Value.LoadFile(filename, fileStartX, fileStartY, 164 lock (m_scene)
152 fileWidth, fileHeight, (int)Constants.RegionSize, (int)Constants.RegionSize); 165 {
153 m_scene.Heightmap = channel; 166 ITerrainChannel channel = loader.Value.LoadFile(filename, offsetX, offsetY,
154 m_channel = channel; 167 fileWidth, fileHeight, (int)Constants.RegionSize, (int)Constants.RegionSize);
155 UpdateRevertMap(); 168 m_scene.Heightmap = channel;
169 m_channel = channel;
170 UpdateRevertMap();
171 }
172 return;
156 } 173 }
157 return;
158 } 174 }
159 } 175 }
160 } 176 }
@@ -181,7 +197,6 @@ namespace OpenSim.Region.Environment.Modules.Terrain
181 public void Initialise(Scene scene, IConfigSource config) 197 public void Initialise(Scene scene, IConfigSource config)
182 { 198 {
183 m_scene = scene; 199 m_scene = scene;
184 m_scene.RegisterModuleInterface<ITerrainTemp>(this);
185 m_gConfig = config; 200 m_gConfig = config;
186 201
187 // Install terrain module in the simulator 202 // Install terrain module in the simulator
@@ -222,7 +237,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
222 private void InterfaceLoadFile(Object[] args) 237 private void InterfaceLoadFile(Object[] args)
223 { 238 {
224 LoadFromFile((string)args[0]); 239 LoadFromFile((string)args[0]);
225 SendUpdatedLayerData(); 240 CheckForTerrainUpdates();
226 } 241 }
227 242
228 private void InterfaceLoadTileFile(Object[] args) 243 private void InterfaceLoadTileFile(Object[] args)
@@ -232,7 +247,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
232 (int)args[2], 247 (int)args[2],
233 (int)args[3], 248 (int)args[3],
234 (int)args[4]); 249 (int)args[4]);
235 SendUpdatedLayerData(); 250 CheckForTerrainUpdates();
236 } 251 }
237 252
238 private void InterfaceSaveFile(Object[] args) 253 private void InterfaceSaveFile(Object[] args)
@@ -240,6 +255,48 @@ namespace OpenSim.Region.Environment.Modules.Terrain
240 SaveToFile((string)args[0]); 255 SaveToFile((string)args[0]);
241 } 256 }
242 257
258 private void InterfaceBakeTerrain(Object[] args)
259 {
260 UpdateRevertMap();
261 }
262
263 private void InterfaceRevertTerrain(Object[] args)
264 {
265 int x, y;
266 for (x = 0; x < m_channel.Width; x++)
267 for (y = 0; y < m_channel.Height; y++)
268 m_channel[x, y] = m_revert[x, y];
269
270 CheckForTerrainUpdates();
271 }
272
273 private void InterfaceElevateTerrain(Object[] args)
274 {
275 int x, y;
276 for (x = 0; x < m_channel.Width; x++)
277 for (y = 0; y < m_channel.Height; y++)
278 m_channel[x, y] += (double)args[0];
279 CheckForTerrainUpdates();
280 }
281
282 private void InterfaceMultiplyTerrain(Object[] args)
283 {
284 int x, y;
285 for (x = 0; x < m_channel.Width; x++)
286 for (y = 0; y < m_channel.Height; y++)
287 m_channel[x, y] *= (double)args[0];
288 CheckForTerrainUpdates();
289 }
290
291 private void InterfaceLowerTerrain(Object[] args)
292 {
293 int x, y;
294 for (x = 0; x < m_channel.Width; x++)
295 for (y = 0; y < m_channel.Height; y++)
296 m_channel[x, y] -= (double)args[0];
297 CheckForTerrainUpdates();
298 }
299
243 private void InterfaceFillTerrain(Object[] args) 300 private void InterfaceFillTerrain(Object[] args)
244 { 301 {
245 int x, y; 302 int x, y;
@@ -247,7 +304,33 @@ namespace OpenSim.Region.Environment.Modules.Terrain
247 for (x = 0; x < m_channel.Width; x++) 304 for (x = 0; x < m_channel.Width; x++)
248 for (y = 0; y < m_channel.Height; y++) 305 for (y = 0; y < m_channel.Height; y++)
249 m_channel[x, y] = (double)args[0]; 306 m_channel[x, y] = (double)args[0];
250 SendUpdatedLayerData(); 307 CheckForTerrainUpdates();
308 }
309
310 private void InterfaceShowDebugStats(Object[] args)
311 {
312 double max = Double.MinValue;
313 double min = double.MaxValue;
314 double avg = 0;
315 double sum = 0;
316
317 int x, y;
318 for (x = 0; x < m_channel.Width; x++)
319 {
320 for (y = 0; y < m_channel.Height; y++)
321 {
322 sum += m_channel[x, y];
323 if (max < m_channel[x, y])
324 max = m_channel[x, y];
325 if (min > m_channel[x, y])
326 min = m_channel[x, y];
327 }
328 }
329
330 avg = sum / (m_channel.Height * m_channel.Width);
331
332 m_log.Info("Channel " + m_channel.Width + "x" + m_channel.Height);
333 m_log.Info("max/min/avg/sum: " + max + "/" + min + "/" + avg + "/" + sum);
251 } 334 }
252 335
253 private void InterfaceEnableExperimentalBrushes(Object[] args) 336 private void InterfaceEnableExperimentalBrushes(Object[] args)
@@ -264,6 +347,12 @@ namespace OpenSim.Region.Environment.Modules.Terrain
264 } 347 }
265 } 348 }
266 349
350 private void InterfacePerformEffectTest(Object[] args)
351 {
352 Effects.CookieCutter cookie = new OpenSim.Region.Environment.Modules.Terrain.Effects.CookieCutter();
353 cookie.RunEffect(m_channel);
354 }
355
267 private void InstallInterfaces() 356 private void InstallInterfaces()
268 { 357 {
269 // Load / Save 358 // Load / Save
@@ -288,15 +377,39 @@ namespace OpenSim.Region.Environment.Modules.Terrain
288 Command fillRegionCommand = new Command("fill", InterfaceFillTerrain, "Fills the current heightmap with a specified value."); 377 Command fillRegionCommand = new Command("fill", InterfaceFillTerrain, "Fills the current heightmap with a specified value.");
289 fillRegionCommand.AddArgument("value", "The numeric value of the height you wish to set your region to.", "Double"); 378 fillRegionCommand.AddArgument("value", "The numeric value of the height you wish to set your region to.", "Double");
290 379
291 // Brushes 380 Command elevateCommand = new Command("elevate", InterfaceElevateTerrain, "Raises the current heightmap by the specified amount.");
381 elevateCommand.AddArgument("amount", "The amount of height to add to the terrain in meters.", "Double");
382
383 Command lowerCommand = new Command("lower", InterfaceLowerTerrain, "Lowers the current heightmap by the specified amount.");
384 lowerCommand.AddArgument("amount", "The amount of height to remove from the terrain in meters.", "Double");
385
386 Command multiplyCommand = new Command("multiply", InterfaceMultiplyTerrain, "Multiplies the heightmap by the value specified.");
387 multiplyCommand.AddArgument("value", "The value to multiply the heightmap by.", "Double");
388
389 Command bakeRegionCommand = new Command("bake", InterfaceBakeTerrain, "Saves the current terrain into the regions revert map.");
390 Command revertRegionCommand = new Command("revert", InterfaceRevertTerrain, "Loads the revert map terrain into the regions heightmap.");
391
392 // Debug
393 Command showDebugStatsCommand = new Command("stats", InterfaceShowDebugStats, "Shows some information about the regions heightmap for debugging purposes.");
394
292 Command experimentalBrushesCommand = new Command("newbrushes", InterfaceEnableExperimentalBrushes, "Enables experimental brushes which replace the standard terrain brushes. WARNING: This is a debug setting and may be removed at any time."); 395 Command experimentalBrushesCommand = new Command("newbrushes", InterfaceEnableExperimentalBrushes, "Enables experimental brushes which replace the standard terrain brushes. WARNING: This is a debug setting and may be removed at any time.");
293 experimentalBrushesCommand.AddArgument("Enabled?", "true / false - Enable new brushes", "Boolean"); 396 experimentalBrushesCommand.AddArgument("Enabled?", "true / false - Enable new brushes", "Boolean");
294 397
398 // Effects
399 Command effectsTestCommand = new Command("test", InterfacePerformEffectTest, "Performs an effects module test");
400
295 m_commander.RegisterCommand("load", loadFromFileCommand); 401 m_commander.RegisterCommand("load", loadFromFileCommand);
296 m_commander.RegisterCommand("load-tile", loadFromTileCommand); 402 m_commander.RegisterCommand("load-tile", loadFromTileCommand);
297 m_commander.RegisterCommand("save", saveToFileCommand); 403 m_commander.RegisterCommand("save", saveToFileCommand);
298 m_commander.RegisterCommand("fill", fillRegionCommand); 404 m_commander.RegisterCommand("fill", fillRegionCommand);
405 m_commander.RegisterCommand("elevate", elevateCommand);
406 m_commander.RegisterCommand("lower", lowerCommand);
407 m_commander.RegisterCommand("multiply", multiplyCommand);
408 m_commander.RegisterCommand("bake", bakeRegionCommand);
409 m_commander.RegisterCommand("revert", revertRegionCommand);
299 m_commander.RegisterCommand("newbrushes", experimentalBrushesCommand); 410 m_commander.RegisterCommand("newbrushes", experimentalBrushesCommand);
411 m_commander.RegisterCommand("test", effectsTestCommand);
412 m_commander.RegisterCommand("stats", showDebugStatsCommand);
300 413
301 // Add this to our scene so scripts can call these functions 414 // Add this to our scene so scripts can call these functions
302 m_scene.RegisterModuleCommander("Terrain", m_commander); 415 m_scene.RegisterModuleCommander("Terrain", m_commander);
@@ -322,7 +435,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
322 client.OnModifyTerrain += client_OnModifyTerrain; 435 client.OnModifyTerrain += client_OnModifyTerrain;
323 } 436 }
324 437
325 void SendUpdatedLayerData() 438 void CheckForTerrainUpdates()
326 { 439 {
327 bool shouldTaint = false; 440 bool shouldTaint = false;
328 float[] serialised = m_channel.GetFloatsSerialised(); 441 float[] serialised = m_channel.GetFloatsSerialised();
@@ -333,10 +446,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
333 { 446 {
334 if (m_channel.Tainted(x, y)) 447 if (m_channel.Tainted(x, y))
335 { 448 {
336 m_scene.ForEachClient(delegate(IClientAPI controller) 449 SendToClients(serialised, x, y);
337 {
338 controller.SendLayerData(x / Constants.TerrainPatchSize, y / Constants.TerrainPatchSize, serialised);
339 });
340 shouldTaint = true; 450 shouldTaint = true;
341 } 451 }
342 } 452 }
@@ -347,6 +457,14 @@ namespace OpenSim.Region.Environment.Modules.Terrain
347 } 457 }
348 } 458 }
349 459
460 private void SendToClients(float[] serialised, int x, int y)
461 {
462 m_scene.ForEachClient(delegate(IClientAPI controller)
463 {
464 controller.SendLayerData(x / Constants.TerrainPatchSize, y / Constants.TerrainPatchSize, serialised);
465 });
466 }
467
350 void client_OnModifyTerrain(float height, float seconds, byte size, byte action, float north, float west, float south, float east, IClientAPI remoteClient) 468 void client_OnModifyTerrain(float height, float seconds, byte size, byte action, float north, float west, float south, float east, IClientAPI remoteClient)
351 { 469 {
352 // Not a good permissions check, if in area mode, need to check the entire area. 470 // Not a good permissions check, if in area mode, need to check the entire area.
@@ -364,7 +482,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
364 482
365 if (usingTerrainModule) 483 if (usingTerrainModule)
366 { 484 {
367 SendUpdatedLayerData(); 485 CheckForTerrainUpdates();
368 } 486 }
369 } 487 }
370 else 488 else
@@ -401,7 +519,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain
401 519
402 if (usingTerrainModule) 520 if (usingTerrainModule)
403 { 521 {
404 SendUpdatedLayerData(); 522 CheckForTerrainUpdates();
405 } 523 }
406 } 524 }
407 else 525 else
@@ -412,51 +530,6 @@ namespace OpenSim.Region.Environment.Modules.Terrain
412 } 530 }
413 } 531 }
414 532
415 public byte[] WriteJpegImage(string gradientmap)
416 {
417 byte[] imageData = null;
418 try
419 {
420 Bitmap bmp = TerrainToBitmap(gradientmap);
421
422 imageData = OpenJPEGNet.OpenJPEG.EncodeFromImage(bmp, true);
423
424 }
425 catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke
426 {
427 Console.WriteLine("Failed generating terrain map: " + e.ToString());
428 }
429
430 return imageData;
431 }
432
433 private Bitmap TerrainToBitmap(string gradientmap)
434 {
435 Bitmap gradientmapLd = new Bitmap(gradientmap);
436
437 int pallete = gradientmapLd.Height;
438
439 Bitmap bmp = new Bitmap(m_channel.Width, m_channel.Height);
440 Color[] colours = new Color[pallete];
441
442 for (int i = 0; i < pallete; i++)
443 {
444 colours[i] = gradientmapLd.GetPixel(0, i);
445 }
446
447 TerrainChannel copy =(TerrainChannel) m_channel.MakeCopy();
448 for (int y = 0; y < copy.Height; y++)
449 {
450 for (int x = 0; x < copy.Width; x++)
451 {
452 // 512 is the largest possible height before colours clamp
453 int colorindex = (int)(Math.Max(Math.Min(1.0, copy[x, y] / 512.0), 0.0) * (pallete - 1));
454 bmp.SetPixel(x, copy.Height - y - 1, colours[colorindex]);
455 }
456 }
457 return bmp;
458 }
459
460 public void PostInitialise() 533 public void PostInitialise()
461 { 534 {
462 InstallDefaultEffects(); 535 InstallDefaultEffects();
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index c878e7c..3f6f5cc 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -1916,6 +1916,19 @@ namespace OpenSim.Region.ScriptEngine.Common
1916 m_LSL_Functions.osSetPrimFloatOnWater(floatYN); 1916 m_LSL_Functions.osSetPrimFloatOnWater(floatYN);
1917 } 1917 }
1918 1918
1919 // Animation Functions
1920
1921 public void osAvatarPlayAnimation(string avatar, string animation)
1922 {
1923 m_LSL_Functions.osAvatarPlayAnimation(avatar, animation);
1924 }
1925
1926 public void osAvatarStopAnimation(string avatar, string animation)
1927 {
1928 m_LSL_Functions.osAvatarStopAnimation(avatar, animation);
1929 }
1930
1931
1919 //Texture Draw functions 1932 //Texture Draw functions
1920 1933
1921 public string osMovePen(string drawList, int x, int y) 1934 public string osMovePen(string drawList, int x, int y)
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 76be7cf..9567d80 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -5119,6 +5119,25 @@ namespace OpenSim.Region.ScriptEngine.Common
5119 } 5119 }
5120 } 5120 }
5121 5121
5122 // Adam's super super custom animation functions
5123 public void osAvatarPlayAnimation(string avatar, string animation)
5124 {
5125 if (World.Entities.ContainsKey(avatar) && World.Entities[avatar] is ScenePresence)
5126 {
5127 ScenePresence target = (ScenePresence)World.Entities[avatar];
5128 target.AddAnimation(avatar, 0);
5129 }
5130 }
5131
5132 public void osAvatarStopAnimation(string avatar, string animation)
5133 {
5134 if (World.Entities.ContainsKey(avatar) && World.Entities[avatar] is ScenePresence)
5135 {
5136 ScenePresence target = (ScenePresence)World.Entities[avatar];
5137 target.RemoveAnimation(animation);
5138 }
5139 }
5140
5122 //Texture draw functions 5141 //Texture draw functions
5123 public string osMovePen(string drawList, int x, int y) 5142 public string osMovePen(string drawList, int x, int y)
5124 { 5143 {
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
index 9708941..4e632ef 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -653,6 +653,10 @@ namespace OpenSim.Region.ScriptEngine.Common
653 void osSetParcelMediaURL(string url); 653 void osSetParcelMediaURL(string url);
654 void osSetPrimFloatOnWater(int floatYN); 654 void osSetPrimFloatOnWater(int floatYN);
655 655
656 // Animation commands
657 void osAvatarPlayAnimation(string avatar, string animation);
658 void osAvatarStopAnimation(string avatar, string animation);
659
656 //texture draw functions 660 //texture draw functions
657 string osMovePen(string drawList, int x, int y); 661 string osMovePen(string drawList, int x, int y);
658 string osDrawLine(string drawList, int startX, int startY, int endX, int endY); 662 string osDrawLine(string drawList, int startX, int startY, int endX, int endY);