From f9ebdee1d249a1d8b5d0dac1787e1e40675d7784 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Mon, 9 Mar 2009 04:33:53 +0000
Subject: * Tweak llMoveToTarget per mantis 3265 * Add some comments to the
Wind Module * Add the BinBVH decoder/encoder as a scene object (to
encode/decode animations programmatically). * Add m_sitState for upcoming
code to improve sit results.
---
.../Region/CoreModules/World/Wind/WindModule.cs | 4 +-
OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs | 635 +++++++++++++++++++++
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 100 +++-
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 2 +-
4 files changed, 735 insertions(+), 6 deletions(-)
create mode 100644 OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index b761c13..a1149ea 100644
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -182,8 +182,8 @@ namespace OpenSim.Region.CoreModules
{
for (int x = 0; x < 16; x++)
{
- windSpeeds[y * 16 + x].X = (float)(rndnums.NextDouble() * 2d - 1d);
- windSpeeds[y * 16 + x].Y = (float)(rndnums.NextDouble() * 2d - 1d);
+ windSpeeds[y * 16 + x].X = (float)(rndnums.NextDouble() * 2d - 1d); // -1 to 1
+ windSpeeds[y * 16 + x].Y = (float)(rndnums.NextDouble() * 2d - 1d); // -1 to 1
}
}
}
diff --git a/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs b/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs
new file mode 100644
index 0000000..54f6d68
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs
@@ -0,0 +1,635 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.IO;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Framework.Scenes
+{
+ ///
+ /// Written to decode and encode a binary animation asset.
+ /// The SecondLife Client reads in a BVH file and converts
+ /// it to the format described here. This isn't
+ ///
+ public class BinBVHAnimation
+ {
+ ///
+ /// Rotation Keyframe count (used internally)
+ /// Don't use this, use the rotationkeys.Length on each joint
+ ///
+ private int rotationkeys;
+
+ ///
+ /// Position Keyframe count (used internally)
+ /// Don't use this, use the positionkeys.Length on each joint
+ ///
+ private int positionkeys;
+
+ public UInt16 unknown0; // Always 1
+ public UInt16 unknown1; // Always 0
+
+ ///
+ /// Animation Priority
+ ///
+ public int Priority;
+
+ ///
+ /// The animation length in seconds.
+ ///
+ public Single Length;
+
+ ///
+ /// Expression set in the client. Null if [None] is selected
+ ///
+ public string ExpressionName; // "" (null)
+
+ ///
+ /// The time in seconds to start the animation
+ ///
+ public Single InPoint;
+
+ ///
+ /// The time in seconds to end the animation
+ ///
+ public Single OutPoint;
+
+ ///
+ /// Loop the animation
+ ///
+ public bool Loop;
+
+ ///
+ /// Meta data. Ease in Seconds.
+ ///
+ public Single EaseInTime;
+
+ ///
+ /// Meta data. Ease out seconds.
+ ///
+ public Single EaseOutTime;
+
+ ///
+ /// Meta Data for the Hand Pose
+ ///
+ public uint HandPose;
+
+ ///
+ /// Number of joints defined in the animation
+ /// Don't use this.. use joints.Length
+ ///
+ private uint m_jointCount;
+
+
+ ///
+ /// Contains an array of joints
+ ///
+ public binBVHJoint[] Joints;
+
+
+ public byte[] ToBytes()
+ {
+ byte[] outputbytes = new byte[0];
+
+ BinaryWriter iostream = new BinaryWriter(new MemoryStream());
+ iostream.Write(BinBVHUtil.ES(Utils.UInt16ToBytes(unknown0)));
+ iostream.Write(BinBVHUtil.ES(Utils.UInt16ToBytes(unknown1)));
+ iostream.Write(BinBVHUtil.ES(Utils.IntToBytes(Priority)));
+ iostream.Write(BinBVHUtil.ES(Utils.FloatToBytes(Length)));
+ iostream.Write(BinBVHUtil.WriteNullTerminatedString(ExpressionName));
+ iostream.Write(BinBVHUtil.ES(Utils.FloatToBytes(InPoint)));
+ iostream.Write(BinBVHUtil.ES(Utils.FloatToBytes(OutPoint)));
+ iostream.Write(BinBVHUtil.ES(Utils.IntToBytes(Loop ? 1 : 0)));
+ iostream.Write(BinBVHUtil.ES(Utils.FloatToBytes(EaseInTime)));
+ iostream.Write(BinBVHUtil.ES(Utils.FloatToBytes(EaseOutTime)));
+ iostream.Write(BinBVHUtil.ES(Utils.UIntToBytes(HandPose)));
+ iostream.Write(BinBVHUtil.ES(Utils.UIntToBytes((uint)(Joints.Length))));
+
+ for (int i = 0; i < Joints.Length; i++)
+ {
+ Joints[i].WriteBytesToStream(iostream, InPoint, OutPoint);
+ }
+ iostream.Write(BinBVHUtil.ES(Utils.IntToBytes(0)));
+ MemoryStream ms = (MemoryStream)iostream.BaseStream;
+ outputbytes = ms.ToArray();
+ ms.Close();
+ iostream.Close();
+ return outputbytes;
+ }
+
+ public BinBVHAnimation()
+ {
+ rotationkeys = 0;
+ positionkeys = 0;
+ unknown0 = 1;
+ unknown1 = 0;
+ Priority = 1;
+ Length = 0;
+ ExpressionName = string.Empty;
+ InPoint = 0;
+ OutPoint = 0;
+ Loop = false;
+ EaseInTime = 0;
+ EaseOutTime = 0;
+ HandPose = 1;
+ m_jointCount = 0;
+
+ Joints = new binBVHJoint[1];
+ Joints[0] = new binBVHJoint();
+ Joints[0].Name = "mPelvis";
+ Joints[0].Priority = 7;
+ Joints[0].positionkeys = new binBVHJointKey[1];
+ Joints[0].rotationkeys = new binBVHJointKey[1];
+ Random rnd = new Random();
+
+ Joints[0].rotationkeys[0] = new binBVHJointKey();
+ Joints[0].rotationkeys[0].time = (0f);
+ Joints[0].rotationkeys[0].key_element.X = ((float)rnd.NextDouble() * 2 - 1);
+ Joints[0].rotationkeys[0].key_element.Y = ((float)rnd.NextDouble() * 2 - 1);
+ Joints[0].rotationkeys[0].key_element.Z = ((float)rnd.NextDouble() * 2 - 1);
+
+ Joints[0].positionkeys[0] = new binBVHJointKey();
+ Joints[0].positionkeys[0].time = (0f);
+ Joints[0].positionkeys[0].key_element.X = ((float)rnd.NextDouble() * 2 - 1);
+ Joints[0].positionkeys[0].key_element.Y = ((float)rnd.NextDouble() * 2 - 1);
+ Joints[0].positionkeys[0].key_element.Z = ((float)rnd.NextDouble() * 2 - 1);
+
+
+ }
+
+ public BinBVHAnimation(byte[] animationdata)
+ {
+ int i = 0;
+ if (!BitConverter.IsLittleEndian)
+ {
+ unknown0 = Utils.BytesToUInt16(BinBVHUtil.EndianSwap(animationdata,i,2)); i += 2; // Always 1
+ unknown1 = Utils.BytesToUInt16(BinBVHUtil.EndianSwap(animationdata, i, 2)); i += 2; // Always 0
+ Priority = Utils.BytesToInt(BinBVHUtil.EndianSwap(animationdata, i, 4)); i += 4;
+ Length = Utils.BytesToFloat(BinBVHUtil.EndianSwap(animationdata, i, 4), 0); i += 4;
+ }
+ else
+ {
+ unknown0 = Utils.BytesToUInt16(animationdata, i); i += 2; // Always 1
+ unknown1 = Utils.BytesToUInt16(animationdata, i); i += 2; // Always 0
+ Priority = Utils.BytesToInt(animationdata, i); i += 4;
+ Length = Utils.BytesToFloat(animationdata, i); i += 4;
+ }
+ ExpressionName = ReadBytesUntilNull(animationdata, ref i);
+ if (!BitConverter.IsLittleEndian)
+ {
+ InPoint = Utils.BytesToFloat(BinBVHUtil.EndianSwap(animationdata, i, 4), 0); i += 4;
+ OutPoint = Utils.BytesToFloat(BinBVHUtil.EndianSwap(animationdata, i, 4), 0); i += 4;
+ Loop = (Utils.BytesToInt(BinBVHUtil.EndianSwap(animationdata, i, 4)) != 0); i += 4;
+ EaseInTime = Utils.BytesToFloat(BinBVHUtil.EndianSwap(animationdata, i, 4), 0); i += 4;
+ EaseOutTime = Utils.BytesToFloat(BinBVHUtil.EndianSwap(animationdata, i, 4), 0); i += 4;
+ HandPose = Utils.BytesToUInt(BinBVHUtil.EndianSwap(animationdata, i, 4)); i += 4; // Handpose?
+
+ m_jointCount = Utils.BytesToUInt(animationdata, i); i += 4; // Get Joint count
+ }
+ else
+ {
+ InPoint = Utils.BytesToFloat(animationdata, i); i += 4;
+ OutPoint = Utils.BytesToFloat(animationdata, i); i += 4;
+ Loop = (Utils.BytesToInt(animationdata, i) != 0); i += 4;
+ EaseInTime = Utils.BytesToFloat(animationdata, i); i += 4;
+ EaseOutTime = Utils.BytesToFloat(animationdata, i); i += 4;
+ HandPose = Utils.BytesToUInt(animationdata, i); i += 4; // Handpose?
+
+ m_jointCount = Utils.BytesToUInt(animationdata, i); i += 4; // Get Joint count
+ }
+ Joints = new binBVHJoint[m_jointCount];
+
+ // deserialize the number of joints in the animation.
+ // Joints are variable length blocks of binary data consisting of joint data and keyframes
+ for (int iter = 0; iter < m_jointCount; iter++)
+ {
+ binBVHJoint joint = readJoint(animationdata, ref i);
+ Joints[iter] = joint;
+ }
+ }
+
+
+ ///
+ /// Variable length strings seem to be null terminated in the animation asset.. but..
+ /// use with caution, home grown.
+ /// advances the index.
+ ///
+ /// The animation asset byte array
+ /// The offset to start reading
+ /// a string
+ private static string ReadBytesUntilNull(byte[] data, ref int i)
+ {
+ char nterm = '\0'; // Null terminator
+ int endpos = i;
+ int startpos = i;
+
+ // Find the null character
+ for (int j = i; j < data.Length; j++)
+ {
+ char spot = Convert.ToChar(data[j]);
+ if (spot == nterm)
+ {
+ endpos = j;
+ break;
+ }
+ }
+
+ // if we got to the end, then it's a zero length string
+ if (i == endpos)
+ {
+ // advance the 1 null character
+ i++;
+ return string.Empty;
+ }
+ else
+ {
+ // We found the end of the string
+ // append the bytes from the beginning of the string to the end of the string
+ // advance i
+ byte[] interm = new byte[endpos-i];
+ for (; i
+ /// Read in a Joint from an animation asset byte array
+ /// Variable length Joint fields, yay!
+ /// Advances the index
+ ///
+ /// animation asset byte array
+ /// Byte Offset of the start of the joint
+ /// The Joint data serialized into the binBVHJoint structure
+ private binBVHJoint readJoint(byte[] data, ref int i)
+ {
+
+ binBVHJointKey[] positions;
+ binBVHJointKey[] rotations;
+
+ binBVHJoint pJoint = new binBVHJoint();
+
+ /*
+ 109
+ 84
+ 111
+ 114
+ 114
+ 111
+ 0 <--- Null terminator
+ */
+
+ pJoint.Name = ReadBytesUntilNull(data, ref i); // Joint name
+
+ /*
+ 2 <- Priority Revisited
+ 0
+ 0
+ 0
+ */
+
+ /*
+ 5 <-- 5 keyframes
+ 0
+ 0
+ 0
+ ... 5 Keyframe data blocks
+ */
+
+ /*
+ 2 <-- 2 keyframes
+ 0
+ 0
+ 0
+ .. 2 Keyframe data blocks
+ */
+ if (!BitConverter.IsLittleEndian)
+ {
+ pJoint.Priority = Utils.BytesToInt(BinBVHUtil.EndianSwap(data, i, 4)); i += 4; // Joint Priority override?
+ rotationkeys = Utils.BytesToInt(BinBVHUtil.EndianSwap(data, i, 4)); i += 4; // How many rotation keyframes
+ }
+ else
+ {
+ pJoint.Priority = Utils.BytesToInt(data, i); i += 4; // Joint Priority override?
+ rotationkeys = Utils.BytesToInt(data, i); i += 4; // How many rotation keyframes
+ }
+
+ // argh! floats into two bytes!.. bad bad bad bad
+ // After fighting with it for a while.. -1, to 1 seems to give the best results
+ rotations = readKeys(data, ref i, rotationkeys, -1f, 1f);
+
+
+ if (!BitConverter.IsLittleEndian)
+ {
+ positionkeys = Utils.BytesToInt(BinBVHUtil.EndianSwap(data, i, 4)); i += 4; // How many position keyframes
+ }
+ else
+ {
+ positionkeys = Utils.BytesToInt(data, i); i += 4; // How many position keyframes
+ }
+
+ // Read in position keyframes
+ // argh! more floats into two bytes!.. *head desk*
+ // After fighting with it for a while.. -5, to 5 seems to give the best results
+ positions = readKeys(data, ref i, positionkeys, -5f, 5f);
+
+ pJoint.rotationkeys = rotations;
+ pJoint.positionkeys = positions;
+
+ return pJoint;
+ }
+
+ ///
+ /// Read Keyframes of a certain type
+ /// advance i
+ ///
+ /// Animation Byte array
+ /// Offset in the Byte Array. Will be advanced
+ /// Number of Keyframes
+ /// Scaling Min to pass to the Uint16ToFloat method
+ /// Scaling Max to pass to the Uint16ToFloat method
+ ///
+ private binBVHJointKey[] readKeys(byte[] data, ref int i, int keycount, float min, float max)
+ {
+ float x;
+ float y;
+ float z;
+
+ /*
+ 0.o, Float values in Two bytes.. this is just wrong >:(
+ 17 255 <-- Time Code
+ 17 255 <-- Time Code
+ 255 255 <-- X
+ 127 127 <-- X
+ 255 255 <-- Y
+ 127 127 <-- Y
+ 213 213 <-- Z
+ 142 142 <---Z
+
+ */
+
+ binBVHJointKey[] m_keys = new binBVHJointKey[keycount];
+ for (int j = 0; j < keycount; j++)
+ {
+ binBVHJointKey pJKey = new binBVHJointKey();
+ if (!BitConverter.IsLittleEndian)
+ {
+ pJKey.time = Utils.UInt16ToFloat(BinBVHUtil.EndianSwap(data, i, 2), 0, InPoint, OutPoint); i += 2;
+ x = Utils.UInt16ToFloat(BinBVHUtil.EndianSwap(data, i, 2), 0, min, max); i += 2;
+ y = Utils.UInt16ToFloat(BinBVHUtil.EndianSwap(data, i, 2), 0, min, max); i += 2;
+ z = Utils.UInt16ToFloat(BinBVHUtil.EndianSwap(data, i, 2), 0, min, max); i += 2;
+ }
+ else
+ {
+ pJKey.time = Utils.UInt16ToFloat(data, i, InPoint, OutPoint); i += 2;
+ x = Utils.UInt16ToFloat(data, i, min, max); i += 2;
+ y = Utils.UInt16ToFloat(data, i, min, max); i += 2;
+ z = Utils.UInt16ToFloat(data, i, min, max); i += 2;
+ }
+ pJKey.key_element = new Vector3(x, y, z);
+ m_keys[j] = pJKey;
+ }
+ return m_keys;
+ }
+
+
+
+ }
+ ///
+ /// A Joint and it's associated meta data and keyframes
+ ///
+ public struct binBVHJoint
+ {
+ ///
+ /// Name of the Joint. Matches the avatar_skeleton.xml in client distros
+ ///
+ public string Name;
+
+ ///
+ /// Joint Animation Override? Was the same as the Priority in testing..
+ ///
+ public int Priority;
+
+ ///
+ /// Array of Rotation Keyframes in order from earliest to latest
+ ///
+ public binBVHJointKey[] rotationkeys;
+
+ ///
+ /// Array of Position Keyframes in order from earliest to latest
+ /// This seems to only be for the Pelvis?
+ ///
+ public binBVHJointKey[] positionkeys;
+
+
+
+ public void WriteBytesToStream(BinaryWriter iostream, float InPoint, float OutPoint)
+ {
+ iostream.Write(BinBVHUtil.WriteNullTerminatedString(Name));
+ iostream.Write(BinBVHUtil.ES(Utils.IntToBytes(Priority)));
+ iostream.Write(BinBVHUtil.ES(Utils.IntToBytes(rotationkeys.Length)));
+ for (int i=0;i
+ /// A Joint Keyframe. This is either a position or a rotation.
+ ///
+ public struct binBVHJointKey
+ {
+ // Time in seconds for this keyframe.
+ public float time;
+
+ ///
+ /// Either a Vector3 position or a Vector3 Euler rotation
+ ///
+ public Vector3 key_element;
+
+ public void WriteBytesToStream(BinaryWriter iostream, float InPoint, float OutPoint, float min, float max)
+ {
+ iostream.Write(BinBVHUtil.ES(Utils.UInt16ToBytes(BinBVHUtil.FloatToUInt16(time, InPoint, OutPoint))));
+ iostream.Write(BinBVHUtil.ES(Utils.UInt16ToBytes(BinBVHUtil.FloatToUInt16(key_element.X, min, max))));
+ iostream.Write(BinBVHUtil.ES(Utils.UInt16ToBytes(BinBVHUtil.FloatToUInt16(key_element.Y, min, max))));
+ iostream.Write(BinBVHUtil.ES(Utils.UInt16ToBytes(BinBVHUtil.FloatToUInt16(key_element.Z, min, max))));
+ }
+ }
+
+ ///
+ /// Poses set in the animation metadata for the hands.
+ ///
+ public enum HandPose : uint
+ {
+ Spread = 0,
+ Relaxed = 1,
+ Point_Both = 2,
+ Fist = 3,
+ Relaxed_Left = 4,
+ Point_Left = 5,
+ Fist_Left = 6,
+ Relaxed_Right = 7,
+ Point_Right = 8,
+ Fist_Right = 9,
+ Salute_Right = 10,
+ Typing = 11,
+ Peace_Right = 12
+ }
+ public static class BinBVHUtil
+ {
+ public const float ONE_OVER_U16_MAX = 1.0f / UInt16.MaxValue;
+
+ public static UInt16 FloatToUInt16(float val, float lower, float upper)
+ {
+ UInt16 uival = 0;
+ //m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue
+ //0-1
+
+ float difference = upper - lower;
+ // we're trying to get a zero lower and modify all values equally so we get a percentage position
+ if (lower > 0)
+ {
+ upper -= lower;
+ val = val - lower;
+
+ // start with 500 upper and 200 lower.. subtract 200 from the upper and the value
+ }
+ else //if (lower < 0 && upper > 0)
+ {
+ // double negative, 0 minus negative 5 is 5.
+ upper += 0 - lower;
+ lower += 0 - lower;
+ val += 0 - lower;
+ }
+
+ if (upper == 0)
+ val = 0;
+ else
+ {
+ val /= upper;
+ }
+
+ uival = (UInt16)(val * UInt16.MaxValue);
+
+ return uival;
+ }
+
+
+ ///
+ /// Endian Swap
+ /// Swaps endianness if necessary
+ ///
+ /// Input array
+ ///
+ public static byte[] ES(byte[] arr)
+ {
+ if (!BitConverter.IsLittleEndian)
+ Array.Reverse(arr);
+ return arr;
+ }
+ public static byte[] EndianSwap(byte[] arr, int offset, int len)
+ {
+ byte[] bendian = new byte[offset + len];
+ Buffer.BlockCopy(arr, offset, bendian, 0, len);
+ Array.Reverse(bendian);
+ return bendian;
+ }
+
+ public static byte[] WriteNullTerminatedString(string str)
+ {
+ byte[] output = new byte[str.Length + 1];
+ Char[] chr = str.ToCharArray();
+ int i = 0;
+ for (i = 0; i < chr.Length; i++)
+ {
+ output[i] = Convert.ToByte(chr[i]);
+
+ }
+
+ output[i] = Convert.ToByte('\0');
+ return output;
+ }
+
+ }
+}
+/*
+switch (jointname)
+ {
+ case "mPelvis":
+ case "mTorso":
+ case "mNeck":
+ case "mHead":
+ case "mChest":
+ case "mHipLeft":
+ case "mHipRight":
+ case "mKneeLeft":
+ case "mKneeRight":
+ // XYZ->ZXY
+ t = x;
+ x = y;
+ y = t;
+ break;
+ case "mCollarLeft":
+ case "mCollarRight":
+ case "mElbowLeft":
+ case "mElbowRight":
+ // YZX ->ZXY
+ t = z;
+ z = x;
+ x = y;
+ y = t;
+ break;
+ case "mWristLeft":
+ case "mWristRight":
+ case "mShoulderLeft":
+ case "mShoulderRight":
+ // ZYX->ZXY
+ t = y;
+ y = z;
+ z = t;
+
+ break;
+ case "mAnkleLeft":
+ case "mAnkleRight":
+ // XYZ ->ZXY
+ t = x;
+ x = z;
+ z = y;
+ y = t;
+ break;
+ }
+*/
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5160e73..5831ff4 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -119,6 +119,8 @@ namespace OpenSim.Region.Framework.Scenes
private int m_perfMonMS = 0;
+ private bool m_sitStatus = false;
+
private bool m_setAlwaysRun = false;
private Quaternion m_bodyRot= Quaternion.Identity;
@@ -567,7 +569,8 @@ namespace OpenSim.Region.Framework.Scenes
m_firstname = m_controllingClient.FirstName;
m_lastname = m_controllingClient.LastName;
m_name = String.Format("{0} {1}", m_firstname, m_lastname);
-
+ if (DateTime.Now.Month==4&&DateTime.Now.Day==1)
+ m_sitStatus = true;
m_scene = world;
m_uuid = client.AgentId;
m_regionInfo = reginfo;
@@ -600,11 +603,15 @@ namespace OpenSim.Region.Framework.Scenes
: this(client, world, reginfo)
{
m_appearance = new AvatarAppearance(m_uuid, wearables, visualParams);
+ if (DateTime.Now.Month==4&&DateTime.Now.Day==1)
+ m_sitStatus = true;
}
public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, AvatarAppearance appearance)
: this(client, world, reginfo)
{
+ if (DateTime.Now.Month==4&&DateTime.Now.Day==1)
+ m_sitStatus = true;
m_appearance = appearance;
}
@@ -1144,8 +1151,17 @@ namespace OpenSim.Region.Framework.Scenes
{
StandUp();
}
+
+
+
m_mouseLook = (flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0;
+
+
+
m_leftButtonDown = (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN) != 0;
+
+
+
lock (scriptedcontrols)
{
if (scriptedcontrols.Count > 0)
@@ -1788,7 +1804,70 @@ namespace OpenSim.Region.Framework.Scenes
PhysicsActor.SetAlwaysRun = SetAlwaysRun;
}
}
-
+ public BinBVHAnimation GenerateRandomAnimation()
+ {
+ int rnditerations = 3;
+ BinBVHAnimation anim = new BinBVHAnimation();
+ List parts = new List();
+ parts.Add("mPelvis");parts.Add("mHead");parts.Add("mTorso");
+ parts.Add("mHipLeft");parts.Add("mHipRight");parts.Add("mHipLeft");parts.Add("mKneeLeft");
+ parts.Add("mKneeRight");parts.Add("mCollarLeft");parts.Add("mCollarRight");parts.Add("mNeck");
+ parts.Add("mElbowLeft");parts.Add("mElbowRight");parts.Add("mWristLeft");parts.Add("mWristRight");
+ parts.Add("mShoulderLeft");parts.Add("mShoulderRight");parts.Add("mAnkleLeft");parts.Add("mAnkleRight");
+ parts.Add("mEyeRight");parts.Add("mChest");parts.Add("mToeLeft");parts.Add("mToeRight");
+ parts.Add("mFootLeft");parts.Add("mFootRight");parts.Add("mEyeLeft");
+ anim.HandPose = 1;
+ anim.InPoint = 0;
+ anim.OutPoint = (rnditerations * .10f);
+ anim.Priority = 7;
+ anim.Loop = false;
+ anim.Length = (rnditerations * .10f);
+ anim.ExpressionName = "afraid";
+ anim.EaseInTime = 0;
+ anim.EaseOutTime = 0;
+
+ string[] strjoints = parts.ToArray();
+ anim.Joints = new binBVHJoint[strjoints.Length];
+ for (int j = 0; j < strjoints.Length; j++)
+ {
+ anim.Joints[j] = new binBVHJoint();
+ anim.Joints[j].Name = strjoints[j];
+ anim.Joints[j].Priority = 7;
+ anim.Joints[j].positionkeys = new binBVHJointKey[rnditerations];
+ anim.Joints[j].rotationkeys = new binBVHJointKey[rnditerations];
+ Random rnd = new Random();
+ for (int i = 0; i < rnditerations; i++)
+ {
+ anim.Joints[j].rotationkeys[i] = new binBVHJointKey();
+ anim.Joints[j].rotationkeys[i].time = (i*.10f);
+ anim.Joints[j].rotationkeys[i].key_element.X = ((float) rnd.NextDouble()*2 - 1);
+ anim.Joints[j].rotationkeys[i].key_element.Y = ((float) rnd.NextDouble()*2 - 1);
+ anim.Joints[j].rotationkeys[i].key_element.Z = ((float) rnd.NextDouble()*2 - 1);
+ anim.Joints[j].positionkeys[i] = new binBVHJointKey();
+ anim.Joints[j].positionkeys[i].time = (i*.10f);
+ anim.Joints[j].positionkeys[i].key_element.X = 0;
+ anim.Joints[j].positionkeys[i].key_element.Y = 0;
+ anim.Joints[j].positionkeys[i].key_element.Z = 0;
+ }
+ }
+
+
+ AssetBase Animasset = new AssetBase();
+ Animasset.Data = anim.ToBytes();
+ Animasset.Temporary = true;
+ Animasset.Local = true;
+ Animasset.FullID = UUID.Random();
+ Animasset.ID = Animasset.FullID.ToString();
+ Animasset.Name = "Random Animation";
+ Animasset.Type = (sbyte)AssetType.Animation;
+ Animasset.Description = "dance";
+ //BinBVHAnimation bbvhanim = new BinBVHAnimation(Animasset.Data);
+
+
+ m_scene.CommsManager.AssetCache.AddAsset(Animasset);
+ AddAnimation(Animasset.FullID, UUID);
+ return anim;
+ }
public void AddAnimation(UUID animID, UUID objectID)
{
if (m_isChildAgent)
@@ -2159,6 +2238,8 @@ namespace OpenSim.Region.Framework.Scenes
remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid,
LocalId, m_pos, m_appearance.Texture.ToBytes(),
m_parentID, rot);
+ if (m_sitStatus)
+ GenerateRandomAnimation();
m_scene.AddAgentUpdates(1);
}
@@ -2175,6 +2256,8 @@ namespace OpenSim.Region.Framework.Scenes
// only send if this is the root (children are only "listening posts" in a foreign region)
if (!IsChildAgent)
{
+ if (m_sitStatus)
+ GenerateRandomAnimation();
SendFullUpdateToOtherClient(avatar);
}
@@ -2182,8 +2265,11 @@ namespace OpenSim.Region.Framework.Scenes
{
if (!avatar.IsChildAgent)
{
+ m_log.Debug(DateTime.Now.ToString());
avatar.SendFullUpdateToOtherClient(this);
avatar.SendAppearanceToOtherAgent(this);
+ if (m_sitStatus)
+ GenerateRandomAnimation();
avatar.SendAnimPackToClient(this.ControllingClient);
}
}
@@ -2198,6 +2284,8 @@ namespace OpenSim.Region.Framework.Scenes
{
m_perfMonMS = System.Environment.TickCount;
+ if (m_sitStatus)
+ GenerateRandomAnimation();
// only send update from root agents to other clients; children are only "listening posts"
List avatars = m_scene.GetAvatars();
foreach (ScenePresence avatar in avatars)
@@ -2421,6 +2509,9 @@ namespace OpenSim.Region.Framework.Scenes
m_LastChildAgentUpdatePosition.X = AbsolutePosition.X;
m_LastChildAgentUpdatePosition.Y = AbsolutePosition.Y;
m_LastChildAgentUpdatePosition.Z = AbsolutePosition.Z;
+
+ if (m_sitStatus)
+ GenerateRandomAnimation();
}
}
@@ -2832,6 +2923,7 @@ namespace OpenSim.Region.Framework.Scenes
{
Primitive.TextureEntry textu = AvatarAppearance.GetDefaultTexture();
DefaultTexture = textu.ToBytes();
+
}
public class NewForce
@@ -2970,7 +3062,9 @@ namespace OpenSim.Region.Framework.Scenes
{
Primitive.TextureEntry textu = AvatarAppearance.GetDefaultTexture();
DefaultTexture = textu.ToBytes();
- }
+ }
+ if (DateTime.Now.Month==4&&DateTime.Now.Day==1)
+ m_sitStatus = true;
}
public void AddAttachment(SceneObjectGroup gobj)
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 3291b79..2046ff9 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1510,7 +1510,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// If the PID Controller isn't active then we set our force
// calculating base velocity to the current position
- if ((m_PIDTau < 1))
+ if ((m_PIDTau < 1) && (m_PIDTau != 0))
{
//PID_G = PID_G / m_PIDTau;
m_PIDTau = 1;
--
cgit v1.1