diff options
author | Sean Dague | 2007-07-16 15:40:11 +0000 |
---|---|---|
committer | Sean Dague | 2007-07-16 15:40:11 +0000 |
commit | 2a3c79df83e800d5dfe75a1a3b140ed81da2b1d6 (patch) | |
tree | e3f80ad51736cf17e856547b1bcf956010927434 /OpenSim/Region/Physics/Manager | |
parent | *Trunk compiles now (diff) | |
download | opensim-SC-2a3c79df83e800d5dfe75a1a3b140ed81da2b1d6.zip opensim-SC-2a3c79df83e800d5dfe75a1a3b140ed81da2b1d6.tar.gz opensim-SC-2a3c79df83e800d5dfe75a1a3b140ed81da2b1d6.tar.bz2 opensim-SC-2a3c79df83e800d5dfe75a1a3b140ed81da2b1d6.tar.xz |
changed to native line ending encoding
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/AssemblyInfo.cs | 112 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 334 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsManager.cs | 230 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 220 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsVector.cs | 110 |
5 files changed, 503 insertions, 503 deletions
diff --git a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs index 9415db9..27b467f 100644 --- a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs +++ b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs | |||
@@ -1,56 +1,56 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | 2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System.Reflection; | 28 | using System.Reflection; |
29 | using System.Runtime.InteropServices; | 29 | using System.Runtime.InteropServices; |
30 | // Information about this assembly is defined by the following | 30 | // Information about this assembly is defined by the following |
31 | // attributes. | 31 | // attributes. |
32 | // | 32 | // |
33 | // change them to the information which is associated with the assembly | 33 | // change them to the information which is associated with the assembly |
34 | // you compile. | 34 | // you compile. |
35 | 35 | ||
36 | [assembly: AssemblyTitle("PhysicsManager")] | 36 | [assembly: AssemblyTitle("PhysicsManager")] |
37 | [assembly: AssemblyDescription("")] | 37 | [assembly: AssemblyDescription("")] |
38 | [assembly: AssemblyConfiguration("")] | 38 | [assembly: AssemblyConfiguration("")] |
39 | [assembly: AssemblyCompany("")] | 39 | [assembly: AssemblyCompany("")] |
40 | [assembly: AssemblyProduct("PhysicsManager")] | 40 | [assembly: AssemblyProduct("PhysicsManager")] |
41 | [assembly: AssemblyCopyright("")] | 41 | [assembly: AssemblyCopyright("")] |
42 | [assembly: AssemblyTrademark("")] | 42 | [assembly: AssemblyTrademark("")] |
43 | [assembly: AssemblyCulture("")] | 43 | [assembly: AssemblyCulture("")] |
44 | 44 | ||
45 | // This sets the default COM visibility of types in the assembly to invisible. | 45 | // This sets the default COM visibility of types in the assembly to invisible. |
46 | // If you need to expose a type to COM, use [ComVisible(true)] on that type. | 46 | // If you need to expose a type to COM, use [ComVisible(true)] on that type. |
47 | [assembly: ComVisible(false)] | 47 | [assembly: ComVisible(false)] |
48 | 48 | ||
49 | // The assembly version has following format : | 49 | // The assembly version has following format : |
50 | // | 50 | // |
51 | // Major.Minor.Build.Revision | 51 | // Major.Minor.Build.Revision |
52 | // | 52 | // |
53 | // You can specify all values by your own or you can build default build and revision | 53 | // You can specify all values by your own or you can build default build and revision |
54 | // numbers with the '*' character (the default): | 54 | // numbers with the '*' character (the default): |
55 | 55 | ||
56 | [assembly: AssemblyVersion("1.0.*")] | 56 | [assembly: AssemblyVersion("1.0.*")] |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index da3b560..2c2c8dd 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -1,167 +1,167 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | 2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using Axiom.Math; | 28 | using Axiom.Math; |
29 | 29 | ||
30 | namespace OpenSim.Physics.Manager | 30 | namespace OpenSim.Physics.Manager |
31 | { | 31 | { |
32 | public delegate void PositionUpdate(PhysicsVector position); | 32 | public delegate void PositionUpdate(PhysicsVector position); |
33 | public delegate void VelocityUpdate(PhysicsVector velocity); | 33 | public delegate void VelocityUpdate(PhysicsVector velocity); |
34 | public delegate void OrientationUpdate(Quaternion orientation); | 34 | public delegate void OrientationUpdate(Quaternion orientation); |
35 | 35 | ||
36 | public abstract class PhysicsActor | 36 | public abstract class PhysicsActor |
37 | { | 37 | { |
38 | public event PositionUpdate OnPositionUpdate; | 38 | public event PositionUpdate OnPositionUpdate; |
39 | public event VelocityUpdate OnVelocityUpdate; | 39 | public event VelocityUpdate OnVelocityUpdate; |
40 | public event OrientationUpdate OnOrientationUpdate; | 40 | public event OrientationUpdate OnOrientationUpdate; |
41 | 41 | ||
42 | public static PhysicsActor Null | 42 | public static PhysicsActor Null |
43 | { | 43 | { |
44 | get | 44 | get |
45 | { | 45 | { |
46 | return new NullPhysicsActor(); | 46 | return new NullPhysicsActor(); |
47 | } | 47 | } |
48 | } | 48 | } |
49 | 49 | ||
50 | public abstract PhysicsVector Position | 50 | public abstract PhysicsVector Position |
51 | { | 51 | { |
52 | get; | 52 | get; |
53 | set; | 53 | set; |
54 | } | 54 | } |
55 | 55 | ||
56 | public abstract PhysicsVector Velocity | 56 | public abstract PhysicsVector Velocity |
57 | { | 57 | { |
58 | get; | 58 | get; |
59 | set; | 59 | set; |
60 | } | 60 | } |
61 | 61 | ||
62 | public abstract PhysicsVector Acceleration | 62 | public abstract PhysicsVector Acceleration |
63 | { | 63 | { |
64 | get; | 64 | get; |
65 | } | 65 | } |
66 | 66 | ||
67 | public abstract Quaternion Orientation | 67 | public abstract Quaternion Orientation |
68 | { | 68 | { |
69 | get; | 69 | get; |
70 | set; | 70 | set; |
71 | } | 71 | } |
72 | 72 | ||
73 | public abstract bool Flying | 73 | public abstract bool Flying |
74 | { | 74 | { |
75 | get; | 75 | get; |
76 | set; | 76 | set; |
77 | } | 77 | } |
78 | 78 | ||
79 | public abstract bool Kinematic | 79 | public abstract bool Kinematic |
80 | { | 80 | { |
81 | get; | 81 | get; |
82 | set; | 82 | set; |
83 | } | 83 | } |
84 | 84 | ||
85 | public abstract void AddForce(PhysicsVector force); | 85 | public abstract void AddForce(PhysicsVector force); |
86 | 86 | ||
87 | public abstract void SetMomentum(PhysicsVector momentum); | 87 | public abstract void SetMomentum(PhysicsVector momentum); |
88 | } | 88 | } |
89 | 89 | ||
90 | public class NullPhysicsActor : PhysicsActor | 90 | public class NullPhysicsActor : PhysicsActor |
91 | { | 91 | { |
92 | public override PhysicsVector Position | 92 | public override PhysicsVector Position |
93 | { | 93 | { |
94 | get | 94 | get |
95 | { | 95 | { |
96 | return PhysicsVector.Zero; | 96 | return PhysicsVector.Zero; |
97 | } | 97 | } |
98 | set | 98 | set |
99 | { | 99 | { |
100 | return; | 100 | return; |
101 | } | 101 | } |
102 | } | 102 | } |
103 | 103 | ||
104 | public override PhysicsVector Velocity | 104 | public override PhysicsVector Velocity |
105 | { | 105 | { |
106 | get | 106 | get |
107 | { | 107 | { |
108 | return PhysicsVector.Zero; | 108 | return PhysicsVector.Zero; |
109 | } | 109 | } |
110 | set | 110 | set |
111 | { | 111 | { |
112 | return; | 112 | return; |
113 | } | 113 | } |
114 | } | 114 | } |
115 | 115 | ||
116 | public override Quaternion Orientation | 116 | public override Quaternion Orientation |
117 | { | 117 | { |
118 | get | 118 | get |
119 | { | 119 | { |
120 | return Quaternion.Identity; | 120 | return Quaternion.Identity; |
121 | } | 121 | } |
122 | set | 122 | set |
123 | { | 123 | { |
124 | 124 | ||
125 | } | 125 | } |
126 | } | 126 | } |
127 | 127 | ||
128 | public override PhysicsVector Acceleration | 128 | public override PhysicsVector Acceleration |
129 | { | 129 | { |
130 | get { return PhysicsVector.Zero; } | 130 | get { return PhysicsVector.Zero; } |
131 | } | 131 | } |
132 | 132 | ||
133 | public override bool Flying | 133 | public override bool Flying |
134 | { | 134 | { |
135 | get | 135 | get |
136 | { | 136 | { |
137 | return false; | 137 | return false; |
138 | } | 138 | } |
139 | set | 139 | set |
140 | { | 140 | { |
141 | return; | 141 | return; |
142 | } | 142 | } |
143 | } | 143 | } |
144 | 144 | ||
145 | public override bool Kinematic | 145 | public override bool Kinematic |
146 | { | 146 | { |
147 | get | 147 | get |
148 | { | 148 | { |
149 | return true; | 149 | return true; |
150 | } | 150 | } |
151 | set | 151 | set |
152 | { | 152 | { |
153 | return; | 153 | return; |
154 | } | 154 | } |
155 | } | 155 | } |
156 | 156 | ||
157 | public override void AddForce(PhysicsVector force) | 157 | public override void AddForce(PhysicsVector force) |
158 | { | 158 | { |
159 | return; | 159 | return; |
160 | } | 160 | } |
161 | 161 | ||
162 | public override void SetMomentum(PhysicsVector momentum) | 162 | public override void SetMomentum(PhysicsVector momentum) |
163 | { | 163 | { |
164 | return; | 164 | return; |
165 | } | 165 | } |
166 | } | 166 | } |
167 | } | 167 | } |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsManager.cs index 265bce6..7c475e7 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsManager.cs | |||
@@ -1,115 +1,115 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | 2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using OpenSim.Framework.Console; | 32 | using OpenSim.Framework.Console; |
33 | 33 | ||
34 | namespace OpenSim.Physics.Manager | 34 | namespace OpenSim.Physics.Manager |
35 | { | 35 | { |
36 | /// <summary> | 36 | /// <summary> |
37 | /// Description of MyClass. | 37 | /// Description of MyClass. |
38 | /// </summary> | 38 | /// </summary> |
39 | public class PhysicsManager | 39 | public class PhysicsManager |
40 | { | 40 | { |
41 | private Dictionary<string, IPhysicsPlugin> _plugins=new Dictionary<string, IPhysicsPlugin>(); | 41 | private Dictionary<string, IPhysicsPlugin> _plugins=new Dictionary<string, IPhysicsPlugin>(); |
42 | 42 | ||
43 | public PhysicsManager() | 43 | public PhysicsManager() |
44 | { | 44 | { |
45 | 45 | ||
46 | } | 46 | } |
47 | 47 | ||
48 | public PhysicsScene GetPhysicsScene(string engineName) | 48 | public PhysicsScene GetPhysicsScene(string engineName) |
49 | { | 49 | { |
50 | if (String.IsNullOrEmpty(engineName)) | 50 | if (String.IsNullOrEmpty(engineName)) |
51 | { | 51 | { |
52 | return PhysicsScene.Null; | 52 | return PhysicsScene.Null; |
53 | } | 53 | } |
54 | 54 | ||
55 | if(_plugins.ContainsKey(engineName)) | 55 | if(_plugins.ContainsKey(engineName)) |
56 | { | 56 | { |
57 | MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName); | 57 | MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName); |
58 | return _plugins[engineName].GetScene(); | 58 | return _plugins[engineName].GetScene(); |
59 | } | 59 | } |
60 | else | 60 | else |
61 | { | 61 | { |
62 | MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName); | 62 | MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName); |
63 | throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName)); | 63 | throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName)); |
64 | } | 64 | } |
65 | } | 65 | } |
66 | 66 | ||
67 | public void LoadPlugins() | 67 | public void LoadPlugins() |
68 | { | 68 | { |
69 | string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory ,"Physics"); | 69 | string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory ,"Physics"); |
70 | string[] pluginFiles = Directory.GetFiles(path, "*.dll"); | 70 | string[] pluginFiles = Directory.GetFiles(path, "*.dll"); |
71 | 71 | ||
72 | 72 | ||
73 | for(int i= 0; i<pluginFiles.Length; i++) | 73 | for(int i= 0; i<pluginFiles.Length; i++) |
74 | { | 74 | { |
75 | this.AddPlugin(pluginFiles[i]); | 75 | this.AddPlugin(pluginFiles[i]); |
76 | } | 76 | } |
77 | } | 77 | } |
78 | 78 | ||
79 | private void AddPlugin(string FileName) | 79 | private void AddPlugin(string FileName) |
80 | { | 80 | { |
81 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); | 81 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); |
82 | 82 | ||
83 | foreach (Type pluginType in pluginAssembly.GetTypes()) | 83 | foreach (Type pluginType in pluginAssembly.GetTypes()) |
84 | { | 84 | { |
85 | if (pluginType.IsPublic) | 85 | if (pluginType.IsPublic) |
86 | { | 86 | { |
87 | if (!pluginType.IsAbstract) | 87 | if (!pluginType.IsAbstract) |
88 | { | 88 | { |
89 | Type typeInterface = pluginType.GetInterface("IPhysicsPlugin", true); | 89 | Type typeInterface = pluginType.GetInterface("IPhysicsPlugin", true); |
90 | 90 | ||
91 | if (typeInterface != null) | 91 | if (typeInterface != null) |
92 | { | 92 | { |
93 | IPhysicsPlugin plug = (IPhysicsPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 93 | IPhysicsPlugin plug = (IPhysicsPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
94 | plug.Init(); | 94 | plug.Init(); |
95 | this._plugins.Add(plug.GetName(),plug); | 95 | this._plugins.Add(plug.GetName(),plug); |
96 | 96 | ||
97 | } | 97 | } |
98 | 98 | ||
99 | typeInterface = null; | 99 | typeInterface = null; |
100 | } | 100 | } |
101 | } | 101 | } |
102 | } | 102 | } |
103 | 103 | ||
104 | pluginAssembly = null; | 104 | pluginAssembly = null; |
105 | } | 105 | } |
106 | } | 106 | } |
107 | 107 | ||
108 | public interface IPhysicsPlugin | 108 | public interface IPhysicsPlugin |
109 | { | 109 | { |
110 | bool Init(); | 110 | bool Init(); |
111 | PhysicsScene GetScene(); | 111 | PhysicsScene GetScene(); |
112 | string GetName(); | 112 | string GetName(); |
113 | void Dispose(); | 113 | void Dispose(); |
114 | } | 114 | } |
115 | } | 115 | } |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index d44da00..fb6358a 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -1,110 +1,110 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | 2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using OpenSim.Framework.Console; | 28 | using OpenSim.Framework.Console; |
29 | 29 | ||
30 | namespace OpenSim.Physics.Manager | 30 | namespace OpenSim.Physics.Manager |
31 | { | 31 | { |
32 | public abstract class PhysicsScene | 32 | public abstract class PhysicsScene |
33 | { | 33 | { |
34 | public static PhysicsScene Null | 34 | public static PhysicsScene Null |
35 | { | 35 | { |
36 | get | 36 | get |
37 | { | 37 | { |
38 | return new NullPhysicsScene(); | 38 | return new NullPhysicsScene(); |
39 | } | 39 | } |
40 | } | 40 | } |
41 | 41 | ||
42 | public abstract PhysicsActor AddAvatar(PhysicsVector position); | 42 | public abstract PhysicsActor AddAvatar(PhysicsVector position); |
43 | 43 | ||
44 | public abstract void RemoveAvatar(PhysicsActor actor); | 44 | public abstract void RemoveAvatar(PhysicsActor actor); |
45 | 45 | ||
46 | public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size); | 46 | public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size); |
47 | 47 | ||
48 | public abstract void Simulate(float timeStep); | 48 | public abstract void Simulate(float timeStep); |
49 | 49 | ||
50 | public abstract void GetResults(); | 50 | public abstract void GetResults(); |
51 | 51 | ||
52 | public abstract void SetTerrain(float[] heightMap); | 52 | public abstract void SetTerrain(float[] heightMap); |
53 | 53 | ||
54 | public abstract void DeleteTerrain(); | 54 | public abstract void DeleteTerrain(); |
55 | 55 | ||
56 | public abstract bool IsThreaded | 56 | public abstract bool IsThreaded |
57 | { | 57 | { |
58 | get; | 58 | get; |
59 | } | 59 | } |
60 | 60 | ||
61 | private class NullPhysicsScene : PhysicsScene | 61 | private class NullPhysicsScene : PhysicsScene |
62 | { | 62 | { |
63 | private static int m_workIndicator; | 63 | private static int m_workIndicator; |
64 | 64 | ||
65 | public override PhysicsActor AddAvatar(PhysicsVector position) | 65 | public override PhysicsActor AddAvatar(PhysicsVector position) |
66 | { | 66 | { |
67 | MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position); | 67 | MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position); |
68 | return PhysicsActor.Null; | 68 | return PhysicsActor.Null; |
69 | } | 69 | } |
70 | 70 | ||
71 | public override void RemoveAvatar(PhysicsActor actor) | 71 | public override void RemoveAvatar(PhysicsActor actor) |
72 | { | 72 | { |
73 | 73 | ||
74 | } | 74 | } |
75 | 75 | ||
76 | public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size) | 76 | public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size) |
77 | { | 77 | { |
78 | MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); | 78 | MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); |
79 | return PhysicsActor.Null; | 79 | return PhysicsActor.Null; |
80 | } | 80 | } |
81 | 81 | ||
82 | public override void Simulate(float timeStep) | 82 | public override void Simulate(float timeStep) |
83 | { | 83 | { |
84 | m_workIndicator = (m_workIndicator + 1) % 10; | 84 | m_workIndicator = (m_workIndicator + 1) % 10; |
85 | 85 | ||
86 | //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString()); | 86 | //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString()); |
87 | } | 87 | } |
88 | 88 | ||
89 | public override void GetResults() | 89 | public override void GetResults() |
90 | { | 90 | { |
91 | MainLog.Instance.Verbose("NullPhysicsScene : GetResults()"); | 91 | MainLog.Instance.Verbose("NullPhysicsScene : GetResults()"); |
92 | } | 92 | } |
93 | 93 | ||
94 | public override void SetTerrain(float[] heightMap) | 94 | public override void SetTerrain(float[] heightMap) |
95 | { | 95 | { |
96 | MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); | 96 | MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); |
97 | } | 97 | } |
98 | 98 | ||
99 | public override void DeleteTerrain() | 99 | public override void DeleteTerrain() |
100 | { | 100 | { |
101 | 101 | ||
102 | } | 102 | } |
103 | 103 | ||
104 | public override bool IsThreaded | 104 | public override bool IsThreaded |
105 | { | 105 | { |
106 | get { return false; } | 106 | get { return false; } |
107 | } | 107 | } |
108 | } | 108 | } |
109 | } | 109 | } |
110 | } | 110 | } |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsVector.cs b/OpenSim/Region/Physics/Manager/PhysicsVector.cs index e75f29b..2cbca25 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsVector.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsVector.cs | |||
@@ -1,55 +1,55 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | 2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | namespace OpenSim.Physics.Manager | 28 | namespace OpenSim.Physics.Manager |
29 | { | 29 | { |
30 | public class PhysicsVector | 30 | public class PhysicsVector |
31 | { | 31 | { |
32 | public float X; | 32 | public float X; |
33 | public float Y; | 33 | public float Y; |
34 | public float Z; | 34 | public float Z; |
35 | 35 | ||
36 | public PhysicsVector() | 36 | public PhysicsVector() |
37 | { | 37 | { |
38 | 38 | ||
39 | } | 39 | } |
40 | 40 | ||
41 | public PhysicsVector(float x, float y, float z) | 41 | public PhysicsVector(float x, float y, float z) |
42 | { | 42 | { |
43 | X = x; | 43 | X = x; |
44 | Y = y; | 44 | Y = y; |
45 | Z = z; | 45 | Z = z; |
46 | } | 46 | } |
47 | 47 | ||
48 | public static readonly PhysicsVector Zero = new PhysicsVector(0f, 0f, 0f); | 48 | public static readonly PhysicsVector Zero = new PhysicsVector(0f, 0f, 0f); |
49 | 49 | ||
50 | public override string ToString() | 50 | public override string ToString() |
51 | { | 51 | { |
52 | return "<" + this.X + "," + this.Y + "," + this.Z + ">"; | 52 | return "<" + this.X + "," + this.Y + "," + this.Z + ">"; |
53 | } | 53 | } |
54 | } | 54 | } |
55 | } | 55 | } |