diff options
author | Diva Canto | 2015-08-31 09:21:05 -0700 |
---|---|---|
committer | Diva Canto | 2015-08-31 09:21:05 -0700 |
commit | 3741edd1c791e87a38805a62530755cbf0c55cab (patch) | |
tree | 93993feafe3ae4b7fc67f9cd2cf5218882134295 /OpenSim/Region/PhysicsModules/SharedBase | |
parent | More namespace and dll name changes. Still no functional changes. (diff) | |
download | opensim-SC_OLD-3741edd1c791e87a38805a62530755cbf0c55cab.zip opensim-SC_OLD-3741edd1c791e87a38805a62530755cbf0c55cab.tar.gz opensim-SC_OLD-3741edd1c791e87a38805a62530755cbf0c55cab.tar.bz2 opensim-SC_OLD-3741edd1c791e87a38805a62530755cbf0c55cab.tar.xz |
Refactored Meshing modules:
- Moved ZeroMesher from OpenSim.Region.PhysicsModules.SharedBase to OpenSim.Region.PhysicsModules.Meshing
- Created subfolder for all Meshmerizer files, also in the same Meshing dll
- Made them both region modules, with ZeroMesher being the default one
This compiles but doesn't run yet.
Diffstat (limited to 'OpenSim/Region/PhysicsModules/SharedBase')
-rw-r--r-- | OpenSim/Region/PhysicsModules/SharedBase/PhysicsPluginManager.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/PhysicsModules/SharedBase/ZeroMesher.cs | 83 |
2 files changed, 0 insertions, 90 deletions
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsPluginManager.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsPluginManager.cs index f7992d5..6316463 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsPluginManager.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsPluginManager.cs | |||
@@ -51,13 +51,6 @@ namespace OpenSim.Region.PhysicsModules.SharedBase | |||
51 | /// </summary> | 51 | /// </summary> |
52 | public PhysicsPluginManager() | 52 | public PhysicsPluginManager() |
53 | { | 53 | { |
54 | // Load "plugins", that are hard coded and not existing in form of an external lib, and hence always | ||
55 | // available | ||
56 | IMeshingPlugin plugHard; | ||
57 | plugHard = new ZeroMesherPlugin(); | ||
58 | _MeshPlugins.Add(plugHard.GetName(), plugHard); | ||
59 | |||
60 | m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName()); | ||
61 | } | 54 | } |
62 | 55 | ||
63 | /// <summary> | 56 | /// <summary> |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/ZeroMesher.cs b/OpenSim/Region/PhysicsModules/SharedBase/ZeroMesher.cs deleted file mode 100644 index fe87962..0000000 --- a/OpenSim/Region/PhysicsModules/SharedBase/ZeroMesher.cs +++ /dev/null | |||
@@ -1,83 +0,0 @@ | |||
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 OpenSim.Framework; | ||
30 | using OpenMetaverse; | ||
31 | using Nini.Config; | ||
32 | |||
33 | /* | ||
34 | * This is the zero mesher. | ||
35 | * Whatever you want him to mesh, he can't, telling you that by responding with a null pointer. | ||
36 | * Effectivly this is for switching off meshing and for testing as each physics machine should deal | ||
37 | * with the null pointer situation. | ||
38 | * But it's also a convenience thing, as physics machines can rely on having a mesher in any situation, even | ||
39 | * if it's a dump one like this. | ||
40 | * Note, that this mesher is *not* living in a module but in the manager itself, so | ||
41 | * it's always availabe and thus the default in case of configuration errors | ||
42 | */ | ||
43 | |||
44 | namespace OpenSim.Region.PhysicsModules.SharedBase | ||
45 | { | ||
46 | public class ZeroMesherPlugin : IMeshingPlugin | ||
47 | { | ||
48 | public ZeroMesherPlugin() | ||
49 | { | ||
50 | } | ||
51 | |||
52 | public string GetName() | ||
53 | { | ||
54 | return "ZeroMesher"; | ||
55 | } | ||
56 | |||
57 | public IMesher GetMesher(IConfigSource config) | ||
58 | { | ||
59 | return new ZeroMesher(); | ||
60 | } | ||
61 | } | ||
62 | |||
63 | public class ZeroMesher : IMesher | ||
64 | { | ||
65 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod) | ||
66 | { | ||
67 | return CreateMesh(primName, primShape, size, lod, false, false); | ||
68 | } | ||
69 | |||
70 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical) | ||
71 | { | ||
72 | return CreateMesh(primName, primShape, size, lod, false, false); | ||
73 | } | ||
74 | |||
75 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool shouldCache) | ||
76 | { | ||
77 | // Remove the reference to the encoded JPEG2000 data so it can be GCed | ||
78 | primShape.SculptData = OpenMetaverse.Utils.EmptyBytes; | ||
79 | |||
80 | return null; | ||
81 | } | ||
82 | } | ||
83 | } | ||