ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

mantis 8634: add osSetSitActiveRange(float range) , osSetStandTarget(vector feetAproxPosition) and respective get functions. range <0 disables sits on the prim, = 0 uses region default,feetAproxPosition is in prim local frame. <0,0,0> disables it. Still no persistance. feedback required!

Browse Source
This commit is contained in:
UbitUmarov
2020-01-22 18:23:35 +00:00
parent 8db60ba3aa
commit 7adaede14a
6 changed files with 119 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -1257,6 +1257,9 @@ namespace OpenSim.Region.Framework.Scenes
set { m_sitTargetOrientation = value; }
}
public float SitActiveRange { get; set;}
public Vector3 StandOffset { get; set;}
public bool Stopped
{
get {

67
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -3262,21 +3262,52 @@ namespace OpenSim.Region.Framework.Scenes
standRotation = standRotation * m_bodyRot;
m_bodyRot = standRotation;
Quaternion standRotationZ = new Quaternion(0,0,standRotation.Z,standRotation.W);
float t = standRotationZ.W * standRotationZ.W + standRotationZ.Z * standRotationZ.Z;
if (t > 0)
Quaternion standRotationZ;
Vector3 adjustmentForSitPose = part.StandOffset;
if (adjustmentForSitPose.X == 0 &&
adjustmentForSitPose.Y == 0 &&
adjustmentForSitPose.Z == 0)
{
t = 1.0f / (float)Math.Sqrt(t);
standRotationZ.W *= t;
standRotationZ.Z *= t;
standRotationZ = new Quaternion(0, 0, standRotation.Z, standRotation.W);
float t = standRotationZ.W * standRotationZ.W + standRotationZ.Z * standRotationZ.Z;
if (t > 0)
{
t = 1.0f / (float)Math.Sqrt(t);
standRotationZ.W *= t;
standRotationZ.Z *= t;
}
else
{
standRotationZ.W = 1.0f;
standRotationZ.Z = 0f;
}
adjustmentForSitPose = new Vector3(0.65f, 0, m_sitAvatarHeight * 0.5f + .1f) * standRotationZ;
}
else
{
standRotationZ.W = 1.0f;
standRotationZ.Z = 0f;
}
sitWorldPosition = part.GetWorldPosition();
Vector3 adjustmentForSitPose = new Vector3(0.65f, 0, m_sitAvatarHeight * 0.5f + .1f) * standRotationZ;
standRotation = part.GetWorldRotation();
standRotationZ = new Quaternion(0, 0, standRotation.Z, standRotation.W);
float t = standRotationZ.W * standRotationZ.W + standRotationZ.Z * standRotationZ.Z;
if (t > 0)
{
t = 1.0f / (float)Math.Sqrt(t);
standRotationZ.W *= t;
standRotationZ.Z *= t;
}
else
{
standRotationZ.W = 1.0f;
standRotationZ.Z = 0f;
}
adjustmentForSitPose *= standRotationZ;
if (Appearance != null && Appearance.AvatarHeight > 0)
adjustmentForSitPose.Z += 0.5f * Appearance.AvatarHeight + .1f;
else
adjustmentForSitPose.Z += .9f;
}
m_pos = sitWorldPosition + adjustmentForSitPose;
}
@@ -3325,7 +3356,7 @@ namespace OpenSim.Region.Framework.Scenes
//look for prims with explicit sit targets that are available
foreach (SceneObjectPart part in partArray)
{
if (part.IsSitTargetSet && part.SitTargetAvatar == UUID.Zero)
if (part.IsSitTargetSet && part.SitTargetAvatar == UUID.Zero && part.SitActiveRange > 0)
{
//switch the target to this prim
return part;
@@ -3346,6 +3377,17 @@ namespace OpenSim.Region.Framework.Scenes
if (part == null)
return;
float range = part.SitActiveRange;
if (range < 0)
return;
Vector3 pos = part.AbsolutePosition + offset;
if (range > 1e-5f)
{
if (Vector3.DistanceSquared(AbsolutePosition, pos) > range * range)
return;
}
if (PhysicsActor != null)
m_sitAvatarHeight = PhysicsActor.Size.Z * 0.5f;
@@ -3359,9 +3401,6 @@ namespace OpenSim.Region.Framework.Scenes
if (PhysicsSit(part,offset)) // physics engine
return;
Vector3 pos = part.AbsolutePosition + offset;
if (Vector3.DistanceSquared(AbsolutePosition, pos) > 100)
return;
AbsolutePosition = pos + new Vector3(0.0f, 0.0f, m_sitAvatarHeight);
}