diff options
Diffstat (limited to 'OpenSim/OpenSim.Region/World')
-rw-r--r-- | OpenSim/OpenSim.Region/World/Entities/Entity.cs | 17 | ||||
-rw-r--r-- | OpenSim/OpenSim.Region/World/Entities/Primitive.cs | 1 | ||||
-rw-r--r-- | OpenSim/OpenSim.Region/World/Entities/SceneObject.cs | 1 | ||||
-rw-r--r-- | OpenSim/OpenSim.Region/World/types/Mesh.cs | 68 | ||||
-rw-r--r-- | OpenSim/OpenSim.Region/World/types/Triangle.cs | 64 |
5 files changed, 0 insertions, 151 deletions
diff --git a/OpenSim/OpenSim.Region/World/Entities/Entity.cs b/OpenSim/OpenSim.Region/World/Entities/Entity.cs index 1620c89..3d6ba64 100644 --- a/OpenSim/OpenSim.Region/World/Entities/Entity.cs +++ b/OpenSim/OpenSim.Region/World/Entities/Entity.cs | |||
@@ -30,7 +30,6 @@ using System.Collections.Generic; | |||
30 | using System.Text; | 30 | using System.Text; |
31 | using Axiom.MathLib; | 31 | using Axiom.MathLib; |
32 | using OpenSim.Physics.Manager; | 32 | using OpenSim.Physics.Manager; |
33 | using OpenSim.Region.types; | ||
34 | using libsecondlife; | 33 | using libsecondlife; |
35 | using OpenSim.Region.Scripting; | 34 | using OpenSim.Region.Scripting; |
36 | 35 | ||
@@ -131,22 +130,6 @@ namespace OpenSim.Region | |||
131 | } | 130 | } |
132 | 131 | ||
133 | /// <summary> | 132 | /// <summary> |
134 | /// Returns a mesh for this object and any dependents | ||
135 | /// </summary> | ||
136 | /// <returns>The mesh of this entity tree</returns> | ||
137 | public virtual Mesh getMesh() | ||
138 | { | ||
139 | Mesh mesh = new Mesh(); | ||
140 | |||
141 | foreach (Entity child in children) | ||
142 | { | ||
143 | mesh += child.getMesh(); | ||
144 | } | ||
145 | |||
146 | return mesh; | ||
147 | } | ||
148 | |||
149 | /// <summary> | ||
150 | /// Called at a set interval to inform entities that they should back themsleves up to the DB | 133 | /// Called at a set interval to inform entities that they should back themsleves up to the DB |
151 | /// </summary> | 134 | /// </summary> |
152 | public virtual void BackUp() | 135 | public virtual void BackUp() |
diff --git a/OpenSim/OpenSim.Region/World/Entities/Primitive.cs b/OpenSim/OpenSim.Region/World/Entities/Primitive.cs index 3d915a1..6efdd66 100644 --- a/OpenSim/OpenSim.Region/World/Entities/Primitive.cs +++ b/OpenSim/OpenSim.Region/World/Entities/Primitive.cs | |||
@@ -29,7 +29,6 @@ | |||
29 | using System; | 29 | using System; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Text; | 31 | using System.Text; |
32 | using OpenSim.Region.types; | ||
33 | using libsecondlife; | 32 | using libsecondlife; |
34 | using libsecondlife.Packets; | 33 | using libsecondlife.Packets; |
35 | using OpenSim.Framework.Interfaces; | 34 | using OpenSim.Framework.Interfaces; |
diff --git a/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs b/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs index 558dc6b..7284b73 100644 --- a/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs +++ b/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs | |||
@@ -28,7 +28,6 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | using OpenSim.Region.types; | ||
32 | using libsecondlife; | 31 | using libsecondlife; |
33 | using libsecondlife.Packets; | 32 | using libsecondlife.Packets; |
34 | using OpenSim.Framework.Interfaces; | 33 | using OpenSim.Framework.Interfaces; |
diff --git a/OpenSim/OpenSim.Region/World/types/Mesh.cs b/OpenSim/OpenSim.Region/World/types/Mesh.cs deleted file mode 100644 index a196449..0000000 --- a/OpenSim/OpenSim.Region/World/types/Mesh.cs +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.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 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Region.types | ||
33 | { | ||
34 | // TODO: This will need some performance tuning no doubt. | ||
35 | public class Mesh | ||
36 | { | ||
37 | public List<Triangle> mesh; | ||
38 | |||
39 | /// <summary> | ||
40 | /// | ||
41 | /// </summary> | ||
42 | public Mesh() | ||
43 | { | ||
44 | mesh = new List<Triangle>(); | ||
45 | } | ||
46 | |||
47 | /// <summary> | ||
48 | /// | ||
49 | /// </summary> | ||
50 | /// <param name="tri"></param> | ||
51 | public void AddTri(Triangle tri) | ||
52 | { | ||
53 | mesh.Add(tri); | ||
54 | } | ||
55 | |||
56 | /// <summary> | ||
57 | /// | ||
58 | /// </summary> | ||
59 | /// <param name="a"></param> | ||
60 | /// <param name="b"></param> | ||
61 | /// <returns></returns> | ||
62 | public static Mesh operator +(Mesh a, Mesh b) | ||
63 | { | ||
64 | a.mesh.AddRange(b.mesh); | ||
65 | return a; | ||
66 | } | ||
67 | } | ||
68 | } | ||
diff --git a/OpenSim/OpenSim.Region/World/types/Triangle.cs b/OpenSim/OpenSim.Region/World/types/Triangle.cs deleted file mode 100644 index aee92a5..0000000 --- a/OpenSim/OpenSim.Region/World/types/Triangle.cs +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.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 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using Axiom.MathLib; | ||
32 | |||
33 | namespace OpenSim.Region.types | ||
34 | { | ||
35 | public class Triangle | ||
36 | { | ||
37 | Vector3 a; | ||
38 | Vector3 b; | ||
39 | Vector3 c; | ||
40 | |||
41 | /// <summary> | ||
42 | /// | ||
43 | /// </summary> | ||
44 | public Triangle() | ||
45 | { | ||
46 | a = new Vector3(); | ||
47 | b = new Vector3(); | ||
48 | c = new Vector3(); | ||
49 | } | ||
50 | |||
51 | /// <summary> | ||
52 | /// | ||
53 | /// </summary> | ||
54 | /// <param name="A"></param> | ||
55 | /// <param name="B"></param> | ||
56 | /// <param name="C"></param> | ||
57 | public Triangle(Vector3 A, Vector3 B, Vector3 C) | ||
58 | { | ||
59 | a = A; | ||
60 | b = B; | ||
61 | c = C; | ||
62 | } | ||
63 | } | ||
64 | } | ||