diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs (renamed from src/physics/plugins/PhysXplugin.cs) | 52 | ||||
-rw-r--r-- | OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs (renamed from src/physics/RealPhysX/RealPhysXplugin/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs (renamed from src/physics/RealPhysX/RealPhysXplugin/RealPhysX.cs) | 69 | ||||
-rw-r--r-- | src/physics/AssemblyInfo.cs | 21 | ||||
-rw-r--r-- | src/physics/PhysicsManager.cs | 285 | ||||
-rw-r--r-- | src/physics/PhysicsManager.csproj | 40 | ||||
-rw-r--r-- | src/physics/RealPhysX/RealPhysXplugin/RealPhysXplugin.csproj | 46 | ||||
-rw-r--r-- | src/physics/default.build | 49 | ||||
-rw-r--r-- | src/physics/plugins/AssemblyInfo.cs | 21 | ||||
-rw-r--r-- | src/physics/plugins/BasicPhysicsplugin.csproj | 51 | ||||
-rw-r--r-- | src/physics/plugins/default.build | 51 |
11 files changed, 103 insertions, 582 deletions
diff --git a/src/physics/plugins/PhysXplugin.cs b/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs index 8c09dc8..deff803 100644 --- a/src/physics/plugins/PhysXplugin.cs +++ b/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs | |||
@@ -26,18 +26,18 @@ | |||
26 | */ | 26 | */ |
27 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using PhysicsSystem; | 29 | using OpenSim.Physics.Manager; |
30 | 30 | ||
31 | namespace PhysXplugin | 31 | namespace OpenSim.Physics.BasicPhysicsPlugin |
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
34 | /// Will be the PhysX plugin but for now will be a very basic physics engine | 34 | /// Will be the PhysX plugin but for now will be a very basic physics engine |
35 | /// </summary> | 35 | /// </summary> |
36 | public class PhysXPlugin : IPhysicsPlugin | 36 | public class BasicPhysicsPlugin : IPhysicsPlugin |
37 | { | 37 | { |
38 | private PhysXScene _mScene; | 38 | private BasicScene _mScene; |
39 | 39 | ||
40 | public PhysXPlugin() | 40 | public BasicPhysicsPlugin() |
41 | { | 41 | { |
42 | 42 | ||
43 | } | 43 | } |
@@ -51,14 +51,14 @@ namespace PhysXplugin | |||
51 | { | 51 | { |
52 | if(_mScene == null) | 52 | if(_mScene == null) |
53 | { | 53 | { |
54 | _mScene = new PhysXScene(); | 54 | _mScene = new BasicScene(); |
55 | } | 55 | } |
56 | return(_mScene); | 56 | return(_mScene); |
57 | } | 57 | } |
58 | 58 | ||
59 | public string GetName() | 59 | public string GetName() |
60 | { | 60 | { |
61 | return("PhysX"); | 61 | return("basicphysics"); |
62 | } | 62 | } |
63 | 63 | ||
64 | public void Dispose() | 64 | public void Dispose() |
@@ -67,19 +67,19 @@ namespace PhysXplugin | |||
67 | } | 67 | } |
68 | } | 68 | } |
69 | 69 | ||
70 | public class PhysXScene :PhysicsScene | 70 | public class BasicScene :PhysicsScene |
71 | { | 71 | { |
72 | private List<PhysXActor> _actors = new List<PhysXActor>(); | 72 | private List<BasicActor> _actors = new List<BasicActor>(); |
73 | private float[] _heightMap; | 73 | private float[] _heightMap; |
74 | 74 | ||
75 | public PhysXScene() | 75 | public BasicScene() |
76 | { | 76 | { |
77 | 77 | ||
78 | } | 78 | } |
79 | 79 | ||
80 | public override PhysicsActor AddAvatar(PhysicsVector position) | 80 | public override PhysicsActor AddAvatar(PhysicsVector position) |
81 | { | 81 | { |
82 | PhysXActor act = new PhysXActor(); | 82 | BasicActor act = new BasicActor(); |
83 | act.Position = position; | 83 | act.Position = position; |
84 | _actors.Add(act); | 84 | _actors.Add(act); |
85 | return act; | 85 | return act; |
@@ -92,7 +92,7 @@ namespace PhysXplugin | |||
92 | 92 | ||
93 | public override void Simulate(float timeStep) | 93 | public override void Simulate(float timeStep) |
94 | { | 94 | { |
95 | foreach (PhysXActor actor in _actors) | 95 | foreach (BasicActor actor in _actors) |
96 | { | 96 | { |
97 | actor.Position.X = actor.Position.X + (actor.Velocity.X * timeStep); | 97 | actor.Position.X = actor.Position.X + (actor.Velocity.X * timeStep); |
98 | actor.Position.Y = actor.Position.Y + (actor.Velocity.Y * timeStep); | 98 | actor.Position.Y = actor.Position.Y + (actor.Velocity.Y * timeStep); |
@@ -151,13 +151,13 @@ namespace PhysXplugin | |||
151 | } | 151 | } |
152 | } | 152 | } |
153 | 153 | ||
154 | public class PhysXActor : PhysicsActor | 154 | public class BasicActor : PhysicsActor |
155 | { | 155 | { |
156 | private PhysicsVector _position; | 156 | private PhysicsVector _position; |
157 | private PhysicsVector _velocity; | 157 | private PhysicsVector _velocity; |
158 | private PhysicsVector _acceleration; | 158 | private PhysicsVector _acceleration; |
159 | private bool flying; | 159 | private bool flying; |
160 | public PhysXActor() | 160 | public BasicActor() |
161 | { | 161 | { |
162 | _velocity = new PhysicsVector(); | 162 | _velocity = new PhysicsVector(); |
163 | _position = new PhysicsVector(); | 163 | _position = new PhysicsVector(); |
@@ -200,6 +200,18 @@ namespace PhysXplugin | |||
200 | } | 200 | } |
201 | } | 201 | } |
202 | 202 | ||
203 | public override Axiom.MathLib.Quaternion Orientation | ||
204 | { | ||
205 | get | ||
206 | { | ||
207 | return Axiom.MathLib.Quaternion.Identity; | ||
208 | } | ||
209 | set | ||
210 | { | ||
211 | |||
212 | } | ||
213 | } | ||
214 | |||
203 | public override PhysicsVector Acceleration | 215 | public override PhysicsVector Acceleration |
204 | { | 216 | { |
205 | get | 217 | get |
@@ -208,6 +220,18 @@ namespace PhysXplugin | |||
208 | } | 220 | } |
209 | 221 | ||
210 | } | 222 | } |
223 | |||
224 | public override bool Kinematic | ||
225 | { | ||
226 | get | ||
227 | { | ||
228 | return true; | ||
229 | } | ||
230 | set | ||
231 | { | ||
232 | |||
233 | } | ||
234 | } | ||
211 | public void SetAcceleration (PhysicsVector accel) | 235 | public void SetAcceleration (PhysicsVector accel) |
212 | { | 236 | { |
213 | this._acceleration = accel; | 237 | this._acceleration = accel; |
diff --git a/src/physics/RealPhysX/RealPhysXplugin/AssemblyInfo.cs b/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs index 913aae7..913aae7 100644 --- a/src/physics/RealPhysX/RealPhysXplugin/AssemblyInfo.cs +++ b/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs | |||
diff --git a/src/physics/RealPhysX/RealPhysXplugin/RealPhysX.cs b/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs index 9576a40..043c2f1 100644 --- a/src/physics/RealPhysX/RealPhysXplugin/RealPhysX.cs +++ b/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs | |||
@@ -52,10 +52,10 @@ | |||
52 | */ | 52 | */ |
53 | using System; | 53 | using System; |
54 | using System.Collections.Generic; | 54 | using System.Collections.Generic; |
55 | using PhysicsSystem; | 55 | using OpenSim.Physics.Manager; |
56 | using PhysXWrapper; | 56 | using PhysXWrapper; |
57 | 57 | ||
58 | namespace PhysXplugin | 58 | namespace OpenSim.Physics.PhysXPlugin |
59 | { | 59 | { |
60 | /// <summary> | 60 | /// <summary> |
61 | /// Will be the PhysX plugin but for now will be a very basic physics engine | 61 | /// Will be the PhysX plugin but for now will be a very basic physics engine |
@@ -105,6 +105,7 @@ namespace PhysXplugin | |||
105 | public PhysXScene() | 105 | public PhysXScene() |
106 | { | 106 | { |
107 | mySdk = NxPhysicsSDK.CreateSDK(); | 107 | mySdk = NxPhysicsSDK.CreateSDK(); |
108 | Console.WriteLine("Sdk created - now creating scene"); | ||
108 | scene = mySdk.CreateScene(); | 109 | scene = mySdk.CreateScene(); |
109 | 110 | ||
110 | } | 111 | } |
@@ -179,6 +180,7 @@ namespace PhysXplugin | |||
179 | private PhysicsVector _acceleration; | 180 | private PhysicsVector _acceleration; |
180 | private NxCharacter _character; | 181 | private NxCharacter _character; |
181 | private bool flying; | 182 | private bool flying; |
183 | private float gravityAccel; | ||
182 | 184 | ||
183 | public PhysXCharacter(NxCharacter character) | 185 | public PhysXCharacter(NxCharacter character) |
184 | { | 186 | { |
@@ -224,6 +226,30 @@ namespace PhysXplugin | |||
224 | } | 226 | } |
225 | } | 227 | } |
226 | 228 | ||
229 | public override bool Kinematic | ||
230 | { | ||
231 | get | ||
232 | { | ||
233 | return false; | ||
234 | } | ||
235 | set | ||
236 | { | ||
237 | |||
238 | } | ||
239 | } | ||
240 | |||
241 | public override Axiom.MathLib.Quaternion Orientation | ||
242 | { | ||
243 | get | ||
244 | { | ||
245 | return Axiom.MathLib.Quaternion.Identity; | ||
246 | } | ||
247 | set | ||
248 | { | ||
249 | |||
250 | } | ||
251 | } | ||
252 | |||
227 | public override PhysicsVector Acceleration | 253 | public override PhysicsVector Acceleration |
228 | { | 254 | { |
229 | get | 255 | get |
@@ -258,9 +284,14 @@ namespace PhysXplugin | |||
258 | } | 284 | } |
259 | else | 285 | else |
260 | { | 286 | { |
261 | vec.Z = (-9.8f + this._velocity.Z) * timeStep; | 287 | gravityAccel+= -9.8f; |
288 | vec.Z = (gravityAccel + this._velocity.Z) * timeStep; | ||
289 | } | ||
290 | int res = this._character.Move(vec); | ||
291 | if(res == 1) | ||
292 | { | ||
293 | gravityAccel = 0; | ||
262 | } | 294 | } |
263 | this._character.Move(vec); | ||
264 | } | 295 | } |
265 | 296 | ||
266 | public void UpdatePosition() | 297 | public void UpdatePosition() |
@@ -332,6 +363,36 @@ namespace PhysXplugin | |||
332 | } | 363 | } |
333 | } | 364 | } |
334 | 365 | ||
366 | public override bool Kinematic | ||
367 | { | ||
368 | get | ||
369 | { | ||
370 | return this._prim.Kinematic; | ||
371 | } | ||
372 | set | ||
373 | { | ||
374 | this._prim.Kinematic = value; | ||
375 | } | ||
376 | } | ||
377 | |||
378 | public override Axiom.MathLib.Quaternion Orientation | ||
379 | { | ||
380 | get | ||
381 | { | ||
382 | Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion(); | ||
383 | PhysXWrapper.Quaternion quat = this._prim.GetOrientation(); | ||
384 | res.w = quat.W; | ||
385 | res.x = quat.X; | ||
386 | res.y = quat.Y; | ||
387 | res.z = quat.Z; | ||
388 | return res; | ||
389 | } | ||
390 | set | ||
391 | { | ||
392 | |||
393 | } | ||
394 | } | ||
395 | |||
335 | public override PhysicsVector Acceleration | 396 | public override PhysicsVector Acceleration |
336 | { | 397 | { |
337 | get | 398 | get |
diff --git a/src/physics/AssemblyInfo.cs b/src/physics/AssemblyInfo.cs deleted file mode 100644 index c6a4efa..0000000 --- a/src/physics/AssemblyInfo.cs +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Reflection; | ||
3 | using System.Runtime.InteropServices; | ||
4 | |||
5 | // ------------------------------------------------------------------------------ | ||
6 | // <autogenerated> | ||
7 | // This code was generated by a tool. | ||
8 | // Mono Runtime Version: 2.0.50727.42 | ||
9 | // | ||
10 | // Changes to this file may cause incorrect behavior and will be lost if | ||
11 | // the code is regenerated. | ||
12 | // </autogenerated> | ||
13 | // ------------------------------------------------------------------------------ | ||
14 | |||
15 | [assembly: ComVisibleAttribute(false)] | ||
16 | [assembly: CLSCompliantAttribute(false)] | ||
17 | [assembly: AssemblyVersionAttribute("0.1.0.240")] | ||
18 | [assembly: AssemblyTitleAttribute("opensim-physicsmanager")] | ||
19 | [assembly: AssemblyDescriptionAttribute("Handles physics plugins")] | ||
20 | [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] | ||
21 | |||
diff --git a/src/physics/PhysicsManager.cs b/src/physics/PhysicsManager.cs deleted file mode 100644 index 1fee628..0000000 --- a/src/physics/PhysicsManager.cs +++ /dev/null | |||
@@ -1,285 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) OpenSim project, http://sim.opensecondlife.org/ | ||
3 | * | ||
4 | * Redistribution and use in source and binary forms, with or without | ||
5 | * modification, are permitted provided that the following conditions are met: | ||
6 | * * Redistributions of source code must retain the above copyright | ||
7 | * notice, this list of conditions and the following disclaimer. | ||
8 | * * Redistributions in binary form must reproduce the above copyright | ||
9 | * notice, this list of conditions and the following disclaimer in the | ||
10 | * documentation and/or other materials provided with the distribution. | ||
11 | * * Neither the name of the <organization> nor the | ||
12 | * names of its contributors may be used to endorse or promote products | ||
13 | * derived from this software without specific prior written permission. | ||
14 | * | ||
15 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
16 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
17 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
18 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
19 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
20 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
21 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
22 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
24 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
25 | * | ||
26 | */ | ||
27 | using System; | ||
28 | using System.Collections.Generic; | ||
29 | using System.Collections; | ||
30 | using System.IO; | ||
31 | using System.Reflection; | ||
32 | |||
33 | namespace PhysicsSystem | ||
34 | { | ||
35 | /// <summary> | ||
36 | /// Description of MyClass. | ||
37 | /// </summary> | ||
38 | public class PhysicsManager | ||
39 | { | ||
40 | private Dictionary<string, IPhysicsPlugin> _plugins=new Dictionary<string, IPhysicsPlugin>(); | ||
41 | |||
42 | public PhysicsManager() | ||
43 | { | ||
44 | |||
45 | } | ||
46 | |||
47 | public PhysicsScene GetPhysicsScene(string engineName) | ||
48 | { | ||
49 | if( String.IsNullOrEmpty( engineName ) ) | ||
50 | { | ||
51 | return new NullPhysicsScene(); | ||
52 | } | ||
53 | |||
54 | if(_plugins.ContainsKey(engineName)) | ||
55 | { | ||
56 | ServerConsole.MainConsole.Instance.WriteLine("creating "+engineName); | ||
57 | return _plugins[engineName].GetScene(); | ||
58 | } | ||
59 | else | ||
60 | { | ||
61 | string error = String.Format("couldn't find physicsEngine: {0}", engineName); | ||
62 | ServerConsole.MainConsole.Instance.WriteLine( error ); | ||
63 | throw new ArgumentException( error ); | ||
64 | } | ||
65 | } | ||
66 | |||
67 | public void LoadPlugins() | ||
68 | { | ||
69 | string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory ,"Physics"); | ||
70 | string[] pluginFiles = Directory.GetFiles(path, "*.dll"); | ||
71 | |||
72 | |||
73 | for(int i= 0; i<pluginFiles.Length; i++) | ||
74 | { | ||
75 | this.AddPlugin(pluginFiles[i]); | ||
76 | } | ||
77 | } | ||
78 | |||
79 | private void AddPlugin(string FileName) | ||
80 | { | ||
81 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); | ||
82 | |||
83 | foreach (Type pluginType in pluginAssembly.GetTypes()) | ||
84 | { | ||
85 | if (pluginType.IsPublic) | ||
86 | { | ||
87 | if (!pluginType.IsAbstract) | ||
88 | { | ||
89 | Type typeInterface = pluginType.GetInterface("IPhysicsPlugin", true); | ||
90 | |||
91 | if (typeInterface != null) | ||
92 | { | ||
93 | IPhysicsPlugin plug = (IPhysicsPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | ||
94 | plug.Init(); | ||
95 | this._plugins.Add(plug.GetName(),plug); | ||
96 | |||
97 | } | ||
98 | |||
99 | typeInterface = null; | ||
100 | } | ||
101 | } | ||
102 | } | ||
103 | |||
104 | pluginAssembly = null; | ||
105 | } | ||
106 | } | ||
107 | public interface IPhysicsPlugin | ||
108 | { | ||
109 | bool Init(); | ||
110 | PhysicsScene GetScene(); | ||
111 | string GetName(); | ||
112 | void Dispose(); | ||
113 | } | ||
114 | |||
115 | public abstract class PhysicsScene | ||
116 | { | ||
117 | public static PhysicsScene Null | ||
118 | { | ||
119 | get | ||
120 | { | ||
121 | return new NullPhysicsScene(); | ||
122 | } | ||
123 | } | ||
124 | |||
125 | public abstract PhysicsActor AddAvatar(PhysicsVector position); | ||
126 | |||
127 | public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size); | ||
128 | |||
129 | public abstract void Simulate(float timeStep); | ||
130 | |||
131 | public abstract void GetResults(); | ||
132 | |||
133 | public abstract void SetTerrain(float[] heightMap); | ||
134 | |||
135 | public abstract bool IsThreaded | ||
136 | { | ||
137 | get; | ||
138 | } | ||
139 | } | ||
140 | |||
141 | public class NullPhysicsScene : PhysicsScene | ||
142 | { | ||
143 | private static int m_workIndicator; | ||
144 | |||
145 | public override PhysicsActor AddAvatar(PhysicsVector position) | ||
146 | { | ||
147 | ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : AddAvatar({0})", position ); | ||
148 | return PhysicsActor.Null; | ||
149 | } | ||
150 | |||
151 | public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size) | ||
152 | { | ||
153 | ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : AddPrim({0},{1})", position, size ); | ||
154 | return PhysicsActor.Null; | ||
155 | } | ||
156 | |||
157 | public override void Simulate(float timeStep) | ||
158 | { | ||
159 | m_workIndicator = ( m_workIndicator + 1 ) % 10; | ||
160 | |||
161 | ServerConsole.MainConsole.Instance.SetStatus( m_workIndicator.ToString() ); | ||
162 | } | ||
163 | |||
164 | public override void GetResults() | ||
165 | { | ||
166 | ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : GetResults()" ); | ||
167 | } | ||
168 | |||
169 | public override void SetTerrain(float[] heightMap) | ||
170 | { | ||
171 | ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length ); | ||
172 | } | ||
173 | |||
174 | public override bool IsThreaded | ||
175 | { | ||
176 | get { return false; } | ||
177 | } | ||
178 | } | ||
179 | |||
180 | public abstract class PhysicsActor | ||
181 | { | ||
182 | public static readonly PhysicsActor Null = new NullPhysicsActor(); | ||
183 | |||
184 | public abstract PhysicsVector Position | ||
185 | { | ||
186 | get; | ||
187 | set; | ||
188 | } | ||
189 | |||
190 | public abstract PhysicsVector Velocity | ||
191 | { | ||
192 | get; | ||
193 | set; | ||
194 | } | ||
195 | |||
196 | public abstract PhysicsVector Acceleration | ||
197 | { | ||
198 | get; | ||
199 | } | ||
200 | public abstract bool Flying | ||
201 | { | ||
202 | get; | ||
203 | set; | ||
204 | } | ||
205 | |||
206 | public abstract void AddForce(PhysicsVector force); | ||
207 | |||
208 | public abstract void SetMomentum(PhysicsVector momentum); | ||
209 | } | ||
210 | |||
211 | public class NullPhysicsActor : PhysicsActor | ||
212 | { | ||
213 | public override PhysicsVector Position | ||
214 | { | ||
215 | get | ||
216 | { | ||
217 | return PhysicsVector.Zero; | ||
218 | } | ||
219 | set | ||
220 | { | ||
221 | return; | ||
222 | } | ||
223 | } | ||
224 | |||
225 | public override PhysicsVector Velocity | ||
226 | { | ||
227 | get | ||
228 | { | ||
229 | return PhysicsVector.Zero; | ||
230 | } | ||
231 | set | ||
232 | { | ||
233 | return; | ||
234 | } | ||
235 | } | ||
236 | |||
237 | public override PhysicsVector Acceleration | ||
238 | { | ||
239 | get { return PhysicsVector.Zero; } | ||
240 | } | ||
241 | |||
242 | public override bool Flying | ||
243 | { | ||
244 | get | ||
245 | { | ||
246 | return false; | ||
247 | } | ||
248 | set | ||
249 | { | ||
250 | return; | ||
251 | } | ||
252 | } | ||
253 | |||
254 | public override void AddForce(PhysicsVector force) | ||
255 | { | ||
256 | return; | ||
257 | } | ||
258 | |||
259 | public override void SetMomentum(PhysicsVector momentum) | ||
260 | { | ||
261 | return; | ||
262 | } | ||
263 | } | ||
264 | |||
265 | public class PhysicsVector | ||
266 | { | ||
267 | public float X; | ||
268 | public float Y; | ||
269 | public float Z; | ||
270 | |||
271 | public PhysicsVector() | ||
272 | { | ||
273 | |||
274 | } | ||
275 | |||
276 | public PhysicsVector(float x, float y, float z) | ||
277 | { | ||
278 | X = x; | ||
279 | Y = y; | ||
280 | Z = z; | ||
281 | } | ||
282 | |||
283 | public static readonly PhysicsVector Zero = new PhysicsVector(0f, 0f, 0f); | ||
284 | } | ||
285 | } | ||
diff --git a/src/physics/PhysicsManager.csproj b/src/physics/PhysicsManager.csproj deleted file mode 100644 index 3eadfe7..0000000 --- a/src/physics/PhysicsManager.csproj +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <OutputType>Library</OutputType> | ||
4 | <RootNamespace>PhysicsManager</RootNamespace> | ||
5 | <AssemblyName>PhysicsManager</AssemblyName> | ||
6 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
7 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
8 | <ProjectGuid>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</ProjectGuid> | ||
9 | </PropertyGroup> | ||
10 | <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> | ||
11 | <OutputPath>bin\Debug\</OutputPath> | ||
12 | <Optimize>False</Optimize> | ||
13 | <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
14 | <DebugSymbols>True</DebugSymbols> | ||
15 | <DebugType>Full</DebugType> | ||
16 | <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> | ||
17 | </PropertyGroup> | ||
18 | <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> | ||
19 | <OutputPath>bin\Release\</OutputPath> | ||
20 | <Optimize>True</Optimize> | ||
21 | <DefineConstants>TRACE</DefineConstants> | ||
22 | <DebugSymbols>False</DebugSymbols> | ||
23 | <DebugType>None</DebugType> | ||
24 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | ||
25 | </PropertyGroup> | ||
26 | <ItemGroup> | ||
27 | <Reference Include="System" /> | ||
28 | <Reference Include="System.Xml" /> | ||
29 | </ItemGroup> | ||
30 | <ItemGroup> | ||
31 | <Compile Include="PhysicsManager.cs" /> | ||
32 | </ItemGroup> | ||
33 | <ItemGroup> | ||
34 | <ProjectReference Include="..\ServerConsole\ServerConsole\ServerConsole.csproj"> | ||
35 | <Project>{C9A6026D-8E0C-4FE4-8691-FB2A566AA245}</Project> | ||
36 | <Name>ServerConsole</Name> | ||
37 | </ProjectReference> | ||
38 | </ItemGroup> | ||
39 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> | ||
40 | </Project> \ No newline at end of file | ||
diff --git a/src/physics/RealPhysX/RealPhysXplugin/RealPhysXplugin.csproj b/src/physics/RealPhysX/RealPhysXplugin/RealPhysXplugin.csproj deleted file mode 100644 index 554df5e..0000000 --- a/src/physics/RealPhysX/RealPhysXplugin/RealPhysXplugin.csproj +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <OutputType>Library</OutputType> | ||
4 | <RootNamespace>RealPhysXplugin</RootNamespace> | ||
5 | <AssemblyName>RealPhysXplugin</AssemblyName> | ||
6 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
7 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
8 | <ProjectGuid>{56C1D214-F389-4228-921A-0A3A0712C159}</ProjectGuid> | ||
9 | </PropertyGroup> | ||
10 | <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> | ||
11 | <OutputPath>..\..\..\..\bin\Physics\</OutputPath> | ||
12 | <Optimize>False</Optimize> | ||
13 | <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
14 | <DebugSymbols>True</DebugSymbols> | ||
15 | <DebugType>Full</DebugType> | ||
16 | <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> | ||
17 | </PropertyGroup> | ||
18 | <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> | ||
19 | <OutputPath>..\..\..\..\bin\Physics\</OutputPath> | ||
20 | <Optimize>True</Optimize> | ||
21 | <DefineConstants>TRACE</DefineConstants> | ||
22 | <DebugSymbols>False</DebugSymbols> | ||
23 | <DebugType>None</DebugType> | ||
24 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | ||
25 | </PropertyGroup> | ||
26 | <ItemGroup> | ||
27 | <Reference Include="System" /> | ||
28 | <Reference Include="System.Xml" /> | ||
29 | <Reference Include="PhysX_Wrapper_Dotnet"> | ||
30 | <HintPath>..\..\..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath> | ||
31 | <SpecificVersion>False</SpecificVersion> | ||
32 | <Private>False</Private> | ||
33 | </Reference> | ||
34 | </ItemGroup> | ||
35 | <ItemGroup> | ||
36 | <Compile Include="RealPhysX.cs" /> | ||
37 | </ItemGroup> | ||
38 | <ItemGroup> | ||
39 | <ProjectReference Include="..\..\PhysicsManager.csproj"> | ||
40 | <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project> | ||
41 | <Name>PhysicsManager</Name> | ||
42 | <Private>False</Private> | ||
43 | </ProjectReference> | ||
44 | </ItemGroup> | ||
45 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> | ||
46 | </Project> \ No newline at end of file | ||
diff --git a/src/physics/default.build b/src/physics/default.build deleted file mode 100644 index 01d2415..0000000 --- a/src/physics/default.build +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | <?xml version="1.0"?> | ||
2 | <project name="OpenSim" default="build" basedir="."> | ||
3 | <description>nant buildfile for OpenSim</description> | ||
4 | <property name="debug" value="true" overwrite="false" /> | ||
5 | <target name="clean" description="remove all generated files"> | ||
6 | <delete file="../../bin/PhysicsManager.dll" failonerror="false" /> | ||
7 | </target> | ||
8 | |||
9 | <target name="svnupdate" description="updates to latest SVN"> | ||
10 | <exec program="svn"> | ||
11 | <arg value="update" /> | ||
12 | </exec> | ||
13 | </target> | ||
14 | |||
15 | <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build"> | ||
16 | |||
17 | </target> | ||
18 | |||
19 | <target name="build" description="compiles the source code"> | ||
20 | |||
21 | <loadfile file="../../VERSION" property="svnver"/> | ||
22 | <asminfo output="AssemblyInfo.cs" language="CSharp"> | ||
23 | <imports> | ||
24 | <import namespace="System" /> | ||
25 | <import namespace="System.Reflection" /> | ||
26 | <import namespace="System.Runtime.InteropServices" /> | ||
27 | </imports> | ||
28 | <attributes> | ||
29 | <attribute type="ComVisibleAttribute" value="false" /> | ||
30 | <attribute type="CLSCompliantAttribute" value="false" /> | ||
31 | <attribute type="AssemblyVersionAttribute" value="${svnver}" /> | ||
32 | <attribute type="AssemblyTitleAttribute" value="opensim-physicsmanager" /> | ||
33 | <attribute type="AssemblyDescriptionAttribute" value="Handles physics plugins" /> | ||
34 | <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/> | ||
35 | </attributes> | ||
36 | </asminfo> | ||
37 | |||
38 | <csc target="library" output="../../bin/PhysicsManager.dll" debug="${debug}" verbose="true" warninglevel="4"> | ||
39 | <references basedir="../../bin" failonempty="true"> | ||
40 | <include name="System.dll" /> | ||
41 | <include name="System.Xml.dll" /> | ||
42 | <include name="ServerConsole.dll" /> | ||
43 | </references> | ||
44 | <sources basedir="./"> | ||
45 | <include name="*.cs" /> | ||
46 | </sources> | ||
47 | </csc> | ||
48 | </target> | ||
49 | </project> | ||
diff --git a/src/physics/plugins/AssemblyInfo.cs b/src/physics/plugins/AssemblyInfo.cs deleted file mode 100644 index 4cd5558..0000000 --- a/src/physics/plugins/AssemblyInfo.cs +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Reflection; | ||
3 | using System.Runtime.InteropServices; | ||
4 | |||
5 | // ------------------------------------------------------------------------------ | ||
6 | // <autogenerated> | ||
7 | // This code was generated by a tool. | ||
8 | // Mono Runtime Version: 2.0.50727.42 | ||
9 | // | ||
10 | // Changes to this file may cause incorrect behavior and will be lost if | ||
11 | // the code is regenerated. | ||
12 | // </autogenerated> | ||
13 | // ------------------------------------------------------------------------------ | ||
14 | |||
15 | [assembly: ComVisibleAttribute(false)] | ||
16 | [assembly: CLSCompliantAttribute(false)] | ||
17 | [assembly: AssemblyVersionAttribute("0.1.0.240")] | ||
18 | [assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")] | ||
19 | [assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")] | ||
20 | [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] | ||
21 | |||
diff --git a/src/physics/plugins/BasicPhysicsplugin.csproj b/src/physics/plugins/BasicPhysicsplugin.csproj deleted file mode 100644 index b3f47d3..0000000 --- a/src/physics/plugins/BasicPhysicsplugin.csproj +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
5 | <ProductVersion>8.0.50727</ProductVersion> | ||
6 | <SchemaVersion>2.0</SchemaVersion> | ||
7 | <ProjectGuid>{52BCCE7B-69EA-4AC3-9DBC-D571B96C2EA1}</ProjectGuid> | ||
8 | <OutputType>Library</OutputType> | ||
9 | <AppDesignerFolder>Properties</AppDesignerFolder> | ||
10 | <RootNamespace>BasicPhysicsplugin</RootNamespace> | ||
11 | <AssemblyName>BasicPhysicsplugin</AssemblyName> | ||
12 | </PropertyGroup> | ||
13 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
14 | <DebugSymbols>true</DebugSymbols> | ||
15 | <DebugType>full</DebugType> | ||
16 | <Optimize>false</Optimize> | ||
17 | <OutputPath>..\..\..\bin\Physics\</OutputPath> | ||
18 | <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
19 | <ErrorReport>prompt</ErrorReport> | ||
20 | <WarningLevel>4</WarningLevel> | ||
21 | </PropertyGroup> | ||
22 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
23 | <DebugType>pdbonly</DebugType> | ||
24 | <Optimize>true</Optimize> | ||
25 | <OutputPath>..\..\..\bin\Physics\</OutputPath> | ||
26 | <DefineConstants>TRACE</DefineConstants> | ||
27 | <ErrorReport>prompt</ErrorReport> | ||
28 | <WarningLevel>4</WarningLevel> | ||
29 | </PropertyGroup> | ||
30 | <ItemGroup> | ||
31 | <Reference Include="Axiom.MathLib, Version=0.7.0.25497, Culture=neutral"> | ||
32 | <SpecificVersion>False</SpecificVersion> | ||
33 | <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath> | ||
34 | <Private>False</Private> | ||
35 | </Reference> | ||
36 | <Reference Include="System" /> | ||
37 | <Reference Include="System.Data" /> | ||
38 | <Reference Include="System.Xml" /> | ||
39 | </ItemGroup> | ||
40 | <ItemGroup> | ||
41 | <Compile Include="PhysXplugin.cs" /> | ||
42 | </ItemGroup> | ||
43 | <ItemGroup> | ||
44 | <ProjectReference Include="..\PhysicsManager.csproj"> | ||
45 | <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project> | ||
46 | <Name>PhysicsManager</Name> | ||
47 | <Private>False</Private> | ||
48 | </ProjectReference> | ||
49 | </ItemGroup> | ||
50 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | ||
51 | </Project> \ No newline at end of file | ||
diff --git a/src/physics/plugins/default.build b/src/physics/plugins/default.build deleted file mode 100644 index 66056a5..0000000 --- a/src/physics/plugins/default.build +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | <?xml version="1.0"?> | ||
2 | <project name="OpenSim" default="build" basedir="."> | ||
3 | <description>nant buildfile for OpenSim</description> | ||
4 | <property name="debug" value="true" overwrite="false" /> | ||
5 | <target name="clean" description="remove all generated files"> | ||
6 | <delete file="../../../bin/Physics/PhysXplugin.dll" failonerror="false" /> | ||
7 | </target> | ||
8 | |||
9 | <target name="svnupdate" description="updates to latest SVN"> | ||
10 | <exec program="svn"> | ||
11 | <arg value="update" /> | ||
12 | </exec> | ||
13 | </target> | ||
14 | |||
15 | <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build"> | ||
16 | |||
17 | </target> | ||
18 | |||
19 | <target name="build" description="compiles the source code"> | ||
20 | |||
21 | <loadfile file="../../../VERSION" property="svnver"/> | ||
22 | <asminfo output="AssemblyInfo.cs" language="CSharp"> | ||
23 | <imports> | ||
24 | <import namespace="System" /> | ||
25 | <import namespace="System.Reflection" /> | ||
26 | <import namespace="System.Runtime.InteropServices" /> | ||
27 | </imports> | ||
28 | <attributes> | ||
29 | <attribute type="ComVisibleAttribute" value="false" /> | ||
30 | <attribute type="CLSCompliantAttribute" value="false" /> | ||
31 | <attribute type="AssemblyVersionAttribute" value="${svnver}" /> | ||
32 | <attribute type="AssemblyTitleAttribute" value="opensim-physicsmanager-physx" /> | ||
33 | <attribute type="AssemblyDescriptionAttribute" value="PhysX plugin for OpenSim" /> | ||
34 | <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/> | ||
35 | </attributes> | ||
36 | </asminfo> | ||
37 | |||
38 | <mkdir dir="../../../bin/Physics"/> | ||
39 | |||
40 | <csc target="library" output="../../../bin/Physics/PhysXplugin.dll" debug="${debug}" verbose="true" warninglevel="4"> | ||
41 | <references basedir="../../../bin" failonempty="true"> | ||
42 | <include name="System.dll" /> | ||
43 | <include name="System.Xml.dll" /> | ||
44 | <include name="PhysicsManager.dll" /> | ||
45 | </references> | ||
46 | <sources basedir="./"> | ||
47 | <include name="*.cs" /> | ||
48 | </sources> | ||
49 | </csc> | ||
50 | </target> | ||
51 | </project> | ||