From 2159b3079ec8df2a7337a9d4ea54810b7028c4e1 Mon Sep 17 00:00:00 2001 From: gareth Date: Wed, 7 Mar 2007 19:07:00 +0000 Subject: fixed last screwup --- src/Config/SimConfig/AssemblyInfo.cs | 31 ++++++++ src/Config/SimConfig/Db4SimConfig.cs | 146 ++++++++++++++++++++++++++++++++++ src/Config/SimConfig/SimConfig.csproj | 49 ++++++++++++ src/Config/SimConfig/SimConfig.sln | 7 ++ src/Config/default.build | 52 ++++++++++++ 5 files changed, 285 insertions(+) create mode 100644 src/Config/SimConfig/AssemblyInfo.cs create mode 100644 src/Config/SimConfig/Db4SimConfig.cs create mode 100644 src/Config/SimConfig/SimConfig.csproj create mode 100644 src/Config/SimConfig/SimConfig.sln create mode 100644 src/Config/default.build (limited to 'src/Config') diff --git a/src/Config/SimConfig/AssemblyInfo.cs b/src/Config/SimConfig/AssemblyInfo.cs new file mode 100644 index 0000000..96c3e73 --- /dev/null +++ b/src/Config/SimConfig/AssemblyInfo.cs @@ -0,0 +1,31 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Information about this assembly is defined by the following +// attributes. +// +// change them to the information which is associated with the assembly +// you compile. + +[assembly: AssemblyTitle("SimConfig")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("SimConfig")] +[assembly: AssemblyCopyright("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// This sets the default COM visibility of types in the assembly to invisible. +// If you need to expose a type to COM, use [ComVisible(true)] on that type. +[assembly: ComVisible(false)] + +// The assembly version has following format : +// +// Major.Minor.Build.Revision +// +// You can specify all values by your own or you can build default build and revision +// numbers with the '*' character (the default): + +[assembly: AssemblyVersion("1.0.*")] diff --git a/src/Config/SimConfig/Db4SimConfig.cs b/src/Config/SimConfig/Db4SimConfig.cs new file mode 100644 index 0000000..cc31328 --- /dev/null +++ b/src/Config/SimConfig/Db4SimConfig.cs @@ -0,0 +1,146 @@ +/* +* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* +* 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 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 ``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 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 OpenSim; +using OpenSim.world; +using Db4objects.Db4o; + +namespace Db40SimConfig +{ + public class Db40ConfigPlugin: ISimConfig + { + public SimConfig GetConfigObject() + { + ServerConsole.MainConsole.Instance.WriteLine("Loading Db40Config dll"); + return ( new DbSimConfig()); + } + } + + public class DbSimConfig :SimConfig + { + private IObjectContainer db; + + public void LoadDefaults() { + ServerConsole.MainConsole.Instance.WriteLine("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); + + this.RegionName=ServerConsole.MainConsole.Instance.CmdPrompt("Name [OpenSim test]: ","OpenSim test"); + this.RegionLocX=(uint)Convert.ToInt32(ServerConsole.MainConsole.Instance.CmdPrompt("Grid Location X [997]: ","997")); + this.RegionLocY=(uint)Convert.ToInt32(ServerConsole.MainConsole.Instance.CmdPrompt("Grid Location Y [996]: ","996")); + this.IPListenPort=Convert.ToInt32(ServerConsole.MainConsole.Instance.CmdPrompt("UDP port for client connections [9000]: ","9000")); + this.IPListenAddr=ServerConsole.MainConsole.Instance.CmdPrompt("IP Address to listen on for client connections [127.0.0.1]: ","127.0.0.1"); + + if(!OpenSim_Main.sim.sandbox) + { + this.AssetURL=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server URL: "); + this.AssetSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server key: "); + this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid server URL: "); + this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Grid server key: "); + } + this.RegionHandle = Util.UIntsToLong((RegionLocX*256), (RegionLocY*256)); + } + + public override void InitConfig() { + try { + db = Db4oFactory.OpenFile("opensim.yap"); + IObjectSet result = db.Get(typeof(DbSimConfig)); + if(result.Count==1) { + ServerConsole.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Found a SimConfig object in the local database, loading"); + foreach (DbSimConfig cfg in result) { + this.RegionName = cfg.RegionName; + this.RegionLocX = cfg.RegionLocX; + this.RegionLocY = cfg.RegionLocY; + this.RegionHandle = Util.UIntsToLong((RegionLocX*256), (RegionLocY*256)); + this.IPListenPort = cfg.IPListenPort; + this.IPListenAddr = cfg.IPListenAddr; + this.AssetURL = cfg.AssetURL; + this.AssetSendKey = cfg.AssetSendKey; + this.GridURL = cfg.GridURL; + this.GridSendKey = cfg.GridSendKey; + } + } else { + ServerConsole.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); + LoadDefaults(); + ServerConsole.MainConsole.Instance.WriteLine("Writing out default settings to local database"); + db.Set(this); + } + } catch(Exception e) { + db.Close(); + ServerConsole.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Exception occured"); + ServerConsole.MainConsole.Instance.WriteLine(e.ToString()); + } + + ServerConsole.MainConsole.Instance.WriteLine("Sim settings loaded:"); + ServerConsole.MainConsole.Instance.WriteLine("Name: " + this.RegionName); + ServerConsole.MainConsole.Instance.WriteLine("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); + ServerConsole.MainConsole.Instance.WriteLine("Region Handle: " + this.RegionHandle.ToString()); + ServerConsole.MainConsole.Instance.WriteLine("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort); + ServerConsole.MainConsole.Instance.WriteLine("Sandbox Mode? " + OpenSim_Main.sim.sandbox.ToString()); + ServerConsole.MainConsole.Instance.WriteLine("Asset URL: " + this.AssetURL); + ServerConsole.MainConsole.Instance.WriteLine("Asset key: " + this.AssetSendKey); + ServerConsole.MainConsole.Instance.WriteLine("Grid URL: " + this.GridURL); + ServerConsole.MainConsole.Instance.WriteLine("Grid key: " + this.GridSendKey); + } + + public override World LoadWorld() + { + ServerConsole.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Loading world...."); + World blank = new World(); + ServerConsole.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Looking for a heightmap in local DB"); + IObjectSet world_result = db.Get(new float[65536]); + if(world_result.Count>0) { + ServerConsole.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Found a heightmap in local database, loading"); + blank.LandMap=(float[])world_result.Next(); + } else { + ServerConsole.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - No heightmap found, generating new one"); + HeightmapGenHills hills = new HeightmapGenHills(); + blank.LandMap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false); + ServerConsole.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Saving heightmap to local database"); + db.Set(blank.LandMap); + db.Commit(); + } + return blank; + } + + public override void LoadFromGrid() { + ServerConsole.MainConsole.Instance.WriteLine("Config.cs:LoadFromGrid() - dummy function, DOING ABSOLUTELY NOTHING AT ALL!!!"); + // TODO: Make this crap work + /* WebRequest GridLogin = WebRequest.Create(this.GridURL + "regions/" + this.RegionHandle.ToString() + "/login"); + WebResponse GridResponse = GridLogin.GetResponse(); + byte[] idata = new byte[(int)GridResponse.ContentLength]; + BinaryReader br = new BinaryReader(GridResponse.GetResponseStream()); + + br.Close(); + GridResponse.Close(); + */ + } + + public void Shutdown() { + db.Close(); + } + } +} diff --git a/src/Config/SimConfig/SimConfig.csproj b/src/Config/SimConfig/SimConfig.csproj new file mode 100644 index 0000000..08f0f24 --- /dev/null +++ b/src/Config/SimConfig/SimConfig.csproj @@ -0,0 +1,49 @@ + + + Library + SimConfig + SimConfig + Debug + AnyCPU + {B063760D-DB8D-4F64-B6FE-335FAD1E650A} + + + bin\Debug\ + False + DEBUG;TRACE + True + Full + True + + + bin\Release\ + True + TRACE + False + None + False + + + + + + ..\..\..\bin\Db4objects.Db4o.dll + False + + + + + + + + + {C9A6026D-8E0C-4FE4-8691-FB2A566AA245} + ServerConsole + + + {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E} + Second-server + + + + \ No newline at end of file diff --git a/src/Config/SimConfig/SimConfig.sln b/src/Config/SimConfig/SimConfig.sln new file mode 100644 index 0000000..944d6a8 --- /dev/null +++ b/src/Config/SimConfig/SimConfig.sln @@ -0,0 +1,7 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# SharpDevelop 2.1.0.2017 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimConfig", "SimConfig.csproj", "{B063760D-DB8D-4F64-B6FE-335FAD1E650A}" +EndProject +Global +EndGlobal diff --git a/src/Config/default.build b/src/Config/default.build new file mode 100644 index 0000000..2ee0c52 --- /dev/null +++ b/src/Config/default.build @@ -0,0 +1,52 @@ + + + nant buildfile for OpenSim + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.1