Merge branch 'master' into careminster
commit
0ae861d7d7
|
@ -183,6 +183,14 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
public event ScriptNotAtTargetEvent OnScriptNotAtTargetEvent;
|
public event ScriptNotAtTargetEvent OnScriptNotAtTargetEvent;
|
||||||
|
|
||||||
|
public delegate void ScriptAtRotTargetEvent(uint localID, uint handle, Quaternion targetrot, Quaternion atrot);
|
||||||
|
|
||||||
|
public event ScriptAtRotTargetEvent OnScriptAtRotTargetEvent;
|
||||||
|
|
||||||
|
public delegate void ScriptNotAtRotTargetEvent(uint localID);
|
||||||
|
|
||||||
|
public event ScriptNotAtRotTargetEvent OnScriptNotAtRotTargetEvent;
|
||||||
|
|
||||||
public delegate void ScriptColliding(uint localID, ColliderArgs colliders);
|
public delegate void ScriptColliding(uint localID, ColliderArgs colliders);
|
||||||
|
|
||||||
public event ScriptColliding OnScriptColliderStart;
|
public event ScriptColliding OnScriptColliderStart;
|
||||||
|
@ -388,6 +396,8 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
private ScriptChangedEvent handlerScriptChangedEvent = null; //OnScriptChangedEvent;
|
private ScriptChangedEvent handlerScriptChangedEvent = null; //OnScriptChangedEvent;
|
||||||
private ScriptAtTargetEvent handlerScriptAtTargetEvent = null;
|
private ScriptAtTargetEvent handlerScriptAtTargetEvent = null;
|
||||||
private ScriptNotAtTargetEvent handlerScriptNotAtTargetEvent = null;
|
private ScriptNotAtTargetEvent handlerScriptNotAtTargetEvent = null;
|
||||||
|
private ScriptAtRotTargetEvent handlerScriptAtRotTargetEvent = null;
|
||||||
|
private ScriptNotAtRotTargetEvent handlerScriptNotAtRotTargetEvent = null;
|
||||||
private ClientMovement handlerClientMovement = null; //OnClientMovement;
|
private ClientMovement handlerClientMovement = null; //OnClientMovement;
|
||||||
private OnPermissionErrorDelegate handlerPermissionError = null; //OnPermissionError;
|
private OnPermissionErrorDelegate handlerPermissionError = null; //OnPermissionError;
|
||||||
private OnPluginConsoleDelegate handlerPluginConsole = null; //OnPluginConsole;
|
private OnPluginConsoleDelegate handlerPluginConsole = null; //OnPluginConsole;
|
||||||
|
@ -875,6 +885,24 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void TriggerAtRotTargetEvent(uint localID, uint handle, Quaternion targetrot, Quaternion currentrot)
|
||||||
|
{
|
||||||
|
handlerScriptAtRotTargetEvent = OnScriptAtRotTargetEvent;
|
||||||
|
if (handlerScriptAtRotTargetEvent != null)
|
||||||
|
{
|
||||||
|
handlerScriptAtRotTargetEvent(localID, handle, targetrot, currentrot);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void TriggerNotAtRotTargetEvent(uint localID)
|
||||||
|
{
|
||||||
|
handlerScriptNotAtRotTargetEvent = OnScriptNotAtRotTargetEvent;
|
||||||
|
if (handlerScriptNotAtRotTargetEvent != null)
|
||||||
|
{
|
||||||
|
handlerScriptNotAtRotTargetEvent(localID);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void TriggerRequestChangeWaterHeight(float height)
|
public void TriggerRequestChangeWaterHeight(float height)
|
||||||
{
|
{
|
||||||
handlerRequestChangeWaterHeight = OnRequestChangeWaterHeight;
|
handlerRequestChangeWaterHeight = OnRequestChangeWaterHeight;
|
||||||
|
|
|
@ -57,6 +57,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
land_collision_end = 4096,
|
land_collision_end = 4096,
|
||||||
land_collision_start = 8192,
|
land_collision_start = 8192,
|
||||||
at_target = 16384,
|
at_target = 16384,
|
||||||
|
at_rot_target = 16777216,
|
||||||
listen = 32768,
|
listen = 32768,
|
||||||
money = 65536,
|
money = 65536,
|
||||||
moving_end = 131072,
|
moving_end = 131072,
|
||||||
|
@ -81,6 +82,13 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
public uint handle;
|
public uint handle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct scriptRotTarget
|
||||||
|
{
|
||||||
|
public Quaternion targetRot;
|
||||||
|
public float tolerance;
|
||||||
|
public uint handle;
|
||||||
|
}
|
||||||
|
|
||||||
public delegate void PrimCountTaintedDelegate();
|
public delegate void PrimCountTaintedDelegate();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -232,10 +240,14 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
// private Dictionary<UUID, scriptEvents> m_scriptEvents = new Dictionary<UUID, scriptEvents>();
|
// private Dictionary<UUID, scriptEvents> m_scriptEvents = new Dictionary<UUID, scriptEvents>();
|
||||||
|
|
||||||
private Dictionary<uint, scriptPosTarget> m_targets = new Dictionary<uint, scriptPosTarget>();
|
private Dictionary<uint, scriptPosTarget> m_targets = new Dictionary<uint, scriptPosTarget>();
|
||||||
|
private Dictionary<uint, scriptRotTarget> m_rotTargets = new Dictionary<uint, scriptRotTarget>();
|
||||||
|
|
||||||
private bool m_scriptListens_atTarget = false;
|
private bool m_scriptListens_atTarget = false;
|
||||||
private bool m_scriptListens_notAtTarget = false;
|
private bool m_scriptListens_notAtTarget = false;
|
||||||
|
|
||||||
|
private bool m_scriptListens_atRotTarget = false;
|
||||||
|
private bool m_scriptListens_notAtRotTarget = false;
|
||||||
|
|
||||||
internal Dictionary<UUID, string> m_savedScriptState = null;
|
internal Dictionary<UUID, string> m_savedScriptState = null;
|
||||||
|
|
||||||
#region Properties
|
#region Properties
|
||||||
|
@ -1367,6 +1379,15 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
m_targets.Clear();
|
m_targets.Clear();
|
||||||
m_scene.RemoveGroupTarget(this);
|
m_scene.RemoveGroupTarget(this);
|
||||||
}
|
}
|
||||||
|
m_scriptListens_atRotTarget = ((aggregateScriptEvents & scriptEvents.at_rot_target) != 0);
|
||||||
|
m_scriptListens_notAtRotTarget = ((aggregateScriptEvents & scriptEvents.not_at_rot_target) != 0);
|
||||||
|
|
||||||
|
if (!m_scriptListens_atRotTarget && !m_scriptListens_notAtRotTarget)
|
||||||
|
{
|
||||||
|
lock (m_rotTargets)
|
||||||
|
m_rotTargets.Clear();
|
||||||
|
m_scene.RemoveGroupTarget(this);
|
||||||
|
}
|
||||||
|
|
||||||
ScheduleGroupForFullUpdate();
|
ScheduleGroupForFullUpdate();
|
||||||
}
|
}
|
||||||
|
@ -3314,6 +3335,30 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public int registerRotTargetWaypoint(Quaternion target, float tolerance)
|
||||||
|
{
|
||||||
|
scriptRotTarget waypoint = new scriptRotTarget();
|
||||||
|
waypoint.targetRot = target;
|
||||||
|
waypoint.tolerance = tolerance;
|
||||||
|
uint handle = m_scene.AllocateLocalId();
|
||||||
|
waypoint.handle = handle;
|
||||||
|
lock (m_rotTargets)
|
||||||
|
{
|
||||||
|
m_rotTargets.Add(handle, waypoint);
|
||||||
|
}
|
||||||
|
m_scene.AddGroupTarget(this);
|
||||||
|
return (int)handle;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void unregisterRotTargetWaypoint(int handle)
|
||||||
|
{
|
||||||
|
lock (m_targets)
|
||||||
|
{
|
||||||
|
m_rotTargets.Remove((uint)handle);
|
||||||
|
if (m_targets.Count == 0)
|
||||||
|
m_scene.RemoveGroupTarget(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public int registerTargetWaypoint(Vector3 target, float tolerance)
|
public int registerTargetWaypoint(Vector3 target, float tolerance)
|
||||||
{
|
{
|
||||||
|
@ -3422,6 +3467,85 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (m_scriptListens_atRotTarget || m_scriptListens_notAtRotTarget)
|
||||||
|
{
|
||||||
|
if (m_rotTargets.Count > 0)
|
||||||
|
{
|
||||||
|
bool at_Rottarget = false;
|
||||||
|
Dictionary<uint, scriptRotTarget> atRotTargets = new Dictionary<uint, scriptRotTarget>();
|
||||||
|
lock (m_rotTargets)
|
||||||
|
{
|
||||||
|
foreach (uint idx in m_rotTargets.Keys)
|
||||||
|
{
|
||||||
|
scriptRotTarget target = m_rotTargets[idx];
|
||||||
|
double angle = Math.Acos(target.targetRot.X * m_rootPart.RotationOffset.X + target.targetRot.Y * m_rootPart.RotationOffset.Y + target.targetRot.Z * m_rootPart.RotationOffset.Z + target.targetRot.W * m_rootPart.RotationOffset.W) * 2;
|
||||||
|
if (angle < 0) angle = -angle;
|
||||||
|
if (angle > Math.PI) angle = (Math.PI * 2 - angle);
|
||||||
|
if (angle <= target.tolerance)
|
||||||
|
{
|
||||||
|
// trigger at_rot_target
|
||||||
|
if (m_scriptListens_atRotTarget)
|
||||||
|
{
|
||||||
|
at_Rottarget = true;
|
||||||
|
scriptRotTarget att = new scriptRotTarget();
|
||||||
|
att.targetRot = target.targetRot;
|
||||||
|
att.tolerance = target.tolerance;
|
||||||
|
att.handle = target.handle;
|
||||||
|
atRotTargets.Add(idx, att);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (atRotTargets.Count > 0)
|
||||||
|
{
|
||||||
|
uint[] localids = new uint[0];
|
||||||
|
lock (m_parts)
|
||||||
|
{
|
||||||
|
localids = new uint[m_parts.Count];
|
||||||
|
int cntr = 0;
|
||||||
|
foreach (SceneObjectPart part in m_parts.Values)
|
||||||
|
{
|
||||||
|
localids[cntr] = part.LocalId;
|
||||||
|
cntr++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int ctr = 0; ctr < localids.Length; ctr++)
|
||||||
|
{
|
||||||
|
foreach (uint target in atRotTargets.Keys)
|
||||||
|
{
|
||||||
|
scriptRotTarget att = atRotTargets[target];
|
||||||
|
m_scene.EventManager.TriggerAtRotTargetEvent(
|
||||||
|
localids[ctr], att.handle, att.targetRot, m_rootPart.RotationOffset);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (m_scriptListens_notAtRotTarget && !at_Rottarget)
|
||||||
|
{
|
||||||
|
//trigger not_at_target
|
||||||
|
uint[] localids = new uint[0];
|
||||||
|
lock (m_parts)
|
||||||
|
{
|
||||||
|
localids = new uint[m_parts.Count];
|
||||||
|
int cntr = 0;
|
||||||
|
foreach (SceneObjectPart part in m_parts.Values)
|
||||||
|
{
|
||||||
|
localids[cntr] = part.LocalId;
|
||||||
|
cntr++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int ctr = 0; ctr < localids.Length; ctr++)
|
||||||
|
{
|
||||||
|
m_scene.EventManager.TriggerNotAtRotTargetEvent(localids[ctr]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public float GetMass()
|
public float GetMass()
|
||||||
|
|
|
@ -4091,6 +4091,23 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int registerRotTargetWaypoint(Quaternion target, float tolerance)
|
||||||
|
{
|
||||||
|
if (m_parentGroup != null)
|
||||||
|
{
|
||||||
|
return m_parentGroup.registerRotTargetWaypoint(target, tolerance);
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void unregisterRotTargetWaypoint(int handle)
|
||||||
|
{
|
||||||
|
if (m_parentGroup != null)
|
||||||
|
{
|
||||||
|
m_parentGroup.unregisterRotTargetWaypoint(handle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void SetCameraAtOffset(Vector3 v)
|
public void SetCameraAtOffset(Vector3 v)
|
||||||
{
|
{
|
||||||
m_cameraAtOffset = v;
|
m_cameraAtOffset = v;
|
||||||
|
|
|
@ -2215,14 +2215,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
public LSL_Integer llRotTarget(LSL_Rotation rot, double error)
|
public LSL_Integer llRotTarget(LSL_Rotation rot, double error)
|
||||||
{
|
{
|
||||||
m_host.AddScriptLPS(1);
|
m_host.AddScriptLPS(1);
|
||||||
NotImplemented("llRotTarget");
|
return m_host.registerRotTargetWaypoint(new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), (float)error);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void llRotTargetRemove(int number)
|
public void llRotTargetRemove(int number)
|
||||||
{
|
{
|
||||||
m_host.AddScriptLPS(1);
|
m_host.AddScriptLPS(1);
|
||||||
NotImplemented("llRotTargetRemove");
|
m_host.unregisterRotTargetWaypoint(number);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void llMoveToTarget(LSL_Vector target, double tau)
|
public void llMoveToTarget(LSL_Vector target, double tau)
|
||||||
|
|
|
@ -63,6 +63,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
||||||
land_collision_end = 4096,
|
land_collision_end = 4096,
|
||||||
land_collision_start = 8192,
|
land_collision_start = 8192,
|
||||||
at_target = 16384,
|
at_target = 16384,
|
||||||
|
at_rot_target = 16777216,
|
||||||
listen = 32768,
|
listen = 32768,
|
||||||
money = 65536,
|
money = 65536,
|
||||||
moving_end = 131072,
|
moving_end = 131072,
|
||||||
|
@ -205,7 +206,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
||||||
}
|
}
|
||||||
|
|
||||||
m_eventFlagsMap.Add("attach", scriptEvents.attach);
|
m_eventFlagsMap.Add("attach", scriptEvents.attach);
|
||||||
// m_eventFlagsMap.Add("at_rot_target",(long)scriptEvents.at_rot_target);
|
m_eventFlagsMap.Add("at_rot_target", scriptEvents.at_rot_target);
|
||||||
m_eventFlagsMap.Add("at_target", scriptEvents.at_target);
|
m_eventFlagsMap.Add("at_target", scriptEvents.at_target);
|
||||||
// m_eventFlagsMap.Add("changed",(long)scriptEvents.changed);
|
// m_eventFlagsMap.Add("changed",(long)scriptEvents.changed);
|
||||||
m_eventFlagsMap.Add("collision", scriptEvents.collision);
|
m_eventFlagsMap.Add("collision", scriptEvents.collision);
|
||||||
|
|
|
@ -59,6 +59,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
|
||||||
myScriptEngine.World.EventManager.OnScriptChangedEvent += changed;
|
myScriptEngine.World.EventManager.OnScriptChangedEvent += changed;
|
||||||
myScriptEngine.World.EventManager.OnScriptAtTargetEvent += at_target;
|
myScriptEngine.World.EventManager.OnScriptAtTargetEvent += at_target;
|
||||||
myScriptEngine.World.EventManager.OnScriptNotAtTargetEvent += not_at_target;
|
myScriptEngine.World.EventManager.OnScriptNotAtTargetEvent += not_at_target;
|
||||||
|
myScriptEngine.World.EventManager.OnScriptAtRotTargetEvent += at_rot_target;
|
||||||
|
myScriptEngine.World.EventManager.OnScriptNotAtRotTargetEvent += not_at_rot_target;
|
||||||
myScriptEngine.World.EventManager.OnScriptControlEvent += control;
|
myScriptEngine.World.EventManager.OnScriptControlEvent += control;
|
||||||
myScriptEngine.World.EventManager.OnScriptColliderStart += collision_start;
|
myScriptEngine.World.EventManager.OnScriptColliderStart += collision_start;
|
||||||
myScriptEngine.World.EventManager.OnScriptColliding += collision;
|
myScriptEngine.World.EventManager.OnScriptColliding += collision;
|
||||||
|
@ -390,14 +392,18 @@ namespace OpenSim.Region.ScriptEngine.XEngine
|
||||||
new DetectParams[0]));
|
new DetectParams[0]));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void at_rot_target(uint localID, UUID itemID)
|
public void at_rot_target(uint localID, uint handle, Quaternion targetrot,
|
||||||
|
Quaternion atrot)
|
||||||
{
|
{
|
||||||
myScriptEngine.PostObjectEvent(localID, new EventParams(
|
myScriptEngine.PostObjectEvent(localID, new EventParams(
|
||||||
"at_rot_target",new object[0],
|
"at_rot_target", new object[] {
|
||||||
|
new LSL_Types.LSLInteger(handle),
|
||||||
|
new LSL_Types.Quaternion(targetrot.X,targetrot.Y,targetrot.Z,targetrot.W),
|
||||||
|
new LSL_Types.Quaternion(atrot.X,atrot.Y,atrot.Z,atrot.W) },
|
||||||
new DetectParams[0]));
|
new DetectParams[0]));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void not_at_rot_target(uint localID, UUID itemID)
|
public void not_at_rot_target(uint localID)
|
||||||
{
|
{
|
||||||
myScriptEngine.PostObjectEvent(localID, new EventParams(
|
myScriptEngine.PostObjectEvent(localID, new EventParams(
|
||||||
"not_at_rot_target",new object[0],
|
"not_at_rot_target",new object[0],
|
||||||
|
|
Loading…
Reference in New Issue