diff options
author | Diva Canto | 2013-03-07 06:41:03 -0800 |
---|---|---|
committer | Diva Canto | 2013-03-07 06:41:03 -0800 |
commit | fdebee25db35174468e19d0f6ed8931797c1f000 (patch) | |
tree | 3d38c72fb40e2bf7a457343c1ad724b5c46e9dfd /OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs | |
parent | Fixed inconsistency in comments. Thanks Ai Austin. (diff) | |
parent | minor: remove some completely unused string local vars added recently in comm... (diff) | |
download | opensim-SC-fdebee25db35174468e19d0f6ed8931797c1f000.zip opensim-SC-fdebee25db35174468e19d0f6ed8931797c1f000.tar.gz opensim-SC-fdebee25db35174468e19d0f6ed8931797c1f000.tar.bz2 opensim-SC-fdebee25db35174468e19d0f6ed8931797c1f000.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs')
-rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs index c4b9117..0816b7b 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs | |||
@@ -102,6 +102,8 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
102 | 102 | ||
103 | public override float Simulate(float timeStep) | 103 | public override float Simulate(float timeStep) |
104 | { | 104 | { |
105 | // Console.WriteLine("Simulating"); | ||
106 | |||
105 | float fps = 0; | 107 | float fps = 0; |
106 | for (int i = 0; i < _actors.Count; ++i) | 108 | for (int i = 0; i < _actors.Count; ++i) |
107 | { | 109 | { |
@@ -109,8 +111,11 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
109 | Vector3 actorPosition = actor.Position; | 111 | Vector3 actorPosition = actor.Position; |
110 | Vector3 actorVelocity = actor.Velocity; | 112 | Vector3 actorVelocity = actor.Velocity; |
111 | 113 | ||
112 | actorPosition.X += actor.Velocity.X*timeStep; | 114 | // Console.WriteLine( |
113 | actorPosition.Y += actor.Velocity.Y*timeStep; | 115 | // "Processing actor {0}, starting pos {1}, starting vel {2}", i, actorPosition, actorVelocity); |
116 | |||
117 | actorPosition.X += actor.Velocity.X * timeStep; | ||
118 | actorPosition.Y += actor.Velocity.Y * timeStep; | ||
114 | 119 | ||
115 | if (actor.Position.Y < 0) | 120 | if (actor.Position.Y < 0) |
116 | { | 121 | { |