aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-19 17:57:03 +0000
committerJustin Clarke Casey2008-12-19 17:57:03 +0000
commit7ce8ccb043002520a82ce14325e991a22e0c292b (patch)
tree6e8350769193c0a0053b9432b326fe257735532b /OpenSim/Region/Environment/Modules
parent* Commit patch from cmickeyb. #2871. Optimized float array for the terrain ... (diff)
downloadopensim-SC_OLD-7ce8ccb043002520a82ce14325e991a22e0c292b.zip
opensim-SC_OLD-7ce8ccb043002520a82ce14325e991a22e0c292b.tar.gz
opensim-SC_OLD-7ce8ccb043002520a82ce14325e991a22e0c292b.tar.bz2
opensim-SC_OLD-7ce8ccb043002520a82ce14325e991a22e0c292b.tar.xz
* refactor: Move tree code out into a separate module
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs16
-rw-r--r--OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs118
3 files changed, 128 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
index 5f0f4f9..a86fceb 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Gestures
74 m_log.ErrorFormat("[GESTURES]: Unable to find user {0}", client.Name); 74 m_log.ErrorFormat("[GESTURES]: Unable to find user {0}", client.Name);
75 } 75 }
76 76
77 public virtual void DeactivateGesture(IClientAPI client, UUID gestureId) 77 public virtual void DeactivateGesture(IClientAPI client, UUID gestureId)
78 { 78 {
79 CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(client.AgentId); 79 CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(client.AgentId);
80 80
diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
index 990d36e..8061648 100644
--- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
@@ -233,13 +233,15 @@ namespace OpenSim.Region.Environment.Modules.World.TreePopulator
233 { 233 {
234 position.Z = (float) m_scene.Heightmap[(int) position.X, (int) position.Y]; 234 position.Z = (float) m_scene.Heightmap[(int) position.X, (int) position.Y];
235 235
236 SceneObjectGroup tree = 236 IVegetationModule module = m_scene.RequestModuleInterface<IVegetationModule>();
237 m_scene.AddTree(uuid, UUID.Zero, new Vector3(0.1f, 0.1f, 0.1f), 237
238 Quaternion.Identity, 238 if (null == module)
239 position, 239 return;
240 Tree.Cypress1, 240
241 false); 241 SceneObjectGroup tree
242 242 = module.AddTree(
243 uuid, UUID.Zero, new Vector3(0.1f, 0.1f, 0.1f), Quaternion.Identity, position, Tree.Cypress1, false);
244
243 m_trees.Add(tree.UUID); 245 m_trees.Add(tree.UUID);
244 tree.SendGroupFullUpdate(); 246 tree.SendGroupFullUpdate();
245 } 247 }
diff --git a/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs
new file mode 100644
index 0000000..a1c2192
--- /dev/null
+++ b/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs
@@ -0,0 +1,118 @@
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 OpenSim 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
28using System;
29using System.Reflection;
30using log4net;
31using Nini.Config;
32using OpenMetaverse;
33using OpenSim.Framework;
34using OpenSim.Framework.Communications;
35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.Environment.Scenes;
38
39namespace OpenSim.Region.Environment.Modules.Avatar.Vegetation
40{
41 public class VegetationModule : IRegionModule, IVegetationModule
42 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44
45 protected Scene m_scene;
46
47 protected static readonly PCode[] creationCapabilities = new PCode[] { PCode.Grass, PCode.NewTree, PCode.Tree };
48 public PCode[] CreationCapabilities { get { return creationCapabilities; } }
49
50 public void Initialise(Scene scene, IConfigSource source)
51 {
52 m_scene = scene;
53 m_scene.RegisterModuleInterface<IVegetationModule>(this);
54 }
55
56 public void PostInitialise() {}
57 public void Close() {}
58 public string Name { get { return "Vegetation Module"; } }
59 public bool IsSharedModule { get { return false; } }
60
61 public SceneObjectGroup AddTree(
62 UUID uuid, UUID groupID, Vector3 scale, Quaternion rotation, Vector3 position, Tree treeType, bool newTree)
63 {
64 PrimitiveBaseShape treeShape = new PrimitiveBaseShape();
65 treeShape.PathCurve = 16;
66 treeShape.PathEnd = 49900;
67 treeShape.PCode = newTree ? (byte)PCode.NewTree : (byte)PCode.Tree;
68 treeShape.Scale = scale;
69 treeShape.State = (byte)treeType;
70
71 return m_scene.AddNewPrim(uuid, groupID, position, rotation, treeShape);
72 }
73
74 public SceneObjectGroup CreateEntity(
75 UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
76 {
77 if (Array.IndexOf(creationCapabilities, (PCode)shape.PCode) < 0)
78 {
79 m_log.DebugFormat("[VEGETATION]: PCode {0} not handled by {1}", shape.PCode, Name);
80 return null;
81 }
82
83 SceneObjectGroup sceneObject = new SceneObjectGroup(ownerID, pos, rot, shape);
84 SceneObjectPart rootPart = sceneObject.GetChildPart(sceneObject.UUID);
85
86 // if grass or tree, make phantom
87 //rootPart.TrimPermissions();
88 rootPart.AddFlag(PrimFlags.Phantom);
89 if (rootPart.Shape.PCode != (byte)PCode.Grass)
90 AdaptTree(ref shape);
91
92 m_scene.AddNewSceneObject(sceneObject, true);
93 sceneObject.SetGroup(groupID, null);
94
95 return sceneObject;
96 }
97
98 protected void AdaptTree(ref PrimitiveBaseShape tree)
99 {
100 // Tree size has to be adapted depending on its type
101 switch ((Tree)tree.State)
102 {
103 case Tree.Cypress1:
104 case Tree.Cypress2:
105 tree.Scale = new Vector3(4, 4, 10);
106 break;
107
108 // case... other tree types
109 // tree.Scale = new Vector3(?, ?, ?);
110 // break;
111
112 default:
113 tree.Scale = new Vector3(4, 4, 4);
114 break;
115 }
116 }
117 }
118}