From 9c3ec87b976edb37114a489ce83b1e8f8e9a6851 Mon Sep 17 00:00:00 2001
From: Homer Horwitz
Date: Sun, 19 Apr 2009 13:33:46 +0000
Subject: Moved ITerrainModule and ITerainEffect to
OpenSim.Region.Framework.Interfaces and added a TaintTerrain method
---
.../CoreModules/World/Terrain/ITerrainEffect.cs | 36 ------------
.../CoreModules/World/Terrain/ITerrainModule.cs | 60 --------------------
.../CoreModules/World/Terrain/TerrainModule.cs | 9 ++-
.../Region/Framework/Interfaces/ITerrainEffect.cs | 34 +++++++++++
.../Region/Framework/Interfaces/ITerrainModule.cs | 66 ++++++++++++++++++++++
5 files changed, 108 insertions(+), 97 deletions(-)
delete mode 100644 OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs
delete mode 100644 OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs
create mode 100644 OpenSim/Region/Framework/Interfaces/ITerrainEffect.cs
create mode 100644 OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs
deleted file mode 100644
index 40b9f5a..0000000
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs
+++ /dev/null
@@ -1,36 +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.Framework.Interfaces;
-
-namespace OpenSim.Region.CoreModules.World.Terrain
-{
- public interface ITerrainEffect
- {
- void RunEffect(ITerrainChannel map);
- }
-}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs
deleted file mode 100644
index 9ca7de0..0000000
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs
+++ /dev/null
@@ -1,60 +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.IO;
-using OpenMetaverse;
-
-namespace OpenSim.Region.CoreModules.World.Terrain
-{
- public interface ITerrainModule
- {
- void LoadFromFile(string filename);
- void SaveToFile(string filename);
- void ModifyTerrain(UUID user, Vector3 pos, byte size, byte action, UUID agentId);
-
- /// <summary>
- /// Load a terrain from a stream.
- /// </summary>
- /// <param name="filename">
- /// Only required here to identify the image type. Not otherwise used in the loading itself.
- /// </param>
- /// <param name="stream"></param>
- void LoadFromStream(string filename, Stream stream);
-
- /// <summary>
- /// Save a terrain to a stream.
- /// </summary>
- /// <param name="filename">
- /// Only required here to identify the image type. Not otherwise used in the saving itself.
- /// </param>
- /// <param name="stream"></param>
- void SaveToStream(string filename, Stream stream);
-
- void InstallPlugin(string name, ITerrainEffect plug);
- }
-}
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 5893a11..045fbb1 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
private Dictionary<string, ITerrainEffect> m_plugineffects;
private ITerrainChannel m_revert;
private Scene m_scene;
- private bool m_tainted;
+ private volatile bool m_tainted;
#region ICommandableModule Members
@@ -327,6 +327,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain
}
}
+ public void TaintTerrain ()
+ {
+ CheckForTerrainUpdates();
+ }
+
#region Plugin Loading Methods
private void LoadPlugins()
@@ -1080,6 +1085,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
m_scene.RegisterModuleCommander(m_commander);
}
+
#endregion
+
}
}
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainEffect.cs b/OpenSim/Region/Framework/Interfaces/ITerrainEffect.cs
new file mode 100644
index 0000000..454aaaa
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/ITerrainEffect.cs
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+ public interface ITerrainEffect
+ {
+ void RunEffect(ITerrainChannel map);
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
new file mode 100644
index 0000000..378a80d
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
@@ -0,0 +1,66 @@
+/*
+ * 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.IO;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+ public interface ITerrainModule
+ {
+ void LoadFromFile(string filename);
+ void SaveToFile(string filename);
+ void ModifyTerrain(UUID user, Vector3 pos, byte size, byte action, UUID agentId);
+
+ /// <summary>
+ /// Taint the terrain. This will lead to sending the terrain data to the clients again.
+ /// Use this if you change terrain data outside of the terrain module (e.g. in osTerrainSetHeight)
+ /// </summary>
+ void TaintTerrain();
+
+ /// <summary>
+ /// Load a terrain from a stream.
+ /// </summary>
+ /// <param name="filename">
+ /// Only required here to identify the image type. Not otherwise used in the loading itself.
+ /// </param>
+ /// <param name="stream"></param>
+ void LoadFromStream(string filename, Stream stream);
+
+ /// <summary>
+ /// Save a terrain to a stream.
+ /// </summary>
+ /// <param name="filename">
+ /// Only required here to identify the image type. Not otherwise used in the saving itself.
+ /// </param>
+ /// <param name="stream"></param>
+ void SaveToStream(string filename, Stream stream);
+
+ void InstallPlugin(string name, ITerrainEffect plug);
+ }
+}
--
cgit v1.1