diff options
Diffstat (limited to '')
4 files changed, 29 insertions, 21 deletions
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/AssemblyInfo.cs index 1765ae0..68d6eb9 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/AssemblyInfo.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/AssemblyInfo.cs | |||
@@ -56,7 +56,7 @@ using Mono.Addins; | |||
56 | // You can specify all values by your own or you can build default build and revision | 56 | // You can specify all values by your own or you can build default build and revision |
57 | // numbers with the '*' character (the default): | 57 | // numbers with the '*' character (the default): |
58 | 58 | ||
59 | [assembly : AssemblyVersion("0.8.2.*")] | 59 | [assembly : AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)] |
60 | 60 | ||
61 | [assembly: Addin("OpenSim.Region.PhysicsModule.BasicPhysics", OpenSim.VersionInfo.VersionNumber)] | 61 | [assembly: Addin("OpenSim.Region.PhysicsModule.BasicPhysics", OpenSim.VersionInfo.VersionNumber)] |
62 | [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] | 62 | [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] |
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs index e7b30ba..67d9207 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs | |||
@@ -211,7 +211,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
211 | { | 211 | { |
212 | } | 212 | } |
213 | 213 | ||
214 | public override void LockAngularMotion(Vector3 axis) | 214 | public override void LockAngularMotion(byte axislocks) |
215 | { | 215 | { |
216 | } | 216 | } |
217 | 217 | ||
@@ -254,6 +254,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
254 | 254 | ||
255 | public override bool PIDHoverActive | 255 | public override bool PIDHoverActive |
256 | { | 256 | { |
257 | get { return false; } | ||
257 | set { return; } | 258 | set { return; } |
258 | } | 259 | } |
259 | 260 | ||
@@ -267,23 +268,23 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
267 | set { return; } | 268 | set { return; } |
268 | } | 269 | } |
269 | 270 | ||
270 | public override Quaternion APIDTarget | 271 | public override Quaternion APIDTarget |
271 | { | 272 | { |
272 | set { return; } | 273 | set { return; } |
273 | } | 274 | } |
274 | 275 | ||
275 | public override bool APIDActive | 276 | public override bool APIDActive |
276 | { | 277 | { |
277 | set { return; } | 278 | set { return; } |
278 | } | 279 | } |
279 | 280 | ||
280 | public override float APIDStrength | 281 | public override float APIDStrength |
281 | { | 282 | { |
282 | set { return; } | 283 | set { return; } |
283 | } | 284 | } |
284 | 285 | ||
285 | public override float APIDDamping | 286 | public override float APIDDamping |
286 | { | 287 | { |
287 | set { return; } | 288 | set { return; } |
288 | } | 289 | } |
289 | 290 | ||
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs index 5383f1b..58c2581 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs | |||
@@ -224,7 +224,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
224 | { | 224 | { |
225 | } | 225 | } |
226 | 226 | ||
227 | public override void LockAngularMotion(Vector3 axis) | 227 | public override void LockAngularMotion(byte axislocks) |
228 | { | 228 | { |
229 | } | 229 | } |
230 | 230 | ||
@@ -267,6 +267,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
267 | 267 | ||
268 | public override bool PIDHoverActive | 268 | public override bool PIDHoverActive |
269 | { | 269 | { |
270 | get { return false; } | ||
270 | set { return; } | 271 | set { return; } |
271 | } | 272 | } |
272 | 273 | ||
@@ -280,23 +281,23 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
280 | set { return; } | 281 | set { return; } |
281 | } | 282 | } |
282 | 283 | ||
283 | public override Quaternion APIDTarget | 284 | public override Quaternion APIDTarget |
284 | { | 285 | { |
285 | set { return; } | 286 | set { return; } |
286 | } | 287 | } |
287 | 288 | ||
288 | public override bool APIDActive | 289 | public override bool APIDActive |
289 | { | 290 | { |
290 | set { return; } | 291 | set { return; } |
291 | } | 292 | } |
292 | 293 | ||
293 | public override float APIDStrength | 294 | public override float APIDStrength |
294 | { | 295 | { |
295 | set { return; } | 296 | set { return; } |
296 | } | 297 | } |
297 | 298 | ||
298 | public override float APIDDamping | 299 | public override float APIDDamping |
299 | { | 300 | { |
300 | set { return; } | 301 | set { return; } |
301 | } | 302 | } |
302 | 303 | ||
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs index 20b337a..29685da 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs | |||
@@ -61,6 +61,11 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
61 | get { return "basicphysics"; } | 61 | get { return "basicphysics"; } |
62 | } | 62 | } |
63 | 63 | ||
64 | public string Version | ||
65 | { | ||
66 | get { return "1.0"; } | ||
67 | } | ||
68 | |||
64 | public Type ReplaceableInterface | 69 | public Type ReplaceableInterface |
65 | { | 70 | { |
66 | get { return null; } | 71 | get { return null; } |
@@ -90,6 +95,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
90 | 95 | ||
91 | EngineType = Name; | 96 | EngineType = Name; |
92 | PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName; | 97 | PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName; |
98 | EngineName = Name + " " + Version; | ||
93 | 99 | ||
94 | scene.RegisterModuleInterface<PhysicsScene>(this); | 100 | scene.RegisterModuleInterface<PhysicsScene>(this); |
95 | m_regionExtent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ); | 101 | m_regionExtent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ); |
@@ -157,7 +163,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
157 | { | 163 | { |
158 | // Console.WriteLine("Simulating"); | 164 | // Console.WriteLine("Simulating"); |
159 | 165 | ||
160 | float fps = 0; | 166 | // float fps = 0; |
161 | for (int i = 0; i < _actors.Count; ++i) | 167 | for (int i = 0; i < _actors.Count; ++i) |
162 | { | 168 | { |
163 | BasicActor actor = _actors[i]; | 169 | BasicActor actor = _actors[i]; |
@@ -220,7 +226,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
220 | actor.Velocity = actorVelocity; | 226 | actor.Velocity = actorVelocity; |
221 | } | 227 | } |
222 | 228 | ||
223 | return fps; | 229 | return 1.0f; |
224 | } | 230 | } |
225 | 231 | ||
226 | public override void GetResults() | 232 | public override void GetResults() |