From 0e6ded8714007d173c28eefdc510f4c460928345 Mon Sep 17 00:00:00 2001 From: MW Date: Fri, 23 Mar 2007 18:54:42 +0000 Subject: [PATCH] Added Fly animation --- OpenSim.RegionServer/world/Avatar.cs | 25 +++++++++++++++++++++---- bin/PhysX-wrapper.dll | Bin 57344 -> 57344 bytes 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim.RegionServer/world/Avatar.cs index 792e2ff008..c8a4539cd9 100644 --- a/OpenSim.RegionServer/world/Avatar.cs +++ b/OpenSim.RegionServer/world/Avatar.cs @@ -274,10 +274,23 @@ namespace OpenSim.world { 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; + } else { + if (this._physActor.Flying == true) + { + this.current_anim = Animations.AnimsLLUUID["ANIM_AGENT_STAND"]; + this.anim_seq = 1; + this.SendAnimPack(); + } this._physActor.Flying = false; } 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) + if (((movementflag & 1) == 0) && (!this._physActor.Flying)) { this.current_anim = Animations.AnimsLLUUID["ANIM_AGENT_WALK"]; this.anim_seq = 1; @@ -395,10 +408,14 @@ namespace OpenSim.world this.forcesList.Add(newVelocity); movementflag = 0; // We're standing still, so make it show! - this.current_anim = Animations.AnimsLLUUID["ANIM_AGENT_STAND"]; - this.anim_seq = 1; - this.SendAnimPack(); + if (this._physActor.Flying == false) + { + this.current_anim = Animations.AnimsLLUUID["ANIM_AGENT_STAND"]; + this.anim_seq = 1; + this.SendAnimPack(); + } this.movementflag = 16; + } } } diff --git a/bin/PhysX-wrapper.dll b/bin/PhysX-wrapper.dll index 594bd891b381bfc03b5869e7758d3ea3e1e9311d..d7a4002d4af6d3debfad487ffe06a1d813d15a8e 100644 GIT binary patch delta 5400 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 rJ`Zba6{qLdzx{`7lvb+bSYa9x2yE5wiSH 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