aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs6
-rw-r--r--OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs40
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs32
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEventQueue.cs9
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs196
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs1008
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs14
9 files changed, 936 insertions, 377 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs b/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
index 34aca33..d25c930 100644
--- a/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
@@ -35,8 +35,8 @@ namespace OpenSim.Region.Framework.Interfaces
35 35
36 public interface IAvatarFactoryModule 36 public interface IAvatarFactoryModule
37 { 37 {
38 void SetAppearance(IScenePresence sp, AvatarAppearance appearance); 38 void SetAppearance(IScenePresence sp, AvatarAppearance appearance, WearableCacheItem[] cacheItems);
39 void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams); 39 void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams, WearableCacheItem[] cacheItems);
40 40
41 /// <summary> 41 /// <summary>
42 /// Send the appearance of an avatar to others in the scene. 42 /// Send the appearance of an avatar to others in the scene.
@@ -52,6 +52,8 @@ namespace OpenSim.Region.Framework.Interfaces
52 /// <returns>An empty list if this agent has no baked textures (e.g. because it's a child agent)</returns> 52 /// <returns>An empty list if this agent has no baked textures (e.g. because it's a child agent)</returns>
53 Dictionary<BakeType, Primitive.TextureEntryFace> GetBakedTextureFaces(UUID agentId); 53 Dictionary<BakeType, Primitive.TextureEntryFace> GetBakedTextureFaces(UUID agentId);
54 54
55
56 WearableCacheItem[] GetCachedItems(UUID agentId);
55 /// <summary> 57 /// <summary>
56 /// Save the baked textures for the given agent permanently in the asset database. 58 /// Save the baked textures for the given agent permanently in the asset database.
57 /// </summary> 59 /// </summary>
diff --git a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
new file mode 100644
index 0000000..b536a49
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
@@ -0,0 +1,40 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using Nini.Config;
30using OpenSim.Framework;
31using OpenMetaverse;
32
33namespace OpenSim.Services.Interfaces
34{
35 public interface IBakedTextureModule
36 {
37 WearableCacheItem[] Get(UUID id);
38 void Store(UUID id, WearableCacheItem[] data);
39 }
40}
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 1c43a25..1949a90 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -35,6 +35,8 @@ using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Region.Framework.Interfaces 36namespace OpenSim.Region.Framework.Interfaces
37{ 37{
38 public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
39
38 public interface IEntityTransferModule 40 public interface IEntityTransferModule
39 { 41 {
40 /// <summary> 42 /// <summary>
@@ -50,30 +52,11 @@ namespace OpenSim.Region.Framework.Interfaces
50 /// <param name='teleportFlags'></param> 52 /// <param name='teleportFlags'></param>
51 void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags); 53 void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags);
52 54
53 /// <summary>
54 /// Teleport an agent directly to a given region without checking whether the region should be subsituted.
55 /// </summary>
56 /// <remarks>
57 /// Please use Teleport() instead unless you know exactly what you're doing.
58 /// Do not use for same region teleports.
59 /// </remarks>
60 /// <param name='sp'></param>
61 /// <param name='reg'></param>
62 /// <param name='finalDestination'>/param>
63 /// <param name='position'></param>
64 /// <param name='lookAt'></param>
65 /// <param name='teleportFlags'></param>
66 void DoTeleport(
67 ScenePresence sp, GridRegion reg, GridRegion finalDestination,
68 Vector3 position, Vector3 lookAt, uint teleportFlags);
69
70 /// <summary>
71 /// Teleports the agent for the given client to their home destination.
72 /// </summary>
73 /// <param name='id'></param>
74 /// <param name='client'></param>
75 bool TeleportHome(UUID id, IClientAPI client); 55 bool TeleportHome(UUID id, IClientAPI client);
76 56
57 void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination,
58 Vector3 position, Vector3 lookAt, uint teleportFlags);
59
77 /// <summary> 60 /// <summary>
78 /// Show whether the given agent is being teleported. 61 /// Show whether the given agent is being teleported.
79 /// </summary> 62 /// </summary>
@@ -89,7 +72,12 @@ namespace OpenSim.Region.Framework.Interfaces
89 72
90 void EnableChildAgent(ScenePresence agent, GridRegion region); 73 void EnableChildAgent(ScenePresence agent, GridRegion region);
91 74
75 GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out uint xDest, out uint yDest, out string version, out Vector3 newpos);
76
92 void Cross(SceneObjectGroup sog, Vector3 position, bool silent); 77 void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
78
79 ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
80
93 } 81 }
94 82
95 public interface IUserAgentVerificationModule 83 public interface IUserAgentVerificationModule
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
index 3780ece..dfc269e 100644
--- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
@@ -39,16 +39,17 @@ namespace OpenSim.Region.Framework.Interfaces
39 39
40 // These are required to decouple Scenes from EventQueueHelper 40 // These are required to decouple Scenes from EventQueueHelper
41 void DisableSimulator(ulong handle, UUID avatarID); 41 void DisableSimulator(ulong handle, UUID avatarID);
42 void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID); 42 void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY);
43 void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, 43 void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint,
44 string capsPath); 44 string capsPath, ulong regionHandle, int regionSizeX, int regionSizeY);
45 void TeleportFinishEvent(ulong regionHandle, byte simAccess, 45 void TeleportFinishEvent(ulong regionHandle, byte simAccess,
46 IPEndPoint regionExternalEndPoint, 46 IPEndPoint regionExternalEndPoint,
47 uint locationID, uint flags, string capsURL, 47 uint locationID, uint flags, string capsURL,
48 UUID agentID); 48 UUID agentID, int regionSizeX, int regionSizeY);
49 void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, 49 void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
50 IPEndPoint newRegionExternalEndPoint, 50 IPEndPoint newRegionExternalEndPoint,
51 string capsURL, UUID avatarID, UUID sessionID); 51 string capsURL, UUID avatarID, UUID sessionID,
52 int regionSizeX, int regionSizeY);
52 void ChatterboxInvitation(UUID sessionID, string sessionName, 53 void ChatterboxInvitation(UUID sessionID, string sessionName,
53 UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, 54 UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
54 uint timeStamp, bool offline, int parentEstateID, Vector3 position, 55 uint timeStamp, bool offline, int parentEstateID, Vector3 position,
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 567ce2a..a9fe556 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1953,6 +1953,11 @@ namespace OpenSim.Region.Framework.Scenes
1953 1953
1954 GridRegion region = new GridRegion(RegionInfo); 1954 GridRegion region = new GridRegion(RegionInfo);
1955 string error = GridService.RegisterRegion(RegionInfo.ScopeID, region); 1955 string error = GridService.RegisterRegion(RegionInfo.ScopeID, region);
1956 m_log.DebugFormat("{0} RegisterRegionWithGrid. name={1},id={2},loc=<{3},{4}>,size=<{5},{6}>",
1957 LogHeader, m_regionName,
1958 RegionInfo.RegionID,
1959 RegionInfo.RegionLocX, RegionInfo.RegionLocY,
1960 RegionInfo.RegionSizeX, RegionInfo.RegionSizeY);
1956 if (error != String.Empty) 1961 if (error != String.Empty)
1957 throw new Exception(error); 1962 throw new Exception(error);
1958 } 1963 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 4f04706..c86f412 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -42,7 +42,8 @@ namespace OpenSim.Region.Framework.Scenes
42{ 42{
43 public abstract class SceneBase : IScene 43 public abstract class SceneBase : IScene
44 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 protected static readonly string LogHeader = "[SCENE]";
46 47
47 #region Events 48 #region Events
48 49
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index e31270c..9bd7632 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -121,6 +121,7 @@ namespace OpenSim.Region.Framework.Scenes
121 private bool m_hasGroupChanged = false; 121 private bool m_hasGroupChanged = false;
122 private long timeFirstChanged; 122 private long timeFirstChanged;
123 private long timeLastChanged; 123 private long timeLastChanged;
124 private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>();
124 125
125 /// <summary> 126 /// <summary>
126 /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage 127 /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage
@@ -431,6 +432,12 @@ namespace OpenSim.Region.Framework.Scenes
431 return (IsAttachment || (m_rootPart.Shape.PCode == 9 && m_rootPart.Shape.State != 0)); 432 return (IsAttachment || (m_rootPart.Shape.PCode == 9 && m_rootPart.Shape.State != 0));
432 } 433 }
433 434
435 private struct avtocrossInfo
436 {
437 public ScenePresence av;
438 public uint ParentID;
439 }
440
434 /// <summary> 441 /// <summary>
435 /// The absolute position of this scene object in the scene 442 /// The absolute position of this scene object in the scene
436 /// </summary> 443 /// </summary>
@@ -458,13 +465,124 @@ namespace OpenSim.Region.Framework.Scenes
458 || Scene.TestBorderCross(val, Cardinals.S)) 465 || Scene.TestBorderCross(val, Cardinals.S))
459 && !IsAttachmentCheckFull() && (!Scene.LoadingPrims)) 466 && !IsAttachmentCheckFull() && (!Scene.LoadingPrims))
460 { 467 {
468 IEntityTransferModule entityTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
469 uint x = 0;
470 uint y = 0;
471 string version = String.Empty;
472 Vector3 newpos = Vector3.Zero;
473 OpenSim.Services.Interfaces.GridRegion destination = null;
474
461 if (m_rootPart.KeyframeMotion != null) 475 if (m_rootPart.KeyframeMotion != null)
462 m_rootPart.KeyframeMotion.StartCrossingCheck(); 476 m_rootPart.KeyframeMotion.StartCrossingCheck();
463 477
464 m_scene.CrossPrimGroupIntoNewRegion(val, this, true); 478 bool canCross = true;
479 foreach (ScenePresence av in m_linkedAvatars)
480 {
481 // We need to cross these agents. First, let's find
482 // out if any of them can't cross for some reason.
483 // We have to deny the crossing entirely if any
484 // of them are banned. Alternatively, we could
485 // unsit banned agents....
486
487
488 // We set the avatar position as being the object
489 // position to get the region to send to
490 if ((destination = entityTransfer.GetDestination(m_scene, av.UUID, val, out x, out y, out version, out newpos)) == null)
491 {
492 canCross = false;
493 break;
494 }
495
496 m_log.DebugFormat("[SCENE OBJECT]: Avatar {0} needs to be crossed to {1}", av.Name, destination.RegionName);
497 }
498
499 if (canCross)
500 {
501 // We unparent the SP quietly so that it won't
502 // be made to stand up
503
504 List<avtocrossInfo> avsToCross = new List<avtocrossInfo>();
505
506 foreach (ScenePresence av in m_linkedAvatars)
507 {
508 avtocrossInfo avinfo = new avtocrossInfo();
509 SceneObjectPart parentPart = m_scene.GetSceneObjectPart(av.ParentID);
510 if (parentPart != null)
511 av.ParentUUID = parentPart.UUID;
512
513 avinfo.av = av;
514 avinfo.ParentID = av.ParentID;
515 avsToCross.Add(avinfo);
516
517 av.PrevSitOffset = av.OffsetPosition;
518 av.ParentID = 0;
519 }
520
521 // m_linkedAvatars.Clear();
522 m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
523
524 // Normalize
525 if (val.X >= Constants.RegionSize)
526 val.X -= Constants.RegionSize;
527 if (val.Y >= Constants.RegionSize)
528 val.Y -= Constants.RegionSize;
529 if (val.X < 0)
530 val.X += Constants.RegionSize;
531 if (val.Y < 0)
532 val.Y += Constants.RegionSize;
533
534 // If it's deleted, crossing was successful
535 if (IsDeleted)
536 {
537 // foreach (ScenePresence av in m_linkedAvatars)
538 foreach (avtocrossInfo avinfo in avsToCross)
539 {
540 ScenePresence av = avinfo.av;
541 if (!av.IsInTransit) // just in case...
542 {
543 m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar {0} to {1}", av.Name, val);
544
545 av.IsInTransit = true;
546
547 CrossAgentToNewRegionDelegate d = entityTransfer.CrossAgentToNewRegionAsync;
548 d.BeginInvoke(av, val, destination, av.Flying, version, CrossAgentToNewRegionCompleted, d);
549 }
550 else
551 m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar alreasy in transit {0} to {1}", av.Name, val);
552 }
553 avsToCross.Clear();
554 return;
555 }
556 else // cross failed, put avas back ??
557 {
558 foreach (avtocrossInfo avinfo in avsToCross)
559 {
560 ScenePresence av = avinfo.av;
561 av.ParentUUID = UUID.Zero;
562 av.ParentID = avinfo.ParentID;
563// m_linkedAvatars.Add(av);
564 }
565 }
566 avsToCross.Clear();
567
568 }
569 else
570 {
571 if (m_rootPart.KeyframeMotion != null)
572 m_rootPart.KeyframeMotion.CrossingFailure();
573
574 if (RootPart.PhysActor != null)
575 {
576 RootPart.PhysActor.CrossingFailure();
577 }
578 }
579 Vector3 oldp = AbsolutePosition;
580 val.X = Util.Clamp<float>(oldp.X, 0.5f, (float)Constants.RegionSize - 0.5f);
581 val.Y = Util.Clamp<float>(oldp.Y, 0.5f, (float)Constants.RegionSize - 0.5f);
582 val.Z = Util.Clamp<float>(oldp.Z, 0.5f, 4096.0f);
465 } 583 }
466 } 584 }
467 585
468 if (RootPart.GetStatusSandbox()) 586 if (RootPart.GetStatusSandbox())
469 { 587 {
470 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10) 588 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10)
@@ -498,6 +616,39 @@ namespace OpenSim.Region.Framework.Scenes
498 } 616 }
499 } 617 }
500 618
619 public override Vector3 Velocity
620 {
621 get { return RootPart.Velocity; }
622 set { RootPart.Velocity = value; }
623 }
624
625 private void CrossAgentToNewRegionCompleted(IAsyncResult iar)
626 {
627 CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState;
628 ScenePresence agent = icon.EndInvoke(iar);
629
630 //// If the cross was successful, this agent is a child agent
631 if (agent.IsChildAgent)
632 {
633 if (agent.ParentUUID != UUID.Zero)
634 {
635 agent.ParentPart = null;
636// agent.ParentPosition = Vector3.Zero;
637// agent.ParentUUID = UUID.Zero;
638 }
639 }
640
641 agent.ParentUUID = UUID.Zero;
642// agent.Reset();
643// else // Not successful
644// agent.RestoreInCurrentScene();
645
646 // In any case
647 agent.IsInTransit = false;
648
649 m_log.DebugFormat("[SCENE OBJECT]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname);
650 }
651
501 public override uint LocalId 652 public override uint LocalId
502 { 653 {
503 get { return m_rootPart.LocalId; } 654 get { return m_rootPart.LocalId; }
@@ -1099,6 +1250,7 @@ namespace OpenSim.Region.Framework.Scenes
1099 } 1250 }
1100 } 1251 }
1101 1252
1253
1102 /// <summary> 1254 /// <summary>
1103 /// 1255 ///
1104 /// </summary> 1256 /// </summary>
@@ -1108,6 +1260,46 @@ namespace OpenSim.Region.Framework.Scenes
1108 part.ParentID = m_rootPart.LocalId; 1260 part.ParentID = m_rootPart.LocalId;
1109 part.ClearUndoState(); 1261 part.ClearUndoState();
1110 } 1262 }
1263 /// <summary>
1264 /// Add the avatar to this linkset (avatar is sat).
1265 /// </summary>
1266 /// <param name="agentID"></param>
1267 public void AddAvatar(UUID agentID)
1268 {
1269 ScenePresence presence;
1270 if (m_scene.TryGetScenePresence(agentID, out presence))
1271 {
1272 if (!m_linkedAvatars.Contains(presence))
1273 {
1274 m_linkedAvatars.Add(presence);
1275 }
1276 }
1277 }
1278
1279 /// <summary>
1280 /// Delete the avatar from this linkset (avatar is unsat).
1281 /// </summary>
1282 /// <param name="agentID"></param>
1283 public void DeleteAvatar(UUID agentID)
1284 {
1285 ScenePresence presence;
1286 if (m_scene.TryGetScenePresence(agentID, out presence))
1287 {
1288 if (m_linkedAvatars.Contains(presence))
1289 {
1290 m_linkedAvatars.Remove(presence);
1291 }
1292 }
1293 }
1294
1295 /// <summary>
1296 /// Returns the list of linked presences (avatars sat on this group)
1297 /// </summary>
1298 /// <param name="agentID"></param>
1299 public List<ScenePresence> GetLinkedAvatars()
1300 {
1301 return m_linkedAvatars;
1302 }
1111 1303
1112 public ushort GetTimeDilation() 1304 public ushort GetTimeDilation()
1113 { 1305 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 3290da1..18d84a2 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Region.Framework.Scenes
65 65
66 struct ScriptControllers 66 struct ScriptControllers
67 { 67 {
68 public UUID objectID;
68 public UUID itemID; 69 public UUID itemID;
69 public ScriptControlled ignoreControls; 70 public ScriptControlled ignoreControls;
70 public ScriptControlled eventControls; 71 public ScriptControlled eventControls;
@@ -130,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes
130 /// rotation, prim cut, prim twist, prim taper, and prim shear. See mantis 131 /// rotation, prim cut, prim twist, prim taper, and prim shear. See mantis
131 /// issue #1716 132 /// issue #1716
132 /// </summary> 133 /// </summary>
133 public static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.418f); 134 public static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.4f);
134 135
135 /// <summary> 136 /// <summary>
136 /// Movement updates for agents in neighboring regions are sent directly to clients. 137 /// Movement updates for agents in neighboring regions are sent directly to clients.
@@ -152,8 +153,6 @@ namespace OpenSim.Region.Framework.Scenes
152 /// <remarks> 153 /// <remarks>
153 /// TODO: For some reason, we effectively have a list both here and in Appearance. Need to work out if this is 154 /// TODO: For some reason, we effectively have a list both here and in Appearance. Need to work out if this is
154 /// necessary. 155 /// necessary.
155 /// NOTE: To avoid deadlocks, do not lock m_attachments and then perform other tasks under that lock. Take a copy
156 /// of the list and act on that instead.
157 /// </remarks> 156 /// </remarks>
158 private List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>(); 157 private List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>();
159 158
@@ -172,6 +171,10 @@ namespace OpenSim.Region.Framework.Scenes
172 private Vector3 m_lastPosition; 171 private Vector3 m_lastPosition;
173 private Quaternion m_lastRotation; 172 private Quaternion m_lastRotation;
174 private Vector3 m_lastVelocity; 173 private Vector3 m_lastVelocity;
174 private Vector3 m_lastSize = new Vector3(0.45f,0.6f,1.9f);
175
176 private bool m_followCamAuto = false;
177
175 178
176 private Vector3? m_forceToApply; 179 private Vector3? m_forceToApply;
177 private int m_userFlags; 180 private int m_userFlags;
@@ -204,6 +207,7 @@ namespace OpenSim.Region.Framework.Scenes
204// private int m_lastColCount = -1; //KF: Look for Collision chnages 207// private int m_lastColCount = -1; //KF: Look for Collision chnages
205// private int m_updateCount = 0; //KF: Update Anims for a while 208// private int m_updateCount = 0; //KF: Update Anims for a while
206// private static readonly int UPDATE_COUNT = 10; // how many frames to update for 209// private static readonly int UPDATE_COUNT = 10; // how many frames to update for
210 private List<uint> m_lastColliders = new List<uint>();
207 211
208 private TeleportFlags m_teleportFlags; 212 private TeleportFlags m_teleportFlags;
209 public TeleportFlags TeleportFlags 213 public TeleportFlags TeleportFlags
@@ -259,8 +263,6 @@ namespace OpenSim.Region.Framework.Scenes
259 /// </summary> 263 /// </summary>
260 public bool LandAtTarget { get; private set; } 264 public bool LandAtTarget { get; private set; }
261 265
262 private bool m_followCamAuto;
263
264 private int m_movementUpdateCount; 266 private int m_movementUpdateCount;
265 private const int NumMovementsBetweenRayCast = 5; 267 private const int NumMovementsBetweenRayCast = 5;
266 268
@@ -268,6 +270,13 @@ namespace OpenSim.Region.Framework.Scenes
268 //private int m_moveToPositionStateStatus; 270 //private int m_moveToPositionStateStatus;
269 //***************************************************** 271 //*****************************************************
270 272
273 private bool m_collisionEventFlag = false;
274 private object m_collisionEventLock = new Object();
275
276 private int m_movementAnimationUpdateCounter = 0;
277
278 public Vector3 PrevSitOffset { get; set; }
279
271 protected AvatarAppearance m_appearance; 280 protected AvatarAppearance m_appearance;
272 281
273 public AvatarAppearance Appearance 282 public AvatarAppearance Appearance
@@ -407,6 +416,9 @@ namespace OpenSim.Region.Framework.Scenes
407 /// </summary> 416 /// </summary>
408 protected Vector3 m_lastCameraPosition; 417 protected Vector3 m_lastCameraPosition;
409 418
419 private Vector4 m_lastCameraCollisionPlane = new Vector4(0f, 0f, 0f, 1);
420 private bool m_doingCamRayCast = false;
421
410 public Vector3 CameraPosition { get; set; } 422 public Vector3 CameraPosition { get; set; }
411 423
412 public Quaternion CameraRotation 424 public Quaternion CameraRotation
@@ -487,6 +499,10 @@ namespace OpenSim.Region.Framework.Scenes
487 get { return (IClientCore)ControllingClient; } 499 get { return (IClientCore)ControllingClient; }
488 } 500 }
489 501
502 public UUID COF { get; set; }
503
504// public Vector3 ParentPosition { get; set; }
505
490 /// <summary> 506 /// <summary>
491 /// Position of this avatar relative to the region the avatar is in 507 /// Position of this avatar relative to the region the avatar is in
492 /// </summary> 508 /// </summary>
@@ -613,7 +629,24 @@ namespace OpenSim.Region.Framework.Scenes
613// Scene.RegionInfo.RegionName, Name, m_velocity); 629// Scene.RegionInfo.RegionName, Name, m_velocity);
614 } 630 }
615 } 631 }
632/*
633 public override Vector3 AngularVelocity
634 {
635 get
636 {
637 if (PhysicsActor != null)
638 {
639 m_rotationalvelocity = PhysicsActor.RotationalVelocity;
640
641 // m_log.DebugFormat(
642 // "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!",
643 // m_velocity, Name, Scene.RegionInfo.RegionName);
644 }
616 645
646 return m_rotationalvelocity;
647 }
648 }
649*/
617 private Quaternion m_bodyRot = Quaternion.Identity; 650 private Quaternion m_bodyRot = Quaternion.Identity;
618 651
619 /// <summary> 652 /// <summary>
@@ -636,8 +669,16 @@ namespace OpenSim.Region.Framework.Scenes
636 m_bodyRot = value; 669 m_bodyRot = value;
637 670
638 if (PhysicsActor != null) 671 if (PhysicsActor != null)
639 PhysicsActor.Orientation = m_bodyRot; 672 {
640 673 try
674 {
675 PhysicsActor.Orientation = m_bodyRot;
676 }
677 catch (Exception e)
678 {
679 m_log.Error("[SCENE PRESENCE]: Orientation " + e.Message);
680 }
681 }
641// m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, m_bodyRot); 682// m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, m_bodyRot);
642 } 683 }
643 } 684 }
@@ -651,12 +692,20 @@ namespace OpenSim.Region.Framework.Scenes
651 } 692 }
652 693
653 public bool IsChildAgent { get; set; } 694 public bool IsChildAgent { get; set; }
695 public bool IsLoggingIn { get; set; }
654 696
655 /// <summary> 697 /// <summary>
656 /// If the avatar is sitting, the local ID of the prim that it's sitting on. If not sitting then zero. 698 /// If the avatar is sitting, the local ID of the prim that it's sitting on. If not sitting then zero.
657 /// </summary> 699 /// </summary>
658 public uint ParentID { get; set; } 700 public uint ParentID { get; set; }
659 701
702 public UUID ParentUUID
703 {
704 get { return m_parentUUID; }
705 set { m_parentUUID = value; }
706 }
707 private UUID m_parentUUID = UUID.Zero;
708
660 /// <summary> 709 /// <summary>
661 /// Are we sitting on an object? 710 /// Are we sitting on an object?
662 /// </summary> 711 /// </summary>
@@ -814,6 +863,7 @@ namespace OpenSim.Region.Framework.Scenes
814 AttachmentsSyncLock = new Object(); 863 AttachmentsSyncLock = new Object();
815 AllowMovement = true; 864 AllowMovement = true;
816 IsChildAgent = true; 865 IsChildAgent = true;
866 IsLoggingIn = false;
817 m_sendCoarseLocationsMethod = SendCoarseLocationsDefault; 867 m_sendCoarseLocationsMethod = SendCoarseLocationsDefault;
818 Animator = new ScenePresenceAnimator(this); 868 Animator = new ScenePresenceAnimator(this);
819 PresenceType = type; 869 PresenceType = type;
@@ -859,6 +909,33 @@ namespace OpenSim.Region.Framework.Scenes
859 m_stateMachine = new ScenePresenceStateMachine(this); 909 m_stateMachine = new ScenePresenceStateMachine(this);
860 } 910 }
861 911
912 private void RegionHeartbeatEnd(Scene scene)
913 {
914 if (IsChildAgent)
915 return;
916
917 m_movementAnimationUpdateCounter ++;
918 if (m_movementAnimationUpdateCounter >= 2)
919 {
920 m_movementAnimationUpdateCounter = 0;
921 if (Animator != null)
922 {
923 // If the parentID == 0 we are not sitting
924 // if !SitGournd then we are not sitting on the ground
925 // Fairly straightforward, now here comes the twist
926 // if ParentUUID is NOT UUID.Zero, we are looking to
927 // be sat on an object that isn't there yet. Should
928 // be treated as if sat.
929 if(ParentID == 0 && !SitGround && ParentUUID == UUID.Zero) // skip it if sitting
930 Animator.UpdateMovementAnimations();
931 }
932 else
933 {
934 m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
935 }
936 }
937 }
938
862 public void RegisterToEvents() 939 public void RegisterToEvents()
863 { 940 {
864 ControllingClient.OnCompleteMovementToRegion += CompleteMovement; 941 ControllingClient.OnCompleteMovementToRegion += CompleteMovement;
@@ -930,6 +1007,38 @@ namespace OpenSim.Region.Framework.Scenes
930// "[SCENE]: Upgrading child to root agent for {0} in {1}", 1007// "[SCENE]: Upgrading child to root agent for {0} in {1}",
931// Name, m_scene.RegionInfo.RegionName); 1008// Name, m_scene.RegionInfo.RegionName);
932 1009
1010 if (ParentUUID != UUID.Zero)
1011 {
1012 m_log.DebugFormat("[SCENE PRESENCE]: Sitting avatar back on prim {0}", ParentUUID);
1013 SceneObjectPart part = m_scene.GetSceneObjectPart(ParentUUID);
1014 if (part == null)
1015 {
1016 m_log.ErrorFormat("[SCENE PRESENCE]: Can't find prim {0} to sit on", ParentUUID);
1017 }
1018 else
1019 {
1020 part.ParentGroup.AddAvatar(UUID);
1021 if (part.SitTargetPosition != Vector3.Zero)
1022 part.SitTargetAvatar = UUID;
1023// ParentPosition = part.GetWorldPosition();
1024 ParentID = part.LocalId;
1025 ParentPart = part;
1026 m_pos = PrevSitOffset;
1027// pos = ParentPosition;
1028 pos = part.GetWorldPosition();
1029 }
1030 ParentUUID = UUID.Zero;
1031
1032 IsChildAgent = false;
1033
1034// Animator.TrySetMovementAnimation("SIT");
1035 }
1036 else
1037 {
1038 IsChildAgent = false;
1039 IsLoggingIn = false;
1040 }
1041
933 //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count); 1042 //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
934 1043
935 lock (m_completeMovementLock) 1044 lock (m_completeMovementLock)
@@ -953,70 +1062,106 @@ namespace OpenSim.Region.Framework.Scenes
953 1062
954 m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene); 1063 m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene);
955 1064
956 // Moved this from SendInitialData to ensure that Appearance is initialized 1065 UUID groupUUID = UUID.Zero;
957 // before the inventory is processed in MakeRootAgent. This fixes a race condition 1066 string GroupName = string.Empty;
958 // related to the handling of attachments 1067 ulong groupPowers = 0;
959 //m_scene.GetAvatarAppearance(ControllingClient, out Appearance);
960 1068
961 if (m_scene.TestBorderCross(pos, Cardinals.E)) 1069 // ----------------------------------
1070 // Previous Agent Difference - AGNI sends an unsolicited AgentDataUpdate upon root agent status
1071 try
962 { 1072 {
963 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E); 1073 if (gm != null)
964 pos.X = crossedBorder.BorderLine.Z - 1; 1074 {
1075 groupUUID = ControllingClient.ActiveGroupId;
1076 GroupRecord record = gm.GetGroupRecord(groupUUID);
1077 if (record != null)
1078 GroupName = record.GroupName;
1079 GroupMembershipData groupMembershipData = gm.GetMembershipData(groupUUID, m_uuid);
1080 if (groupMembershipData != null)
1081 groupPowers = groupMembershipData.GroupPowers;
1082 }
1083 ControllingClient.SendAgentDataUpdate(m_uuid, groupUUID, Firstname, Lastname, groupPowers, GroupName,
1084 Grouptitle);
965 } 1085 }
966 1086 catch (Exception e)
967 if (m_scene.TestBorderCross(pos, Cardinals.N))
968 { 1087 {
969 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N); 1088 m_log.Debug("[AGENTUPDATE]: " + e.ToString());
970 pos.Y = crossedBorder.BorderLine.Z - 1;
971 } 1089 }
1090 // ------------------------------------
972 1091
973 CheckAndAdjustLandingPoint(ref pos); 1092 if (ParentID == 0)
974
975 if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f)
976 { 1093 {
977 m_log.WarnFormat( 1094 // Moved this from SendInitialData to ensure that Appearance is initialized
978 "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Clamping", 1095 // before the inventory is processed in MakeRootAgent. This fixes a race condition
979 pos, Name, UUID); 1096 // related to the handling of attachments
1097 //m_scene.GetAvatarAppearance(ControllingClient, out Appearance);
1098 if (m_scene.TestBorderCross(pos, Cardinals.E))
1099 {
1100 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E);
1101 pos.X = crossedBorder.BorderLine.Z - 1;
1102 }
980 1103
981 if (pos.X < 0f) pos.X = 0f; 1104 if (m_scene.TestBorderCross(pos, Cardinals.N))
982 if (pos.Y < 0f) pos.Y = 0f; 1105 {
983 if (pos.Z < 0f) pos.Z = 0f; 1106 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N);
984 } 1107 pos.Y = crossedBorder.BorderLine.Z - 1;
1108 }
985 1109
986 float localAVHeight = 1.56f; 1110 CheckAndAdjustLandingPoint(ref pos);
987 if (Appearance.AvatarHeight > 0)
988 localAVHeight = Appearance.AvatarHeight;
989 1111
990 float posZLimit = 0; 1112 if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f)
1113 {
1114 m_log.WarnFormat(
1115 "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Clamping",
1116 pos, Name, UUID);
991 1117
992 if (pos.X < Constants.RegionSize && pos.Y < Constants.RegionSize) 1118 if (pos.X < 0f) pos.X = 0f;
993 posZLimit = (float)m_scene.Heightmap[(int)pos.X, (int)pos.Y]; 1119 if (pos.Y < 0f) pos.Y = 0f;
994 1120 if (pos.Z < 0f) pos.Z = 0f;
995 float newPosZ = posZLimit + localAVHeight / 2; 1121 }
996 if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
997 {
998 pos.Z = newPosZ;
999 }
1000 AbsolutePosition = pos;
1001 1122
1002 AddToPhysicalScene(isFlying); 1123 float localAVHeight = 1.56f;
1124 if (Appearance.AvatarHeight > 0)
1125 localAVHeight = Appearance.AvatarHeight;
1003 1126
1004 // XXX: This is to trigger any secondary teleport needed for a megaregion when the user has teleported to a 1127 float posZLimit = 0;
1005 // location outside the 'root region' (the south-west 256x256 corner). This is the earlist we can do it
1006 // since it requires a physics actor to be present. If it is left any later, then physics appears to reset
1007 // the value to a negative position which does not trigger the border cross.
1008 // This may not be the best location for this.
1009 CheckForBorderCrossing();
1010 1128
1011 if (ForceFly) 1129 if (pos.X < Constants.RegionSize && pos.Y < Constants.RegionSize)
1012 { 1130 posZLimit = (float)m_scene.Heightmap[(int)pos.X, (int)pos.Y];
1013 Flying = true; 1131
1014 } 1132 float newPosZ = posZLimit + localAVHeight / 2;
1015 else if (FlyDisabled) 1133 if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
1016 { 1134 {
1017 Flying = false; 1135 pos.Z = newPosZ;
1018 } 1136 }
1137 AbsolutePosition = pos;
1138
1139 if (m_teleportFlags == TeleportFlags.Default)
1140 {
1141 Vector3 vel = Velocity;
1142 AddToPhysicalScene(isFlying);
1143 if (PhysicsActor != null)
1144 PhysicsActor.SetMomentum(vel);
1145 }
1146 else
1147 AddToPhysicalScene(isFlying);
1019 1148
1149 // XXX: This is to trigger any secondary teleport needed for a megaregion when the user has teleported to a
1150 // location outside the 'root region' (the south-west 256x256 corner). This is the earlist we can do it
1151 // since it requires a physics actor to be present. If it is left any later, then physics appears to reset
1152 // the value to a negative position which does not trigger the border cross.
1153 // This may not be the best location for this.
1154 CheckForBorderCrossing();
1155
1156 if (ForceFly)
1157 {
1158 Flying = true;
1159 }
1160 else if (FlyDisabled)
1161 {
1162 Flying = false;
1163 }
1164 }
1020 // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying 1165 // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying
1021 // avatar to return to the standing position in mid-air. On login it looks like this is being sent 1166 // avatar to return to the standing position in mid-air. On login it looks like this is being sent
1022 // elsewhere anyway 1167 // elsewhere anyway
@@ -1048,31 +1193,28 @@ namespace OpenSim.Region.Framework.Scenes
1048 // and CHANGED_REGION) when the attachments have been rezzed in the new region. This cannot currently 1193 // and CHANGED_REGION) when the attachments have been rezzed in the new region. This cannot currently
1049 // be done in AttachmentsModule.CopyAttachments(AgentData ad, IScenePresence sp) itself since we are 1194 // be done in AttachmentsModule.CopyAttachments(AgentData ad, IScenePresence sp) itself since we are
1050 // not transporting the required data. 1195 // not transporting the required data.
1051 // 1196 lock (m_attachments)
1052 // We must take a copy of the attachments list here (rather than locking) to avoid a deadlock where a script in one of
1053 // the attachments may start processing an event (which locks ScriptInstance.m_Script) that then calls a method here
1054 // which needs to lock m_attachments. ResumeScripts() needs to take a ScriptInstance.m_Script lock to try to unset the Suspend status.
1055 //
1056 // FIXME: In theory, this deadlock should not arise since scripts should not be processing events until ResumeScripts().
1057 // But XEngine starts all scripts unsuspended. Starting them suspended will not currently work because script rezzing
1058 // is placed in an asynchronous queue in XEngine and so the ResumeScripts() call will almost certainly execute before the
1059 // script is rezzed. This means the ResumeScripts() does absolutely nothing when using XEngine.
1060 List<SceneObjectGroup> attachments = GetAttachments();
1061
1062 if (attachments.Count > 0)
1063 { 1197 {
1064 m_log.DebugFormat( 1198 if (HasAttachments())
1065 "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name);
1066
1067 // Resume scripts
1068 foreach (SceneObjectGroup sog in attachments)
1069 { 1199 {
1070 sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource()); 1200 m_log.DebugFormat(
1071 sog.ResumeScripts(); 1201 "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name);
1202
1203 // Resume scripts
1204 Util.FireAndForget(delegate(object x) {
1205 foreach (SceneObjectGroup sog in m_attachments)
1206 {
1207 sog.ScheduleGroupForFullUpdate();
1208 sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
1209 sog.ResumeScripts();
1210 }
1211 });
1072 } 1212 }
1073 } 1213 }
1074 } 1214 }
1075 1215
1216 SendAvatarDataToAllAgents();
1217
1076 // send the animations of the other presences to me 1218 // send the animations of the other presences to me
1077 m_scene.ForEachRootScenePresence(delegate(ScenePresence presence) 1219 m_scene.ForEachRootScenePresence(delegate(ScenePresence presence)
1078 { 1220 {
@@ -1083,6 +1225,7 @@ namespace OpenSim.Region.Framework.Scenes
1083 // If we don't reset the movement flag here, an avatar that crosses to a neighbouring sim and returns will 1225 // If we don't reset the movement flag here, an avatar that crosses to a neighbouring sim and returns will
1084 // stall on the border crossing since the existing child agent will still have the last movement 1226 // stall on the border crossing since the existing child agent will still have the last movement
1085 // recorded, which stops the input from being processed. 1227 // recorded, which stops the input from being processed.
1228
1086 MovementFlag = 0; 1229 MovementFlag = 0;
1087 1230
1088 m_scene.EventManager.TriggerOnMakeRootAgent(this); 1231 m_scene.EventManager.TriggerOnMakeRootAgent(this);
@@ -1115,12 +1258,16 @@ namespace OpenSim.Region.Framework.Scenes
1115 /// </remarks> 1258 /// </remarks>
1116 public void MakeChildAgent() 1259 public void MakeChildAgent()
1117 { 1260 {
1261 m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
1262
1118 m_log.DebugFormat("[SCENE PRESENCE]: Making {0} a child agent in {1}", Name, Scene.RegionInfo.RegionName); 1263 m_log.DebugFormat("[SCENE PRESENCE]: Making {0} a child agent in {1}", Name, Scene.RegionInfo.RegionName);
1119 1264
1120 // Reset these so that teleporting in and walking out isn't seen 1265 // Reset these so that teleporting in and walking out isn't seen
1121 // as teleporting back 1266 // as teleporting back
1122 TeleportFlags = TeleportFlags.Default; 1267 TeleportFlags = TeleportFlags.Default;
1123 1268
1269 MovementFlag = 0;
1270
1124 // It looks like Animator is set to null somewhere, and MakeChild 1271 // It looks like Animator is set to null somewhere, and MakeChild
1125 // is called after that. Probably in aborted teleports. 1272 // is called after that. Probably in aborted teleports.
1126 if (Animator == null) 1273 if (Animator == null)
@@ -1128,6 +1275,7 @@ namespace OpenSim.Region.Framework.Scenes
1128 else 1275 else
1129 Animator.ResetAnimations(); 1276 Animator.ResetAnimations();
1130 1277
1278
1131// m_log.DebugFormat( 1279// m_log.DebugFormat(
1132// "[SCENE PRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}", 1280// "[SCENE PRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",
1133// Name, UUID, m_scene.RegionInfo.RegionName); 1281// Name, UUID, m_scene.RegionInfo.RegionName);
@@ -1139,6 +1287,7 @@ namespace OpenSim.Region.Framework.Scenes
1139 IsChildAgent = true; 1287 IsChildAgent = true;
1140 m_scene.SwapRootAgentCount(true); 1288 m_scene.SwapRootAgentCount(true);
1141 RemoveFromPhysicalScene(); 1289 RemoveFromPhysicalScene();
1290 ParentID = 0; // Child agents can't be sitting
1142 1291
1143 // FIXME: Set RegionHandle to the region handle of the scene this agent is moving into 1292 // FIXME: Set RegionHandle to the region handle of the scene this agent is moving into
1144 1293
@@ -1154,9 +1303,9 @@ namespace OpenSim.Region.Framework.Scenes
1154 { 1303 {
1155// PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients; 1304// PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients;
1156 PhysicsActor.OnOutOfBounds -= OutOfBoundsCall; 1305 PhysicsActor.OnOutOfBounds -= OutOfBoundsCall;
1157 m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
1158 PhysicsActor.UnSubscribeEvents();
1159 PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate; 1306 PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate;
1307 PhysicsActor.UnSubscribeEvents();
1308 m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
1160 PhysicsActor = null; 1309 PhysicsActor = null;
1161 } 1310 }
1162// else 1311// else
@@ -1173,7 +1322,7 @@ namespace OpenSim.Region.Framework.Scenes
1173 /// <param name="pos"></param> 1322 /// <param name="pos"></param>
1174 public void Teleport(Vector3 pos) 1323 public void Teleport(Vector3 pos)
1175 { 1324 {
1176 TeleportWithMomentum(pos, null); 1325 TeleportWithMomentum(pos, Vector3.Zero);
1177 } 1326 }
1178 1327
1179 public void TeleportWithMomentum(Vector3 pos, Vector3? v) 1328 public void TeleportWithMomentum(Vector3 pos, Vector3? v)
@@ -1197,6 +1346,41 @@ namespace OpenSim.Region.Framework.Scenes
1197 SendTerseUpdateToAllClients(); 1346 SendTerseUpdateToAllClients();
1198 } 1347 }
1199 1348
1349 public void avnLocalTeleport(Vector3 newpos, Vector3? newvel, bool rotateToVelXY)
1350 {
1351 CheckLandingPoint(ref newpos);
1352 AbsolutePosition = newpos;
1353
1354 if (newvel.HasValue)
1355 {
1356 if ((Vector3)newvel == Vector3.Zero)
1357 {
1358 if (PhysicsActor != null)
1359 PhysicsActor.SetMomentum(Vector3.Zero);
1360 m_velocity = Vector3.Zero;
1361 }
1362 else
1363 {
1364 if (PhysicsActor != null)
1365 PhysicsActor.SetMomentum((Vector3)newvel);
1366 m_velocity = (Vector3)newvel;
1367
1368 if (rotateToVelXY)
1369 {
1370 Vector3 lookAt = (Vector3)newvel;
1371 lookAt.Z = 0;
1372 lookAt.Normalize();
1373 ControllingClient.SendLocalTeleport(newpos, lookAt, (uint)TeleportFlags.ViaLocation);
1374 return;
1375 }
1376 }
1377 }
1378
1379 SendTerseUpdateToAllClients();
1380 }
1381
1382
1383
1200 public void StopFlying() 1384 public void StopFlying()
1201 { 1385 {
1202 Vector3 pos = AbsolutePosition; 1386 Vector3 pos = AbsolutePosition;
@@ -1385,6 +1569,14 @@ namespace OpenSim.Region.Framework.Scenes
1385 PhysicsActor.Size = new Vector3(0.45f, 0.6f, height); 1569 PhysicsActor.Size = new Vector3(0.45f, 0.6f, height);
1386 } 1570 }
1387 1571
1572 public void SetSize(Vector3 size, float feetoffset)
1573 {
1574// TODO: Merge the physics bits
1575// if (PhysicsActor != null && !IsChildAgent)
1576// PhysicsActor.setAvatarSize(size, feetoffset);
1577
1578 }
1579
1388 private bool WaitForUpdateAgent(IClientAPI client) 1580 private bool WaitForUpdateAgent(IClientAPI client)
1389 { 1581 {
1390 // Before the source region executes UpdateAgent 1582 // Before the source region executes UpdateAgent
@@ -1444,7 +1636,8 @@ namespace OpenSim.Region.Framework.Scenes
1444 1636
1445 Vector3 look = Velocity; 1637 Vector3 look = Velocity;
1446 1638
1447 if ((look.X == 0) && (look.Y == 0) && (look.Z == 0)) 1639 // if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
1640 if ((Math.Abs(look.X) < 0.1) && (Math.Abs(look.Y) < 0.1) && (Math.Abs(look.Z) < 0.1))
1448 { 1641 {
1449 look = new Vector3(0.99f, 0.042f, 0); 1642 look = new Vector3(0.99f, 0.042f, 0);
1450 } 1643 }
@@ -1514,11 +1707,12 @@ namespace OpenSim.Region.Framework.Scenes
1514 { 1707 {
1515 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); 1708 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
1516 if (m_agentTransfer != null) 1709 if (m_agentTransfer != null)
1517 Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); }); 1710 m_agentTransfer.EnableChildAgents(this);
1518 1711
1519 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>(); 1712 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
1520 if (friendsModule != null) 1713 if (friendsModule != null)
1521 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); 1714 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
1715
1522 } 1716 }
1523 1717
1524 // XXX: If we force an update here, then multiple attachments do appear correctly on a destination region 1718 // XXX: If we force an update here, then multiple attachments do appear correctly on a destination region
@@ -1544,36 +1738,69 @@ namespace OpenSim.Region.Framework.Scenes
1544 /// <param name="collisionPoint"></param> 1738 /// <param name="collisionPoint"></param>
1545 /// <param name="localid"></param> 1739 /// <param name="localid"></param>
1546 /// <param name="distance"></param> 1740 /// <param name="distance"></param>
1741 ///
1742
1743 private void UpdateCameraCollisionPlane(Vector4 plane)
1744 {
1745 if (m_lastCameraCollisionPlane != plane)
1746 {
1747 m_lastCameraCollisionPlane = plane;
1748 ControllingClient.SendCameraConstraint(plane);
1749 }
1750 }
1751
1547 public void RayCastCameraCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 pNormal) 1752 public void RayCastCameraCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 pNormal)
1548 { 1753 {
1549 const float POSITION_TOLERANCE = 0.02f; 1754 const float POSITION_TOLERANCE = 0.02f;
1550 const float VELOCITY_TOLERANCE = 0.02f;
1551 const float ROTATION_TOLERANCE = 0.02f; 1755 const float ROTATION_TOLERANCE = 0.02f;
1552 1756
1553 if (m_followCamAuto) 1757 m_doingCamRayCast = false;
1758 if (hitYN && localid != LocalId)
1554 { 1759 {
1555 if (hitYN) 1760 SceneObjectGroup group = m_scene.GetGroupByPrim(localid);
1761 bool IsPrim = group != null;
1762 if (IsPrim)
1556 { 1763 {
1557 CameraConstraintActive = true; 1764 SceneObjectPart part = group.GetPart(localid);
1558 //m_log.DebugFormat("[RAYCASTRESULT]: {0}, {1}, {2}, {3}", hitYN, collisionPoint, localid, distance); 1765 if (part != null && !part.VolumeDetectActive)
1559 1766 {
1560 Vector3 normal = Vector3.Normalize(new Vector3(0f, 0f, collisionPoint.Z) - collisionPoint); 1767 CameraConstraintActive = true;
1561 ControllingClient.SendCameraConstraint(new Vector4(normal.X, normal.Y, normal.Z, -1 * Vector3.Distance(new Vector3(0,0,collisionPoint.Z),collisionPoint))); 1768 pNormal.X = (float) Math.Round(pNormal.X, 2);
1769 pNormal.Y = (float) Math.Round(pNormal.Y, 2);
1770 pNormal.Z = (float) Math.Round(pNormal.Z, 2);
1771 pNormal.Normalize();
1772 collisionPoint.X = (float) Math.Round(collisionPoint.X, 1);
1773 collisionPoint.Y = (float) Math.Round(collisionPoint.Y, 1);
1774 collisionPoint.Z = (float) Math.Round(collisionPoint.Z, 1);
1775
1776 Vector4 plane = new Vector4(pNormal.X, pNormal.Y, pNormal.Z,
1777 Vector3.Dot(collisionPoint, pNormal));
1778 UpdateCameraCollisionPlane(plane);
1779 }
1562 } 1780 }
1563 else 1781 else
1564 { 1782 {
1565 if (!m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) || 1783 CameraConstraintActive = true;
1566 !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) || 1784 pNormal.X = (float) Math.Round(pNormal.X, 2);
1567 !Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE)) 1785 pNormal.Y = (float) Math.Round(pNormal.Y, 2);
1568 { 1786 pNormal.Z = (float) Math.Round(pNormal.Z, 2);
1569 if (CameraConstraintActive) 1787 pNormal.Normalize();
1570 { 1788 collisionPoint.X = (float) Math.Round(collisionPoint.X, 1);
1571 ControllingClient.SendCameraConstraint(new Vector4(0f, 0.5f, 0.9f, -3000f)); 1789 collisionPoint.Y = (float) Math.Round(collisionPoint.Y, 1);
1572 CameraConstraintActive = false; 1790 collisionPoint.Z = (float) Math.Round(collisionPoint.Z, 1);
1573 } 1791
1574 } 1792 Vector4 plane = new Vector4(pNormal.X, pNormal.Y, pNormal.Z,
1793 Vector3.Dot(collisionPoint, pNormal));
1794 UpdateCameraCollisionPlane(plane);
1575 } 1795 }
1576 } 1796 }
1797 else if (!m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) ||
1798 !Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE))
1799 {
1800 Vector4 plane = new Vector4(0.9f, 0.0f, 0.361f, -9000f); // not right...
1801 UpdateCameraCollisionPlane(plane);
1802 CameraConstraintActive = false;
1803 }
1577 } 1804 }
1578 1805
1579 /// <summary> 1806 /// <summary>
@@ -1647,6 +1874,41 @@ namespace OpenSim.Region.Framework.Scenes
1647 StandUp(); 1874 StandUp();
1648 } 1875 }
1649 1876
1877 // Raycast from the avatar's head to the camera to see if there's anything blocking the view
1878 // this exclude checks may not be complete
1879
1880 if (m_movementUpdateCount % NumMovementsBetweenRayCast == 0 && m_scene.PhysicsScene.SupportsRayCast())
1881 {
1882 if (!m_doingCamRayCast && !m_mouseLook && ParentID == 0)
1883 {
1884 Vector3 posAdjusted = AbsolutePosition;
1885// posAdjusted.Z += 0.5f * Appearance.AvatarSize.Z - 0.5f;
1886 posAdjusted.Z += 1.0f; // viewer current camera focus point
1887 Vector3 tocam = CameraPosition - posAdjusted;
1888 tocam.X = (float)Math.Round(tocam.X, 1);
1889 tocam.Y = (float)Math.Round(tocam.Y, 1);
1890 tocam.Z = (float)Math.Round(tocam.Z, 1);
1891
1892 float distTocamlen = tocam.Length();
1893 if (distTocamlen > 0.3f)
1894 {
1895 tocam *= (1.0f / distTocamlen);
1896 posAdjusted.X = (float)Math.Round(posAdjusted.X, 1);
1897 posAdjusted.Y = (float)Math.Round(posAdjusted.Y, 1);
1898 posAdjusted.Z = (float)Math.Round(posAdjusted.Z, 1);
1899
1900 m_doingCamRayCast = true;
1901 m_scene.PhysicsScene.RaycastWorld(posAdjusted, tocam, distTocamlen + 1.0f, RayCastCameraCallback);
1902 }
1903 }
1904 else if (CameraConstraintActive && (m_mouseLook || ParentID != 0))
1905 {
1906 Vector4 plane = new Vector4(0.9f, 0.0f, 0.361f, -10000f); // not right...
1907 UpdateCameraCollisionPlane(plane);
1908 CameraConstraintActive = false;
1909 }
1910 }
1911
1650 uint flagsForScripts = (uint)flags; 1912 uint flagsForScripts = (uint)flags;
1651 flags = RemoveIgnoredControls(flags, IgnoredControls); 1913 flags = RemoveIgnoredControls(flags, IgnoredControls);
1652 1914
@@ -2207,7 +2469,8 @@ namespace OpenSim.Region.Framework.Scenes
2207// m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name); 2469// m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name);
2208 2470
2209 MovingToTarget = false; 2471 MovingToTarget = false;
2210 MoveToPositionTarget = Vector3.Zero; 2472// MoveToPositionTarget = Vector3.Zero;
2473 m_forceToApply = null; // cancel possible last action
2211 2474
2212 // We need to reset the control flag as the ScenePresenceAnimator uses this to determine the correct 2475 // We need to reset the control flag as the ScenePresenceAnimator uses this to determine the correct
2213 // resting animation (e.g. hover or stand). NPCs don't have a client that will quickly reset this flag. 2476 // resting animation (e.g. hover or stand). NPCs don't have a client that will quickly reset this flag.
@@ -2230,6 +2493,9 @@ namespace OpenSim.Region.Framework.Scenes
2230 2493
2231 if (satOnObject) 2494 if (satOnObject)
2232 { 2495 {
2496 PrevSitOffset = m_pos; // Save sit offset
2497 UnRegisterSeatControls(part.ParentGroup.UUID);
2498
2233 TaskInventoryDictionary taskIDict = part.TaskInventory; 2499 TaskInventoryDictionary taskIDict = part.TaskInventory;
2234 if (taskIDict != null) 2500 if (taskIDict != null)
2235 { 2501 {
@@ -2245,6 +2511,7 @@ namespace OpenSim.Region.Framework.Scenes
2245 } 2511 }
2246 } 2512 }
2247 2513
2514 part.ParentGroup.DeleteAvatar(UUID);
2248 Vector3 sitPartWorldPosition = part.GetWorldPosition(); 2515 Vector3 sitPartWorldPosition = part.GetWorldPosition();
2249 ControllingClient.SendClearFollowCamProperties(part.ParentUUID); 2516 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
2250 2517
@@ -2305,6 +2572,9 @@ namespace OpenSim.Region.Framework.Scenes
2305 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK); 2572 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
2306 } 2573 }
2307 2574
2575 else if (PhysicsActor == null)
2576 AddToPhysicalScene(false);
2577
2308 Animator.TrySetMovementAnimation("STAND"); 2578 Animator.TrySetMovementAnimation("STAND");
2309 TriggerScenePresenceUpdated(); 2579 TriggerScenePresenceUpdated();
2310 } 2580 }
@@ -2353,11 +2623,8 @@ namespace OpenSim.Region.Framework.Scenes
2353 if (part == null) 2623 if (part == null)
2354 return; 2624 return;
2355 2625
2356 // TODO: determine position to sit at based on scene geometry; don't trust offset from client
2357 // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it
2358
2359 if (PhysicsActor != null) 2626 if (PhysicsActor != null)
2360 m_sitAvatarHeight = PhysicsActor.Size.Z; 2627 m_sitAvatarHeight = PhysicsActor.Size.Z * 0.5f;
2361 2628
2362 bool canSit = false; 2629 bool canSit = false;
2363 2630
@@ -2384,33 +2651,32 @@ namespace OpenSim.Region.Framework.Scenes
2384 } 2651 }
2385 else 2652 else
2386 { 2653 {
2654 if (PhysicsSit(part,offset)) // physics engine
2655 return;
2656
2387 Vector3 pos = part.AbsolutePosition + offset; 2657 Vector3 pos = part.AbsolutePosition + offset;
2388 2658
2389 if (Util.GetDistanceTo(AbsolutePosition, pos) <= 10) 2659 if (Util.GetDistanceTo(AbsolutePosition, pos) <= 10)
2390 { 2660 {
2391// m_log.DebugFormat(
2392// "[SCENE PRESENCE]: Sitting {0} on {1} {2} because sit target is unset and within 10m",
2393// Name, part.Name, part.LocalId);
2394
2395 AbsolutePosition = pos + new Vector3(0.0f, 0.0f, m_sitAvatarHeight); 2661 AbsolutePosition = pos + new Vector3(0.0f, 0.0f, m_sitAvatarHeight);
2396 canSit = true; 2662 canSit = true;
2397 } 2663 }
2398// else
2399// {
2400// m_log.DebugFormat(
2401// "[SCENE PRESENCE]: Ignoring sit request of {0} on {1} {2} because sit target is unset and outside 10m",
2402// Name, part.Name, part.LocalId);
2403// }
2404 } 2664 }
2405 2665
2406 if (canSit) 2666 if (canSit)
2407 { 2667 {
2668
2408 if (PhysicsActor != null) 2669 if (PhysicsActor != null)
2409 { 2670 {
2410 // We can remove the physicsActor until they stand up. 2671 // We can remove the physicsActor until they stand up.
2411 RemoveFromPhysicalScene(); 2672 RemoveFromPhysicalScene();
2412 } 2673 }
2413 2674
2675 if (MovingToTarget)
2676 ResetMoveToTarget();
2677
2678 Velocity = Vector3.Zero;
2679
2414 part.AddSittingAvatar(UUID); 2680 part.AddSittingAvatar(UUID);
2415 2681
2416 cameraAtOffset = part.GetCameraAtOffset(); 2682 cameraAtOffset = part.GetCameraAtOffset();
@@ -2454,14 +2720,6 @@ namespace OpenSim.Region.Framework.Scenes
2454 m_requestedSitTargetID = part.LocalId; 2720 m_requestedSitTargetID = part.LocalId;
2455 m_requestedSitTargetUUID = part.UUID; 2721 m_requestedSitTargetUUID = part.UUID;
2456 2722
2457// m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset);
2458
2459 if (m_scene.PhysicsScene.SupportsRayCast())
2460 {
2461 //m_scene.PhysicsScene.RaycastWorld(Vector3.Zero,Vector3.Zero, 0.01f,new RaycastCallback());
2462 //SitRayCastAvatarPosition(part);
2463 //return;
2464 }
2465 } 2723 }
2466 else 2724 else
2467 { 2725 {
@@ -2471,197 +2729,115 @@ namespace OpenSim.Region.Framework.Scenes
2471 SendSitResponse(targetID, offset, Quaternion.Identity); 2729 SendSitResponse(targetID, offset, Quaternion.Identity);
2472 } 2730 }
2473 2731
2474 /* 2732 // returns false if does not suport so older sit can be tried
2475 public void SitRayCastAvatarPosition(SceneObjectPart part) 2733 public bool PhysicsSit(SceneObjectPart part, Vector3 offset)
2476 { 2734 {
2477 Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset; 2735// TODO: Pull in these bits
2478 Vector3 StartRayCastPosition = AbsolutePosition; 2736 return false;
2479 Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition); 2737/*
2480 float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition); 2738 if (part == null || part.ParentGroup.IsAttachment)
2481 m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastAvatarPositionResponse);
2482 }
2483
2484 public void SitRayCastAvatarPositionResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal)
2485 {
2486 SceneObjectPart part = FindNextAvailableSitTarget(m_requestedSitTargetUUID);
2487 if (part != null)
2488 {
2489 if (hitYN)
2490 {
2491 if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
2492 {
2493 SitRaycastFindEdge(collisionPoint, normal);
2494 m_log.DebugFormat("[SIT]: Raycast Avatar Position succeeded at point: {0}, normal:{1}", collisionPoint, normal);
2495 }
2496 else
2497 {
2498 SitRayCastAvatarPositionCameraZ(part);
2499 }
2500 }
2501 else
2502 {
2503 SitRayCastAvatarPositionCameraZ(part);
2504 }
2505 }
2506 else
2507 { 2739 {
2508 ControllingClient.SendAlertMessage("Sit position no longer exists"); 2740 return true;
2509 m_requestedSitTargetUUID = UUID.Zero;
2510 m_requestedSitTargetID = 0;
2511 m_requestedSitOffset = Vector3.Zero;
2512 } 2741 }
2513 2742
2514 } 2743 if ( m_scene.PhysicsScene == null)
2515 2744 return false;
2516 public void SitRayCastAvatarPositionCameraZ(SceneObjectPart part)
2517 {
2518 // Next, try to raycast from the camera Z position
2519 Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
2520 Vector3 StartRayCastPosition = AbsolutePosition; StartRayCastPosition.Z = CameraPosition.Z;
2521 Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
2522 float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
2523 m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastAvatarPositionCameraZResponse);
2524 }
2525 2745
2526 public void SitRayCastAvatarPositionCameraZResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal) 2746 if (part.PhysActor == null)
2527 {
2528 SceneObjectPart part = FindNextAvailableSitTarget(m_requestedSitTargetUUID);
2529 if (part != null)
2530 { 2747 {
2531 if (hitYN) 2748 // none physcis shape
2532 { 2749 if (part.PhysicsShapeType == (byte)PhysicsShapeType.None)
2533 if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f)) 2750 ControllingClient.SendAlertMessage(" There is no suitable surface to sit on, try another spot.");
2534 {
2535 SitRaycastFindEdge(collisionPoint, normal);
2536 m_log.DebugFormat("[SIT]: Raycast Avatar Position + CameraZ succeeded at point: {0}, normal:{1}", collisionPoint, normal);
2537 }
2538 else
2539 {
2540 SitRayCastCameraPosition(part);
2541 }
2542 }
2543 else 2751 else
2544 { 2752 { // non physical phantom TODO
2545 SitRayCastCameraPosition(part); 2753 ControllingClient.SendAlertMessage(" There is no suitable surface to sit on, try another spot.");
2754 return false;
2546 } 2755 }
2547 } 2756 return true;
2548 else
2549 {
2550 ControllingClient.SendAlertMessage("Sit position no longer exists");
2551 m_requestedSitTargetUUID = UUID.Zero;
2552 m_requestedSitTargetID = 0;
2553 m_requestedSitOffset = Vector3.Zero;
2554 } 2757 }
2555 2758
2556 }
2557 2759
2558 public void SitRayCastCameraPosition(SceneObjectPart part) 2760 // not doing autopilot
2559 { 2761 m_requestedSitTargetID = 0;
2560 // Next, try to raycast from the camera position
2561 Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
2562 Vector3 StartRayCastPosition = CameraPosition;
2563 Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
2564 float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
2565 m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastCameraPositionResponse);
2566 }
2567 2762
2568 public void SitRayCastCameraPositionResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal) 2763 if (m_scene.PhysicsScene.SitAvatar(part.PhysActor, AbsolutePosition, CameraPosition, offset, new Vector3(0.35f, 0, 0.65f), PhysicsSitResponse) != 0)
2569 { 2764 return true;
2570 SceneObjectPart part = FindNextAvailableSitTarget(m_requestedSitTargetUUID);
2571 if (part != null)
2572 {
2573 if (hitYN)
2574 {
2575 if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
2576 {
2577 SitRaycastFindEdge(collisionPoint, normal);
2578 m_log.DebugFormat("[SIT]: Raycast Camera Position succeeded at point: {0}, normal:{1}", collisionPoint, normal);
2579 }
2580 else
2581 {
2582 SitRayHorizontal(part);
2583 }
2584 }
2585 else
2586 {
2587 SitRayHorizontal(part);
2588 }
2589 }
2590 else
2591 {
2592 ControllingClient.SendAlertMessage("Sit position no longer exists");
2593 m_requestedSitTargetUUID = UUID.Zero;
2594 m_requestedSitTargetID = 0;
2595 m_requestedSitOffset = Vector3.Zero;
2596 }
2597 2765
2766 return false;
2767*/
2598 } 2768 }
2599 2769
2600 public void SitRayHorizontal(SceneObjectPart part) 2770
2771 private bool CanEnterLandPosition(Vector3 testPos)
2601 { 2772 {
2602 // Next, try to raycast from the avatar position to fwd 2773 ILandObject land = m_scene.LandChannel.GetLandObject(testPos.X, testPos.Y);
2603 Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset; 2774
2604 Vector3 StartRayCastPosition = CameraPosition; 2775 if (land == null || land.LandData.Name == "NO_LAND")
2605 Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition); 2776 return true;
2606 float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition); 2777
2607 m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastHorizontalResponse); 2778 return land.CanBeOnThisLand(UUID,testPos.Z);
2608 } 2779 }
2609 2780
2610 public void SitRayCastHorizontalResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal) 2781 // status
2782 // < 0 ignore
2783 // 0 bad sit spot
2784 public void PhysicsSitResponse(int status, uint partID, Vector3 offset, Quaternion Orientation)
2611 { 2785 {
2612 SceneObjectPart part = FindNextAvailableSitTarget(m_requestedSitTargetUUID); 2786 if (status < 0)
2613 if (part != null) 2787 return;
2788
2789 if (status == 0)
2614 { 2790 {
2615 if (hitYN) 2791 ControllingClient.SendAlertMessage(" There is no suitable surface to sit on, try another spot.");
2616 { 2792 return;
2617 if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
2618 {
2619 SitRaycastFindEdge(collisionPoint, normal);
2620 m_log.DebugFormat("[SIT]: Raycast Horizontal Position succeeded at point: {0}, normal:{1}", collisionPoint, normal);
2621 // Next, try to raycast from the camera position
2622 Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
2623 Vector3 StartRayCastPosition = CameraPosition;
2624 Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
2625 float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
2626 //m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastResponseAvatarPosition);
2627 }
2628 else
2629 {
2630 ControllingClient.SendAlertMessage("Sit position not accessable.");
2631 m_requestedSitTargetUUID = UUID.Zero;
2632 m_requestedSitTargetID = 0;
2633 m_requestedSitOffset = Vector3.Zero;
2634 }
2635 }
2636 else
2637 {
2638 ControllingClient.SendAlertMessage("Sit position not accessable.");
2639 m_requestedSitTargetUUID = UUID.Zero;
2640 m_requestedSitTargetID = 0;
2641 m_requestedSitOffset = Vector3.Zero;
2642 }
2643 } 2793 }
2644 else 2794
2795 SceneObjectPart part = m_scene.GetSceneObjectPart(partID);
2796 if (part == null)
2797 return;
2798
2799 Vector3 targetPos = part.GetWorldPosition() + offset * part.GetWorldRotation();
2800 if(!CanEnterLandPosition(targetPos))
2645 { 2801 {
2646 ControllingClient.SendAlertMessage("Sit position no longer exists"); 2802 ControllingClient.SendAlertMessage(" Sit position on restricted land, try another spot");
2647 m_requestedSitTargetUUID = UUID.Zero; 2803 return;
2648 m_requestedSitTargetID = 0;
2649 m_requestedSitOffset = Vector3.Zero;
2650 } 2804 }
2651 2805
2652 } 2806 RemoveFromPhysicalScene();
2653 2807
2654 private void SitRaycastFindEdge(Vector3 collisionPoint, Vector3 collisionNormal) 2808 if (MovingToTarget)
2655 { 2809 ResetMoveToTarget();
2656 int i = 0; 2810
2657 //throw new NotImplementedException(); 2811 Velocity = Vector3.Zero;
2658 //m_requestedSitTargetUUID = UUID.Zero; 2812
2659 //m_requestedSitTargetID = 0; 2813 part.AddSittingAvatar(UUID);
2660 //m_requestedSitOffset = Vector3.Zero; 2814
2815 Vector3 cameraAtOffset = part.GetCameraAtOffset();
2816 Vector3 cameraEyeOffset = part.GetCameraEyeOffset();
2817 bool forceMouselook = part.GetForceMouselook();
2818
2819 ControllingClient.SendSitResponse(
2820 part.UUID, offset, Orientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
2821
2822 // not using autopilot
2823
2824 Rotation = Orientation;
2825 m_pos = offset;
2826
2827 m_requestedSitTargetID = 0;
2828 part.ParentGroup.AddAvatar(UUID);
2829
2830 ParentPart = part;
2831 ParentID = part.LocalId;
2832 if(status == 3)
2833 Animator.TrySetMovementAnimation("SIT_GROUND");
2834 else
2835 Animator.TrySetMovementAnimation("SIT");
2836 SendAvatarDataToAllAgents();
2661 2837
2662 SendSitResponse(ControllingClient, m_requestedSitTargetUUID, collisionPoint - m_requestedSitOffset, Quaternion.Identity); 2838 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
2663 } 2839 }
2664 */ 2840
2665 2841
2666 public void HandleAgentSit(IClientAPI remoteClient, UUID agentID) 2842 public void HandleAgentSit(IClientAPI remoteClient, UUID agentID)
2667 { 2843 {
@@ -2681,6 +2857,7 @@ namespace OpenSim.Region.Framework.Scenes
2681 return; 2857 return;
2682 } 2858 }
2683 2859
2860
2684 if (part.SitTargetAvatar == UUID) 2861 if (part.SitTargetAvatar == UUID)
2685 { 2862 {
2686 Vector3 sitTargetPos = part.SitTargetPosition; 2863 Vector3 sitTargetPos = part.SitTargetPosition;
@@ -2695,7 +2872,28 @@ namespace OpenSim.Region.Framework.Scenes
2695 2872
2696 //Quaternion result = (sitTargetOrient * vq) * nq; 2873 //Quaternion result = (sitTargetOrient * vq) * nq;
2697 2874
2698 Vector3 newPos = sitTargetPos + SIT_TARGET_ADJUSTMENT; 2875 double x, y, z, m;
2876
2877 Quaternion r = sitTargetOrient;
2878 m = r.X * r.X + r.Y * r.Y + r.Z * r.Z + r.W * r.W;
2879
2880 if (Math.Abs(1.0 - m) > 0.000001)
2881 {
2882 m = 1.0 / Math.Sqrt(m);
2883 r.X *= (float)m;
2884 r.Y *= (float)m;
2885 r.Z *= (float)m;
2886 r.W *= (float)m;
2887 }
2888
2889 x = 2 * (r.X * r.Z + r.Y * r.W);
2890 y = 2 * (-r.X * r.W + r.Y * r.Z);
2891 z = -r.X * r.X - r.Y * r.Y + r.Z * r.Z + r.W * r.W;
2892
2893 Vector3 up = new Vector3((float)x, (float)y, (float)z);
2894 Vector3 sitOffset = up * Appearance.AvatarHeight * 0.02638f;
2895
2896 Vector3 newPos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT;
2699 Quaternion newRot; 2897 Quaternion newRot;
2700 2898
2701 if (part.IsRoot) 2899 if (part.IsRoot)
@@ -2712,6 +2910,9 @@ namespace OpenSim.Region.Framework.Scenes
2712 2910
2713 m_pos = newPos; 2911 m_pos = newPos;
2714 Rotation = newRot; 2912 Rotation = newRot;
2913
2914// ParentPosition = part.AbsolutePosition;
2915 part.ParentGroup.AddAvatar(UUID);
2715 } 2916 }
2716 else 2917 else
2717 { 2918 {
@@ -2719,6 +2920,9 @@ namespace OpenSim.Region.Framework.Scenes
2719 // being sat upon. 2920 // being sat upon.
2720 m_pos -= part.GroupPosition; 2921 m_pos -= part.GroupPosition;
2721 2922
2923// ParentPosition = part.AbsolutePosition;
2924 part.ParentGroup.AddAvatar(UUID);
2925
2722// m_log.DebugFormat( 2926// m_log.DebugFormat(
2723// "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target", 2927// "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target",
2724// Name, part.AbsolutePosition, m_pos, ParentPosition, part.Name, part.LocalId); 2928// Name, part.AbsolutePosition, m_pos, ParentPosition, part.Name, part.LocalId);
@@ -2834,8 +3038,8 @@ namespace OpenSim.Region.Framework.Scenes
2834 direc.Z *= 2.6f; 3038 direc.Z *= 2.6f;
2835 3039
2836 // TODO: PreJump and jump happen too quickly. Many times prejump gets ignored. 3040 // TODO: PreJump and jump happen too quickly. Many times prejump gets ignored.
2837 Animator.TrySetMovementAnimation("PREJUMP"); 3041// Animator.TrySetMovementAnimation("PREJUMP");
2838 Animator.TrySetMovementAnimation("JUMP"); 3042// Animator.TrySetMovementAnimation("JUMP");
2839 } 3043 }
2840 } 3044 }
2841 } 3045 }
@@ -2844,6 +3048,7 @@ namespace OpenSim.Region.Framework.Scenes
2844 3048
2845 // TODO: Add the force instead of only setting it to support multiple forces per frame? 3049 // TODO: Add the force instead of only setting it to support multiple forces per frame?
2846 m_forceToApply = direc; 3050 m_forceToApply = direc;
3051 Animator.UpdateMovementAnimations();
2847 } 3052 }
2848 3053
2849 #endregion 3054 #endregion
@@ -2861,16 +3066,12 @@ namespace OpenSim.Region.Framework.Scenes
2861 // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to 3066 // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to
2862 // grab the latest PhysicsActor velocity, whereas m_velocity is often 3067 // grab the latest PhysicsActor velocity, whereas m_velocity is often
2863 // storing a requested force instead of an actual traveling velocity 3068 // storing a requested force instead of an actual traveling velocity
3069 if (Appearance.AvatarSize != m_lastSize && !IsLoggingIn)
3070 SendAvatarDataToAllAgents();
2864 3071
2865 // Throw away duplicate or insignificant updates 3072 if (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) ||
2866 if ( 3073 !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) ||
2867 // If the velocity has become zero, send it no matter what. 3074 !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE))
2868 (Velocity != m_lastVelocity && Velocity == Vector3.Zero)
2869 // otherwise, if things have changed reasonably, send the update
2870 || (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE)
2871 || !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE)
2872 || !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE)))
2873
2874 { 3075 {
2875 SendTerseUpdateToAllClients(); 3076 SendTerseUpdateToAllClients();
2876 3077
@@ -3030,9 +3231,7 @@ namespace OpenSim.Region.Framework.Scenes
3030 // again here... this comes after the cached appearance check because the avatars 3231 // again here... this comes after the cached appearance check because the avatars
3031 // appearance goes into the avatar update packet 3232 // appearance goes into the avatar update packet
3032 SendAvatarDataToAllAgents(); 3233 SendAvatarDataToAllAgents();
3033 3234 SendAppearanceToAgent(this);
3034 // This invocation always shows up in the viewer logs as an error.
3035 // SendAppearanceToAgent(this);
3036 3235
3037 // If we are using the the cached appearance then send it out to everyone 3236 // If we are using the the cached appearance then send it out to everyone
3038 if (cachedappearance) 3237 if (cachedappearance)
@@ -3063,6 +3262,8 @@ namespace OpenSim.Region.Framework.Scenes
3063 return; 3262 return;
3064 } 3263 }
3065 3264
3265 m_lastSize = Appearance.AvatarSize;
3266
3066 int count = 0; 3267 int count = 0;
3067 m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) 3268 m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
3068 { 3269 {
@@ -3170,6 +3371,8 @@ namespace OpenSim.Region.Framework.Scenes
3170 3371
3171 avatar.ControllingClient.SendAppearance( 3372 avatar.ControllingClient.SendAppearance(
3172 UUID, Appearance.VisualParams, Appearance.Texture.GetBytes()); 3373 UUID, Appearance.VisualParams, Appearance.Texture.GetBytes());
3374
3375
3173 } 3376 }
3174 3377
3175 #endregion 3378 #endregion
@@ -3243,8 +3446,9 @@ namespace OpenSim.Region.Framework.Scenes
3243 3446
3244 // If we don't have a PhysActor, we can't cross anyway 3447 // If we don't have a PhysActor, we can't cross anyway
3245 // Also don't do this while sat, sitting avatars cross with the 3448 // Also don't do this while sat, sitting avatars cross with the
3246 // object they sit on. 3449 // object they sit on. ParentUUID denoted a pending sit, don't
3247 if (ParentID != 0 || PhysicsActor == null) 3450 // interfere with it.
3451 if (ParentID != 0 || PhysicsActor == null || ParentUUID != UUID.Zero)
3248 return; 3452 return;
3249 3453
3250 if (!IsInTransit) 3454 if (!IsInTransit)
@@ -3588,6 +3792,9 @@ namespace OpenSim.Region.Framework.Scenes
3588 cAgent.AlwaysRun = SetAlwaysRun; 3792 cAgent.AlwaysRun = SetAlwaysRun;
3589 3793
3590 cAgent.Appearance = new AvatarAppearance(Appearance); 3794 cAgent.Appearance = new AvatarAppearance(Appearance);
3795
3796 cAgent.ParentPart = ParentUUID;
3797 cAgent.SitOffset = PrevSitOffset;
3591 3798
3592 lock (scriptedcontrols) 3799 lock (scriptedcontrols)
3593 { 3800 {
@@ -3596,7 +3803,7 @@ namespace OpenSim.Region.Framework.Scenes
3596 3803
3597 foreach (ScriptControllers c in scriptedcontrols.Values) 3804 foreach (ScriptControllers c in scriptedcontrols.Values)
3598 { 3805 {
3599 controls[i++] = new ControllerData(c.itemID, (uint)c.ignoreControls, (uint)c.eventControls); 3806 controls[i++] = new ControllerData(c.objectID, c.itemID, (uint)c.ignoreControls, (uint)c.eventControls);
3600 } 3807 }
3601 cAgent.Controllers = controls; 3808 cAgent.Controllers = controls;
3602 } 3809 }
@@ -3630,6 +3837,8 @@ namespace OpenSim.Region.Framework.Scenes
3630 CameraAtAxis = cAgent.AtAxis; 3837 CameraAtAxis = cAgent.AtAxis;
3631 CameraLeftAxis = cAgent.LeftAxis; 3838 CameraLeftAxis = cAgent.LeftAxis;
3632 CameraUpAxis = cAgent.UpAxis; 3839 CameraUpAxis = cAgent.UpAxis;
3840 ParentUUID = cAgent.ParentPart;
3841 PrevSitOffset = cAgent.SitOffset;
3633 3842
3634 // When we get to the point of re-computing neighbors everytime this 3843 // When we get to the point of re-computing neighbors everytime this
3635 // changes, then start using the agent's drawdistance rather than the 3844 // changes, then start using the agent's drawdistance rather than the
@@ -3667,6 +3876,7 @@ namespace OpenSim.Region.Framework.Scenes
3667 foreach (ControllerData c in cAgent.Controllers) 3876 foreach (ControllerData c in cAgent.Controllers)
3668 { 3877 {
3669 ScriptControllers sc = new ScriptControllers(); 3878 ScriptControllers sc = new ScriptControllers();
3879 sc.objectID = c.ObjectID;
3670 sc.itemID = c.ItemID; 3880 sc.itemID = c.ItemID;
3671 sc.ignoreControls = (ScriptControlled)c.IgnoreControls; 3881 sc.ignoreControls = (ScriptControlled)c.IgnoreControls;
3672 sc.eventControls = (ScriptControlled)c.EventControls; 3882 sc.eventControls = (ScriptControlled)c.EventControls;
@@ -3732,20 +3942,27 @@ namespace OpenSim.Region.Framework.Scenes
3732 } 3942 }
3733 3943
3734 if (Appearance.AvatarHeight == 0) 3944 if (Appearance.AvatarHeight == 0)
3735 Appearance.SetHeight(); 3945// Appearance.SetHeight();
3946 Appearance.SetSize(new Vector3(0.45f,0.6f,1.9f));
3736 3947
3737 PhysicsScene scene = m_scene.PhysicsScene; 3948 PhysicsScene scene = m_scene.PhysicsScene;
3738 3949
3739 Vector3 pVec = AbsolutePosition; 3950 Vector3 pVec = AbsolutePosition;
3740 3951
3952/*
3953 PhysicsActor = scene.AddAvatar(
3954 LocalId, Firstname + "." + Lastname, pVec,
3955 new Vector3(0.45f, 0.6f, Appearance.AvatarHeight), isFlying);
3956*/
3957
3741 PhysicsActor = scene.AddAvatar( 3958 PhysicsActor = scene.AddAvatar(
3742 LocalId, Firstname + "." + Lastname, pVec, 3959 LocalId, Firstname + "." + Lastname, pVec,
3743 new Vector3(0f, 0f, Appearance.AvatarHeight), isFlying); 3960 Appearance.AvatarBoxSize, isFlying);
3744 3961
3745 //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients; 3962 //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
3746 PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; 3963 PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
3747 PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong 3964 PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong
3748 PhysicsActor.SubscribeEvents(500); 3965 PhysicsActor.SubscribeEvents(100);
3749 PhysicsActor.LocalID = LocalId; 3966 PhysicsActor.LocalID = LocalId;
3750 } 3967 }
3751 3968
@@ -3759,6 +3976,7 @@ namespace OpenSim.Region.Framework.Scenes
3759 ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.", true); 3976 ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.", true);
3760 } 3977 }
3761 3978
3979
3762 /// <summary> 3980 /// <summary>
3763 /// Event called by the physics plugin to tell the avatar about a collision. 3981 /// Event called by the physics plugin to tell the avatar about a collision.
3764 /// </summary> 3982 /// </summary>
@@ -3772,7 +3990,7 @@ namespace OpenSim.Region.Framework.Scenes
3772 /// <param name="e"></param> 3990 /// <param name="e"></param>
3773 public void PhysicsCollisionUpdate(EventArgs e) 3991 public void PhysicsCollisionUpdate(EventArgs e)
3774 { 3992 {
3775 if (IsChildAgent) 3993 if (IsChildAgent || Animator == null)
3776 return; 3994 return;
3777 3995
3778 //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f)) 3996 //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f))
@@ -3789,7 +4007,6 @@ namespace OpenSim.Region.Framework.Scenes
3789 CollisionEventUpdate collisionData = (CollisionEventUpdate)e; 4007 CollisionEventUpdate collisionData = (CollisionEventUpdate)e;
3790 Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList; 4008 Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList;
3791 4009
3792 CollisionPlane = Vector4.UnitW;
3793 4010
3794// // No collisions at all means we may be flying. Update always 4011// // No collisions at all means we may be flying. Update always
3795// // to make falling work 4012// // to make falling work
@@ -3799,34 +4016,7 @@ namespace OpenSim.Region.Framework.Scenes
3799// m_lastColCount = coldata.Count; 4016// m_lastColCount = coldata.Count;
3800// } 4017// }
3801 4018
3802 if (coldata.Count != 0) 4019 CollisionPlane = Vector4.UnitW;
3803 {
3804 switch (Animator.CurrentMovementAnimation)
3805 {
3806 case "STAND":
3807 case "WALK":
3808 case "RUN":
3809 case "CROUCH":
3810 case "CROUCHWALK":
3811 {
3812 ContactPoint lowest;
3813 lowest.SurfaceNormal = Vector3.Zero;
3814 lowest.Position = Vector3.Zero;
3815 lowest.Position.Z = Single.NaN;
3816
3817 foreach (ContactPoint contact in coldata.Values)
3818 {
3819 if (Single.IsNaN(lowest.Position.Z) || contact.Position.Z < lowest.Position.Z)
3820 {
3821 lowest = contact;
3822 }
3823 }
3824
3825 CollisionPlane = new Vector4(-lowest.SurfaceNormal, -Vector3.Dot(lowest.Position, lowest.SurfaceNormal));
3826 }
3827 break;
3828 }
3829 }
3830 4020
3831 // Gods do not take damage and Invulnerable is set depending on parcel/region flags 4021 // Gods do not take damage and Invulnerable is set depending on parcel/region flags
3832 if (Invulnerable || GodLevel > 0) 4022 if (Invulnerable || GodLevel > 0)
@@ -3925,6 +4115,12 @@ namespace OpenSim.Region.Framework.Scenes
3925 // m_reprioritizationTimer.Dispose(); 4115 // m_reprioritizationTimer.Dispose();
3926 4116
3927 RemoveFromPhysicalScene(); 4117 RemoveFromPhysicalScene();
4118
4119 m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
4120
4121// if (Animator != null)
4122// Animator.Close();
4123 Animator = null;
3928 4124
3929 LifecycleState = ScenePresenceState.Removed; 4125 LifecycleState = ScenePresenceState.Removed;
3930 } 4126 }
@@ -4160,10 +4356,18 @@ namespace OpenSim.Region.Framework.Scenes
4160 4356
4161 public void RegisterControlEventsToScript(int controls, int accept, int pass_on, uint Obj_localID, UUID Script_item_UUID) 4357 public void RegisterControlEventsToScript(int controls, int accept, int pass_on, uint Obj_localID, UUID Script_item_UUID)
4162 { 4358 {
4359 SceneObjectPart p = m_scene.GetSceneObjectPart(Obj_localID);
4360 if (p == null)
4361 return;
4362
4363 ControllingClient.SendTakeControls(controls, false, false);
4364 ControllingClient.SendTakeControls(controls, true, false);
4365
4163 ScriptControllers obj = new ScriptControllers(); 4366 ScriptControllers obj = new ScriptControllers();
4164 obj.ignoreControls = ScriptControlled.CONTROL_ZERO; 4367 obj.ignoreControls = ScriptControlled.CONTROL_ZERO;
4165 obj.eventControls = ScriptControlled.CONTROL_ZERO; 4368 obj.eventControls = ScriptControlled.CONTROL_ZERO;
4166 4369
4370 obj.objectID = p.ParentGroup.UUID;
4167 obj.itemID = Script_item_UUID; 4371 obj.itemID = Script_item_UUID;
4168 if (pass_on == 0 && accept == 0) 4372 if (pass_on == 0 && accept == 0)
4169 { 4373 {
@@ -4212,6 +4416,21 @@ namespace OpenSim.Region.Framework.Scenes
4212 ControllingClient.SendTakeControls(int.MaxValue, false, false); 4416 ControllingClient.SendTakeControls(int.MaxValue, false, false);
4213 } 4417 }
4214 4418
4419 private void UnRegisterSeatControls(UUID obj)
4420 {
4421 List<UUID> takers = new List<UUID>();
4422
4423 foreach (ScriptControllers c in scriptedcontrols.Values)
4424 {
4425 if (c.objectID == obj)
4426 takers.Add(c.itemID);
4427 }
4428 foreach (UUID t in takers)
4429 {
4430 UnRegisterControlEventsToScript(0, t);
4431 }
4432 }
4433
4215 public void UnRegisterControlEventsToScript(uint Obj_localID, UUID Script_item_UUID) 4434 public void UnRegisterControlEventsToScript(uint Obj_localID, UUID Script_item_UUID)
4216 { 4435 {
4217 ScriptControllers takecontrols; 4436 ScriptControllers takecontrols;
@@ -4541,6 +4760,12 @@ namespace OpenSim.Region.Framework.Scenes
4541 4760
4542 private void CheckAndAdjustLandingPoint(ref Vector3 pos) 4761 private void CheckAndAdjustLandingPoint(ref Vector3 pos)
4543 { 4762 {
4763 string reason;
4764
4765 // Honor bans
4766 if (!m_scene.TestLandRestrictions(UUID, out reason, ref pos.X, ref pos.Y))
4767 return;
4768
4544 SceneObjectGroup telehub = null; 4769 SceneObjectGroup telehub = null;
4545 if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero && (telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject)) != null) 4770 if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero && (telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject)) != null)
4546 { 4771 {
@@ -4580,11 +4805,119 @@ namespace OpenSim.Region.Framework.Scenes
4580 pos = land.LandData.UserLocation; 4805 pos = land.LandData.UserLocation;
4581 } 4806 }
4582 } 4807 }
4583 4808
4584 land.SendLandUpdateToClient(ControllingClient); 4809 land.SendLandUpdateToClient(ControllingClient);
4585 } 4810 }
4586 } 4811 }
4587 4812
4813 private DetectedObject CreateDetObject(SceneObjectPart obj)
4814 {
4815 DetectedObject detobj = new DetectedObject();
4816 detobj.keyUUID = obj.UUID;
4817 detobj.nameStr = obj.Name;
4818 detobj.ownerUUID = obj.OwnerID;
4819 detobj.posVector = obj.AbsolutePosition;
4820 detobj.rotQuat = obj.GetWorldRotation();
4821 detobj.velVector = obj.Velocity;
4822 detobj.colliderType = 0;
4823 detobj.groupUUID = obj.GroupID;
4824
4825 return detobj;
4826 }
4827
4828 private DetectedObject CreateDetObject(ScenePresence av)
4829 {
4830 DetectedObject detobj = new DetectedObject();
4831 detobj.keyUUID = av.UUID;
4832 detobj.nameStr = av.ControllingClient.Name;
4833 detobj.ownerUUID = av.UUID;
4834 detobj.posVector = av.AbsolutePosition;
4835 detobj.rotQuat = av.Rotation;
4836 detobj.velVector = av.Velocity;
4837 detobj.colliderType = 0;
4838 detobj.groupUUID = av.ControllingClient.ActiveGroupId;
4839
4840 return detobj;
4841 }
4842
4843 private DetectedObject CreateDetObjectForGround()
4844 {
4845 DetectedObject detobj = new DetectedObject();
4846 detobj.keyUUID = UUID.Zero;
4847 detobj.nameStr = "";
4848 detobj.ownerUUID = UUID.Zero;
4849 detobj.posVector = AbsolutePosition;
4850 detobj.rotQuat = Quaternion.Identity;
4851 detobj.velVector = Vector3.Zero;
4852 detobj.colliderType = 0;
4853 detobj.groupUUID = UUID.Zero;
4854
4855 return detobj;
4856 }
4857
4858 private ColliderArgs CreateColliderArgs(SceneObjectPart dest, List<uint> colliders)
4859 {
4860 ColliderArgs colliderArgs = new ColliderArgs();
4861 List<DetectedObject> colliding = new List<DetectedObject>();
4862 foreach (uint localId in colliders)
4863 {
4864 if (localId == 0)
4865 continue;
4866
4867 SceneObjectPart obj = m_scene.GetSceneObjectPart(localId);
4868 if (obj != null)
4869 {
4870 if (!dest.CollisionFilteredOut(obj.UUID, obj.Name))
4871 colliding.Add(CreateDetObject(obj));
4872 }
4873 else
4874 {
4875 ScenePresence av = m_scene.GetScenePresence(localId);
4876 if (av != null && (!av.IsChildAgent))
4877 {
4878 if (!dest.CollisionFilteredOut(av.UUID, av.Name))
4879 colliding.Add(CreateDetObject(av));
4880 }
4881 }
4882 }
4883
4884 colliderArgs.Colliders = colliding;
4885
4886 return colliderArgs;
4887 }
4888
4889 private delegate void ScriptCollidingNotification(uint localID, ColliderArgs message);
4890
4891 private void SendCollisionEvent(SceneObjectGroup dest, scriptEvents ev, List<uint> colliders, ScriptCollidingNotification notify)
4892 {
4893 ColliderArgs CollidingMessage;
4894
4895 if (colliders.Count > 0)
4896 {
4897 if ((dest.RootPart.ScriptEvents & ev) != 0)
4898 {
4899 CollidingMessage = CreateColliderArgs(dest.RootPart, colliders);
4900
4901 if (CollidingMessage.Colliders.Count > 0)
4902 notify(dest.RootPart.LocalId, CollidingMessage);
4903 }
4904 }
4905 }
4906
4907 private void SendLandCollisionEvent(SceneObjectGroup dest, scriptEvents ev, ScriptCollidingNotification notify)
4908 {
4909 if ((dest.RootPart.ScriptEvents & ev) != 0)
4910 {
4911 ColliderArgs LandCollidingMessage = new ColliderArgs();
4912 List<DetectedObject> colliding = new List<DetectedObject>();
4913
4914 colliding.Add(CreateDetObjectForGround());
4915 LandCollidingMessage.Colliders = colliding;
4916
4917 notify(dest.RootPart.LocalId, LandCollidingMessage);
4918 }
4919 }
4920
4588 private void TeleportFlagsDebug() { 4921 private void TeleportFlagsDebug() {
4589 4922
4590 // Some temporary debugging help to show all the TeleportFlags we have... 4923 // Some temporary debugging help to show all the TeleportFlags we have...
@@ -4609,6 +4942,5 @@ namespace OpenSim.Region.Framework.Scenes
4609 m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************"); 4942 m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************");
4610 4943
4611 } 4944 }
4612
4613 } 4945 }
4614} 4946}
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
index acaeb90..0911f00 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
@@ -111,15 +111,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
111 111
112 SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene).RootPart; 112 SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene).RootPart;
113 113
114 // We need to preserve this here because phys actor is removed by the sit.
115 Vector3 spPhysActorSize = m_sp.PhysicsActor.Size;
114 m_sp.HandleAgentRequestSit(m_sp.ControllingClient, m_sp.UUID, part.UUID, Vector3.Zero); 116 m_sp.HandleAgentRequestSit(m_sp.ControllingClient, m_sp.UUID, part.UUID, Vector3.Zero);
115 117
116 // FIXME: This is different for live avatars - z position is adjusted. This is half the height of the
117 // default avatar.
118 // Curiously, Vector3.ToString() will not display the last two places of the float. For example,
119 // printing out npc.AbsolutePosition will give <0, 0, 0.8454993> not <0, 0, 0.845499337>
120 Assert.That( 118 Assert.That(
121 m_sp.AbsolutePosition, 119 m_sp.AbsolutePosition,
122 Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.845499337f))); 120 Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, spPhysActorSize.Z / 2)));
123 121
124 m_sp.StandUp(); 122 m_sp.StandUp();
125 123
@@ -147,9 +145,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
147 145
148 Assert.That(part.SitTargetAvatar, Is.EqualTo(m_sp.UUID)); 146 Assert.That(part.SitTargetAvatar, Is.EqualTo(m_sp.UUID));
149 Assert.That(m_sp.ParentID, Is.EqualTo(part.LocalId)); 147 Assert.That(m_sp.ParentID, Is.EqualTo(part.LocalId));
150 Assert.That( 148// Assert.That(
151 m_sp.AbsolutePosition, 149// m_sp.AbsolutePosition,
152 Is.EqualTo(part.AbsolutePosition + part.SitTargetPosition + ScenePresence.SIT_TARGET_ADJUSTMENT)); 150// Is.EqualTo(part.AbsolutePosition + part.SitTargetPosition + ScenePresence.SIT_TARGET_ADJUSTMENT));
153 Assert.That(m_sp.PhysicsActor, Is.Null); 151 Assert.That(m_sp.PhysicsActor, Is.Null);
154 152
155 Assert.That(part.GetSittingAvatarsCount(), Is.EqualTo(1)); 153 Assert.That(part.GetSittingAvatarsCount(), Is.EqualTo(1));
generated by cgit v1.1 at 2025-01-22 21:11:55 +0000