From 50aa775ea75528e1cdd9d7ea0d1b6f101eb37910 Mon Sep 17 00:00:00 2001 From: Homer Horwitz Date: Sun, 5 Apr 2009 17:08:01 +0000 Subject: - Move IWindModule to OpenSim.Region.Framework.Interfaces - Fix a dependency problem. Hopefully fixes Mantis #3395 --- .../CoreModules/World/Wind/IWindModelPlugin.cs | 83 ---------------------- .../World/Wind/Plugins/ConfigurableWind.cs | 1 + .../World/Wind/Plugins/SimpleRandomWind.cs | 2 + .../Framework/Interfaces/IWindModelPlugin.cs | 83 ++++++++++++++++++++++ 4 files changed, 86 insertions(+), 83 deletions(-) delete mode 100644 OpenSim/Region/CoreModules/World/Wind/IWindModelPlugin.cs create mode 100644 OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs (limited to 'OpenSim') diff --git a/OpenSim/Region/CoreModules/World/Wind/IWindModelPlugin.cs b/OpenSim/Region/CoreModules/World/Wind/IWindModelPlugin.cs deleted file mode 100644 index 8e3e810..0000000 --- a/OpenSim/Region/CoreModules/World/Wind/IWindModelPlugin.cs +++ /dev/null @@ -1,83 +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 OpenSimulator 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; -using System.Collections.Generic; - -using Nini.Config; -using OpenSim.Framework; -using OpenMetaverse; -using OpenSim.Region.Framework.Scenes; - -namespace OpenSim.Region.CoreModules.World.Wind -{ - public interface IWindModelPlugin : IPlugin - { - /// - /// Brief description of this plugin's wind model - /// - string Description { get; } - - /// - /// Provides access to the wind configuration, if any. - /// - void WindConfig(Scene scene, IConfig windConfig); - - /// - /// Update wind. - /// - void WindUpdate(uint frame); - - /// - /// Returns the wind vector at the given local region coordinates. - /// - Vector3 WindSpeed(float x, float y, float z); - - /// - /// Generate a 16 x 16 Vector2 array of wind speeds for LL* based viewers - /// - /// Must return a Vector2[256] - Vector2[] WindLLClientArray(); - - /// - /// Retrieve a list of parameter/description pairs. - /// - /// - Dictionary WindParams(); - - /// - /// Set the specified parameter - /// - void WindParamSet(string param, float value); - - /// - /// Get the specified parameter - /// - float WindParamGet(string param); - - } -} diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs index 2942792..cd71487 100644 --- a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs +++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs @@ -32,6 +32,7 @@ using System.Reflection; using log4net; using OpenMetaverse; +using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.CoreModules.World.Wind; namespace OpenSim.Region.CoreModules.World.Wind.Plugins diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs index 8d35a71..cdd5a2e 100644 --- a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs +++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs @@ -30,6 +30,8 @@ using System.Collections.Generic; using OpenMetaverse; +using OpenSim.Region.Framework.Interfaces; + namespace OpenSim.Region.CoreModules.World.Wind.Plugins { class SimpleRandomWind : Mono.Addins.TypeExtensionNode, IWindModelPlugin diff --git a/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs b/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs new file mode 100644 index 0000000..b087c8b --- /dev/null +++ b/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs @@ -0,0 +1,83 @@ +/* + * 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 OpenSimulator 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; +using System.Collections.Generic; + +using Nini.Config; +using OpenSim.Framework; +using OpenMetaverse; +using OpenSim.Region.Framework.Scenes; + +namespace OpenSim.Region.Framework.Interfaces +{ + public interface IWindModelPlugin : IPlugin + { + /// + /// Brief description of this plugin's wind model + /// + string Description { get; } + + /// + /// Provides access to the wind configuration, if any. + /// + void WindConfig(Scene scene, IConfig windConfig); + + /// + /// Update wind. + /// + void WindUpdate(uint frame); + + /// + /// Returns the wind vector at the given local region coordinates. + /// + Vector3 WindSpeed(float x, float y, float z); + + /// + /// Generate a 16 x 16 Vector2 array of wind speeds for LL* based viewers + /// + /// Must return a Vector2[256] + Vector2[] WindLLClientArray(); + + /// + /// Retrieve a list of parameter/description pairs. + /// + /// + Dictionary WindParams(); + + /// + /// Set the specified parameter + /// + void WindParamSet(string param, float value); + + /// + /// Get the specified parameter + /// + float WindParamGet(string param); + + } +} -- cgit v1.1