diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules')
4 files changed, 272 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml b/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml index 352052a..5eea286 100644 --- a/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml +++ b/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml | |||
@@ -12,5 +12,6 @@ | |||
12 | <RegionModule id="IRCBridge" type="OpenSim.Region.OptionalModules.Avatar.Chat.IRCBridgeModule" /> | 12 | <RegionModule id="IRCBridge" type="OpenSim.Region.OptionalModules.Avatar.Chat.IRCBridgeModule" /> |
13 | <RegionModule id="Concierge" type="OpenSim.Region.OptionalModules.Avatar.Concierge.ConciergeModule" /> | 13 | <RegionModule id="Concierge" type="OpenSim.Region.OptionalModules.Avatar.Concierge.ConciergeModule" /> |
14 | <RegionModule id="VivoxVoice" type="OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice.VivoxVoiceModule" /> | 14 | <RegionModule id="VivoxVoice" type="OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice.VivoxVoiceModule" /> |
15 | <RegionModule id="WorldViewModule" type="OpenSim.Region.OptionalModules.World.WorldView.WorldViewModule" /> | ||
15 | </Extension> | 16 | </Extension> |
16 | </Addin> | 17 | </Addin> |
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index e42dbf2..7e1b5ac 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
@@ -812,7 +812,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
812 | // gets the object data. If the data sent by the client doesn't match the object, the viewer probably has an | 812 | // gets the object data. If the data sent by the client doesn't match the object, the viewer probably has an |
813 | // old idea of what the object properties are. Viewer developer Hazim informed us that the base module | 813 | // old idea of what the object properties are. Viewer developer Hazim informed us that the base module |
814 | // didn't check the client sent data against the object do any. Since the base modules are the | 814 | // didn't check the client sent data against the object do any. Since the base modules are the |
815 | // 'crowning glory' examples of good practice.. | 815 | // 'crowning glory' examples of good practice.. |
816 | 816 | ||
817 | // Validate that the object exists in the scene the user is in | 817 | // Validate that the object exists in the scene the user is in |
818 | SceneObjectPart part = s.GetSceneObjectPart(localID); | 818 | SceneObjectPart part = s.GetSceneObjectPart(localID); |
diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs new file mode 100644 index 0000000..d4b7020 --- /dev/null +++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs | |||
@@ -0,0 +1,122 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Drawing; | ||
31 | using System.Drawing.Imaging; | ||
32 | using System.Reflection; | ||
33 | using System.IO; | ||
34 | using log4net; | ||
35 | using Nini.Config; | ||
36 | using OpenMetaverse; | ||
37 | using OpenMetaverse.Imaging; | ||
38 | using OpenSim.Framework; | ||
39 | using OpenSim.Region.Framework.Interfaces; | ||
40 | using OpenSim.Region.Framework.Scenes; | ||
41 | using OpenSim.Server.Base; | ||
42 | using OpenSim.Framework.Servers.HttpServer; | ||
43 | using OpenSim.Services.Interfaces; | ||
44 | |||
45 | namespace OpenSim.Region.OptionalModules.World.WorldView | ||
46 | { | ||
47 | public class WorldViewModule : INonSharedRegionModule | ||
48 | { | ||
49 | private static readonly ILog m_log = | ||
50 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
51 | |||
52 | |||
53 | private bool m_Enabled = false; | ||
54 | private IMapImageGenerator m_Generator; | ||
55 | |||
56 | public void Initialise(IConfigSource config) | ||
57 | { | ||
58 | IConfig moduleConfig = config.Configs["Modules"]; | ||
59 | if (moduleConfig == null) | ||
60 | return; | ||
61 | |||
62 | if (moduleConfig.GetString("WorldViewModule", String.Empty) != Name) | ||
63 | return; | ||
64 | |||
65 | m_Enabled = true; | ||
66 | } | ||
67 | |||
68 | public void AddRegion(Scene scene) | ||
69 | { | ||
70 | } | ||
71 | |||
72 | public void RegionLoaded(Scene scene) | ||
73 | { | ||
74 | m_Generator = scene.RequestModuleInterface<IMapImageGenerator>(); | ||
75 | if (m_Generator == null) | ||
76 | { | ||
77 | m_Enabled = false; | ||
78 | return; | ||
79 | } | ||
80 | |||
81 | m_log.Info("[WORLDVIEW]: Configured and enabled"); | ||
82 | |||
83 | IHttpServer server = MainServer.GetHttpServer(0); | ||
84 | server.AddStreamHandler(new WorldViewRequestHandler(this, | ||
85 | scene.RegionInfo.RegionID.ToString())); | ||
86 | } | ||
87 | |||
88 | public void RemoveRegion(Scene scene) | ||
89 | { | ||
90 | } | ||
91 | |||
92 | public string Name | ||
93 | { | ||
94 | get { return "WorldViewModule"; } | ||
95 | } | ||
96 | |||
97 | public Type ReplaceableInterface | ||
98 | { | ||
99 | get { return null; } | ||
100 | } | ||
101 | |||
102 | public void Close() | ||
103 | { | ||
104 | } | ||
105 | |||
106 | public byte[] GenerateWorldView(Vector3 pos, Vector3 rot, float fov, | ||
107 | int width, int height, bool usetex) | ||
108 | { | ||
109 | if (!m_Enabled) | ||
110 | return new Byte[0]; | ||
111 | |||
112 | Bitmap bmp = m_Generator.CreateViewImage(pos, rot, fov, width, | ||
113 | height, usetex); | ||
114 | |||
115 | MemoryStream str = new MemoryStream(); | ||
116 | |||
117 | bmp.Save(str, ImageFormat.Jpeg); | ||
118 | |||
119 | return str.ToArray(); | ||
120 | } | ||
121 | } | ||
122 | } | ||
diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs new file mode 100644 index 0000000..f47d9c7 --- /dev/null +++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs | |||
@@ -0,0 +1,148 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.IO; | ||
31 | using System.Reflection; | ||
32 | using System.Xml; | ||
33 | |||
34 | using OpenSim.Framework; | ||
35 | using OpenSim.Server.Base; | ||
36 | using OpenSim.Framework.Servers.HttpServer; | ||
37 | using OpenSim.Region.Framework.Scenes; | ||
38 | using OpenSim.Region.Framework.Interfaces; | ||
39 | |||
40 | using OpenMetaverse; | ||
41 | using log4net; | ||
42 | |||
43 | namespace OpenSim.Region.OptionalModules.World.WorldView | ||
44 | { | ||
45 | public class WorldViewRequestHandler : BaseStreamHandler | ||
46 | { | ||
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
48 | |||
49 | protected WorldViewModule m_WorldViewModule; | ||
50 | protected Object m_RequestLock = new Object(); | ||
51 | |||
52 | public WorldViewRequestHandler(WorldViewModule fmodule, string rid) | ||
53 | : base("GET", "/worldview/" + rid) | ||
54 | { | ||
55 | m_WorldViewModule = fmodule; | ||
56 | } | ||
57 | |||
58 | public override byte[] Handle(string path, Stream requestData, | ||
59 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
60 | { | ||
61 | httpResponse.ContentType = "image/jpeg"; | ||
62 | |||
63 | // StreamReader sr = new StreamReader(requestData); | ||
64 | // string body = sr.ReadToEnd(); | ||
65 | // sr.Close(); | ||
66 | // body = body.Trim(); | ||
67 | |||
68 | try | ||
69 | { | ||
70 | lock (m_RequestLock) | ||
71 | { | ||
72 | Dictionary<string, object> request = | ||
73 | new Dictionary<string, object>(); | ||
74 | foreach (string name in httpRequest.QueryString) | ||
75 | request[name] = httpRequest.QueryString[name]; | ||
76 | |||
77 | return SendWorldView(request); | ||
78 | } | ||
79 | } | ||
80 | catch (Exception e) | ||
81 | { | ||
82 | m_log.Debug("[WORLDVIEW]: Exception: " + e.ToString()); | ||
83 | } | ||
84 | |||
85 | return new Byte[0]; | ||
86 | } | ||
87 | |||
88 | public Byte[] SendWorldView(Dictionary<string, object> request) | ||
89 | { | ||
90 | float posX; | ||
91 | float posY; | ||
92 | float posZ; | ||
93 | float rotX; | ||
94 | float rotY; | ||
95 | float rotZ; | ||
96 | float fov; | ||
97 | int width; | ||
98 | int height; | ||
99 | bool usetex; | ||
100 | |||
101 | if (!request.ContainsKey("posX")) | ||
102 | return new Byte[0]; | ||
103 | if (!request.ContainsKey("posY")) | ||
104 | return new Byte[0]; | ||
105 | if (!request.ContainsKey("posZ")) | ||
106 | return new Byte[0]; | ||
107 | if (!request.ContainsKey("rotX")) | ||
108 | return new Byte[0]; | ||
109 | if (!request.ContainsKey("rotY")) | ||
110 | return new Byte[0]; | ||
111 | if (!request.ContainsKey("rotZ")) | ||
112 | return new Byte[0]; | ||
113 | if (!request.ContainsKey("fov")) | ||
114 | return new Byte[0]; | ||
115 | if (!request.ContainsKey("width")) | ||
116 | return new Byte[0]; | ||
117 | if (!request.ContainsKey("height")) | ||
118 | return new Byte[0]; | ||
119 | if (!request.ContainsKey("usetex")) | ||
120 | return new Byte[0]; | ||
121 | |||
122 | try | ||
123 | { | ||
124 | posX = Convert.ToSingle(request["posX"]); | ||
125 | posY = Convert.ToSingle(request["posY"]); | ||
126 | posZ = Convert.ToSingle(request["posZ"]); | ||
127 | rotX = Convert.ToSingle(request["rotX"]); | ||
128 | rotY = Convert.ToSingle(request["rotY"]); | ||
129 | rotZ = Convert.ToSingle(request["rotZ"]); | ||
130 | fov = Convert.ToSingle(request["fov"]); | ||
131 | width = Convert.ToInt32(request["width"]); | ||
132 | height = Convert.ToInt32(request["height"]); | ||
133 | usetex = Convert.ToBoolean(request["usetex"]); | ||
134 | } | ||
135 | catch | ||
136 | { | ||
137 | return new Byte[0]; | ||
138 | } | ||
139 | |||
140 | Vector3 pos = new Vector3(posX, posY, posZ); | ||
141 | Vector3 rot = new Vector3(rotX, rotY, rotZ); | ||
142 | |||
143 | return m_WorldViewModule.GenerateWorldView(pos, rot, fov, width, | ||
144 | height, usetex); | ||
145 | } | ||
146 | } | ||
147 | } | ||
148 | |||