OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Applying Danx0r's BasicPhysics update.

Sugilite
Adam Frisby 2007-06-29 18:37:26 +00:00
parent 6b3777d3db
commit cc1c4c034c
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
View File

@ -101,22 +101,29 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
{ {
foreach (BasicActor actor in _actors) foreach (BasicActor actor in _actors)
{ {
actor.Position.X = actor.Position.X + (actor.Velocity.X * timeStep);
actor.Position.Y = actor.Position.Y + (actor.Velocity.Y * timeStep);
actor.Position.Z = actor.Position.Z + (actor.Velocity.Z * timeStep);
/*if(actor.Flying)
{
actor.Position.Z = actor.Position.Z + (actor.Velocity.Z * timeStep);
}
else
{
actor.Position.Z = actor.Position.Z + ((-9.8f + actor.Velocity.Z) * timeStep);
}
if(actor.Position.Z < (_heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X]+1))
{*/
if ((actor.Position.Y > 0 && actor.Position.Y < 256) && (actor.Position.X > 0 && actor.Position.X < 256)) if ((actor.Position.Y > 0 && actor.Position.Y < 256) && (actor.Position.X > 0 && actor.Position.X < 256))
{ {
actor.Position.Z = _heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X] + 1; float height = _heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X] + 1.2f;
actor.Position.X = actor.Position.X + (actor.Velocity.X * timeStep);
actor.Position.Y = actor.Position.Y + (actor.Velocity.Y * timeStep);
if (actor.Flying)
{
if (actor.Position.Z + (actor.Velocity.Z * timeStep) <
_heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X] + 2)
{
actor.Position.Z = height;
actor.Velocity.Z = 0;
}
else
{
actor.Position.Z = actor.Position.Z + (actor.Velocity.Z * timeStep);
}
}
else
{
actor.Position.Z = height;
actor.Velocity.Z = 0;
}
} }
else else
{ {
@ -167,7 +174,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
actor.Position.Y = 255; actor.Position.Y = 255;
actor.Velocity.X = 0; actor.Velocity.X = 0;
}*/ }*/
} }
} }
public override void GetResults() public override void GetResults()
@ -211,7 +218,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
{ {
get get
{ {
return false; return flying;
} }
set set
{ {