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

Added Fly animation

tourmaline
MW 2007-03-23 18:54:42 +00:00
parent 7eeb6d1a10
commit 0e6ded8714
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim.RegionServer/world/Avatar.cs
View File

@ -274,10 +274,23 @@ namespace OpenSim.world
{ {
if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_FLY) != 0) if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_FLY) != 0)
{ {
if (this._physActor.Flying == false)
{
this.current_anim = Animations.AnimsLLUUID["ANIM_AGENT_FLY"];
this.anim_seq = 1;
this.SendAnimPack();
}
this._physActor.Flying = true; this._physActor.Flying = true;
} }
else else
{ {
if (this._physActor.Flying == true)
{
this.current_anim = Animations.AnimsLLUUID["ANIM_AGENT_STAND"];
this.anim_seq = 1;
this.SendAnimPack();
}
this._physActor.Flying = false; this._physActor.Flying = false;
} }
if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_AT_POS) != 0) if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_AT_POS) != 0)
@ -286,7 +299,7 @@ namespace OpenSim.world
if (((movementflag & 1) == 0) || (q != this.bodyRot)) if (((movementflag & 1) == 0) || (q != this.bodyRot))
{ {
if ((movementflag & 1) == 0) if (((movementflag & 1) == 0) && (!this._physActor.Flying))
{ {
this.current_anim = Animations.AnimsLLUUID["ANIM_AGENT_WALK"]; this.current_anim = Animations.AnimsLLUUID["ANIM_AGENT_WALK"];
this.anim_seq = 1; this.anim_seq = 1;
@ -395,10 +408,14 @@ namespace OpenSim.world
this.forcesList.Add(newVelocity); this.forcesList.Add(newVelocity);
movementflag = 0; movementflag = 0;
// We're standing still, so make it show! // We're standing still, so make it show!
this.current_anim = Animations.AnimsLLUUID["ANIM_AGENT_STAND"]; if (this._physActor.Flying == false)
this.anim_seq = 1; {
this.SendAnimPack(); this.current_anim = Animations.AnimsLLUUID["ANIM_AGENT_STAND"];
this.anim_seq = 1;
this.SendAnimPack();
}
this.movementflag = 16; this.movementflag = 16;
} }
} }
} }

BIN
bin/PhysX-wrapper.dll
View File

Binary file not shown.