From a3c723ee30db61e4c2c5375fa3c8c677336ca113 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 2 Apr 2013 23:48:55 +0100
Subject: Fix minor race condition where SOP.GetGeometricCenter() and
GetCenterOfMass() could return results which were never the case if these
values were changed whilst the method was running
No need to create new Vector3s since these are structs.
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ec9e87e..2fcb199 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2136,9 +2136,9 @@ namespace OpenSim.Region.Framework.Scenes
PhysicsActor pa = PhysActor;
if (pa != null)
- return new Vector3(pa.GeometricCenter.X, pa.GeometricCenter.Y, pa.GeometricCenter.Z);
+ return pa.GeometricCenter;
else
- return new Vector3(0, 0, 0);
+ return Vector3.Zero;
}
public Vector3 GetCenterOfMass()
@@ -2146,9 +2146,9 @@ namespace OpenSim.Region.Framework.Scenes
PhysicsActor pa = PhysActor;
if (pa != null)
- return new Vector3(pa.CenterOfMass.X, pa.CenterOfMass.Y, pa.CenterOfMass.Z);
+ return pa.CenterOfMass;
else
- return new Vector3(0, 0, 0);
+ return Vector3.Zero;
}
public float GetMass()
--
cgit v1.1
From 3332af4060960a4b649d3d5237988e0f410b54e3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Apr 2013 00:01:06 +0100
Subject: minor: Make SOP.UpdateOffset() more consistent by checking against
the same old OffsetPosition rather than one which may vary if it
simultaneously changes.
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2fcb199..d412702 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3915,17 +3915,17 @@ namespace OpenSim.Region.Framework.Scenes
}
///
- ///
+ /// Update this part's offset position.
///
///
- public void UpdateOffSet(Vector3 pos)
+ public void UpdateOffSet(Vector3 newPos)
{
- if ((pos.X != OffsetPosition.X) ||
- (pos.Y != OffsetPosition.Y) ||
- (pos.Z != OffsetPosition.Z))
- {
- Vector3 newPos = new Vector3(pos.X, pos.Y, pos.Z);
+ Vector3 oldPos = OffsetPosition;
+ if ((newPos.X != oldPos.X) ||
+ (newPos.Y != oldPos.Y) ||
+ (newPos.Z != oldPos.Z))
+ {
if (ParentGroup.RootPart.GetStatusSandbox())
{
if (Util.GetDistanceTo(ParentGroup.RootPart.StatusSandboxPos, newPos) > 10)
--
cgit v1.1
From c0319daa403f68427bb80b4845a92eb37f21a7b7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Apr 2013 00:09:28 +0100
Subject: fix minor race condition in SOP.SitTargetPositionLL where
inconsistency could occur if the sit target position changed whilst the
property was fetched
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index d412702..3e816fc 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1146,7 +1146,7 @@ namespace OpenSim.Region.Framework.Scenes
// the mappings more consistant.
public Vector3 SitTargetPositionLL
{
- get { return new Vector3(m_sitTargetPosition.X, m_sitTargetPosition.Y,m_sitTargetPosition.Z); }
+ get { return m_sitTargetPosition; }
set { m_sitTargetPosition = value; }
}
--
cgit v1.1
From 97f0c9da84f9a3a73a63c209012260fa2c59c0de Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Apr 2013 00:23:20 +0100
Subject: Use consistent GroupPosition value Make SOP.UpdateGroupPosition()
rather than one that could change whilst the method is being executed.
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 3e816fc..7697411 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3902,13 +3902,14 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- public void UpdateGroupPosition(Vector3 pos)
+ public void UpdateGroupPosition(Vector3 newPos)
{
- if ((pos.X != GroupPosition.X) ||
- (pos.Y != GroupPosition.Y) ||
- (pos.Z != GroupPosition.Z))
+ Vector3 oldPos = GroupPosition;
+
+ if ((newPos.X != oldPos.X) ||
+ (newPos.Y != oldPos.Y) ||
+ (newPos.Z != oldPos.Z))
{
- Vector3 newPos = new Vector3(pos.X, pos.Y, pos.Z);
GroupPosition = newPos;
ScheduleTerseUpdate();
}
--
cgit v1.1
From 7bf1986e9138df4629aa9323d3ba9fab5c884400 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Apr 2013 00:24:33 +0100
Subject: Fix minor race condition in SOP.SitTargetOrientationLL where
inconsistent values could be returned if the sit orientation was changed
whilst the property was being fetched.
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 7697411..93d4da0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1152,17 +1152,8 @@ namespace OpenSim.Region.Framework.Scenes
public Quaternion SitTargetOrientationLL
{
- get
- {
- return new Quaternion(
- m_sitTargetOrientation.X,
- m_sitTargetOrientation.Y,
- m_sitTargetOrientation.Z,
- m_sitTargetOrientation.W
- );
- }
-
- set { m_sitTargetOrientation = new Quaternion(value.X, value.Y, value.Z, value.W); }
+ get { return m_sitTargetOrientation; }
+ set { m_sitTargetOrientation = value; }
}
public bool Stopped
--
cgit v1.1
From 94d44142e37a9191162a426f28dd23f40b0cf4aa Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Apr 2013 00:48:36 +0100
Subject: minor: Stop falsely logging that a teleport was being aborted on
client logout even when no teleport was active.
---
.../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 3e69bf2..ca0cef1 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -280,10 +280,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
private void OnConnectionClosed(IClientAPI client)
{
- if (client.IsLoggingOut)
+ if (client.IsLoggingOut && m_entityTransferStateMachine.UpdateInTransit(client.AgentId, AgentTransferState.Aborting))
{
- m_entityTransferStateMachine.UpdateInTransit(client.AgentId, AgentTransferState.Aborting);
-
m_log.DebugFormat(
"[ENTITY TRANSFER MODULE]: Aborted teleport request from {0} in {1} due to simultaneous logout",
client.Name, Scene.Name);
--
cgit v1.1
From 831e4c38506140e9ece2db4b96b4f0960a0276a8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 4 Apr 2013 00:36:15 +0100
Subject: Fix bug where outstanding llHTTPRequests for scripts were not being
aborted when they were deleted.
This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID.
This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread
so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself.
This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed.
---
.../Scripting/HttpRequest/ScriptsHttpRequests.cs | 92 +++++++++++++++-------
.../Region/Framework/Interfaces/IHttpRequests.cs | 8 +-
.../Api/Implementation/AsyncCommandManager.cs | 8 +-
3 files changed, 76 insertions(+), 32 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index c2e37c4..1c251b8 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -28,12 +28,15 @@
using System;
using System.Collections.Generic;
using System.IO;
+using System.Linq;
using System.Net;
using System.Net.Mail;
using System.Net.Security;
+using System.Reflection;
using System.Text;
using System.Threading;
using System.Security.Cryptography.X509Certificates;
+using log4net;
using Nini.Config;
using OpenMetaverse;
using OpenSim.Framework;
@@ -250,18 +253,29 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
return reqID;
}
- public void StopHttpRequest(uint m_localID, UUID m_itemID)
+ public void StopHttpRequestsForScript(UUID id)
{
if (m_pendingRequests != null)
{
+ List keysToRemove = null;
+
lock (HttpListLock)
{
- HttpRequestClass tmpReq;
- if (m_pendingRequests.TryGetValue(m_itemID, out tmpReq))
+ foreach (HttpRequestClass req in m_pendingRequests.Values)
{
- tmpReq.Stop();
- m_pendingRequests.Remove(m_itemID);
+ if (req.ItemID == id)
+ {
+ req.Stop();
+
+ if (keysToRemove == null)
+ keysToRemove = new List();
+
+ keysToRemove.Add(req.ReqID);
+ }
}
+
+ if (keysToRemove != null)
+ keysToRemove.ForEach(keyToRemove => m_pendingRequests.Remove(keyToRemove));
}
}
}
@@ -362,6 +376,8 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
public class HttpRequestClass: IServiceRequest
{
+// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
// Constants for parameters
// public const int HTTP_BODY_MAXLENGTH = 2;
// public const int HTTP_METHOD = 0;
@@ -419,12 +435,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
public void Process()
{
- httpThread = new Thread(SendRequest);
- httpThread.Name = "HttpRequestThread";
- httpThread.Priority = ThreadPriority.BelowNormal;
- httpThread.IsBackground = true;
- _finished = false;
- httpThread.Start();
+ SendRequest();
}
/*
@@ -435,10 +446,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
public void SendRequest()
{
HttpWebResponse response = null;
- StringBuilder sb = new StringBuilder();
- byte[] buf = new byte[8192];
- string tempString = null;
- int count = 0;
try
{
@@ -497,11 +504,12 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
bstream.Close();
}
- Request.Timeout = HttpTimeout;
try
{
- // execute the request
- response = (HttpWebResponse) Request.GetResponse();
+ IAsyncResult result = (IAsyncResult)Request.BeginGetResponse(ResponseCallback, null);
+
+ ThreadPool.RegisterWaitForSingleObject(
+ result.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), null, HttpTimeout, true);
}
catch (WebException e)
{
@@ -510,11 +518,31 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
throw;
}
response = (HttpWebResponse)e.Response;
+ _finished = true;
}
+ }
+ catch (Exception e)
+ {
+ Status = (int)OSHttpStatusCode.ClientErrorJoker;
+ ResponseBody = e.Message;
+ _finished = true;
+ }
+ }
+ private void ResponseCallback(IAsyncResult ar)
+ {
+ HttpWebResponse response = null;
+
+ try
+ {
+ response = (HttpWebResponse)Request.EndGetResponse(ar);
Status = (int)response.StatusCode;
Stream resStream = response.GetResponseStream();
+ StringBuilder sb = new StringBuilder();
+ byte[] buf = new byte[8192];
+ string tempString = null;
+ int count = 0;
do
{
@@ -530,36 +558,40 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
// continue building the string
sb.Append(tempString);
}
- } while (count > 0); // any more data to read?
+ }
+ while (count > 0); // any more data to read?
- ResponseBody = sb.ToString();
+ ResponseBody = sb.ToString();
}
catch (Exception e)
{
Status = (int)OSHttpStatusCode.ClientErrorJoker;
ResponseBody = e.Message;
- _finished = true;
- return;
+// m_log.Debug(
+// string.Format("[SCRIPTS HTTP REQUESTS]: Exception on response to {0} for {1} ", Url, ItemID), e);
}
finally
{
if (response != null)
response.Close();
+
+ _finished = true;
}
+ }
- _finished = true;
+ private void TimeoutCallback(object state, bool timedOut)
+ {
+ if (timedOut)
+ Request.Abort();
}
public void Stop()
{
- try
- {
- httpThread.Abort();
- }
- catch (Exception)
- {
- }
+// m_log.DebugFormat("[SCRIPTS HTTP REQUESTS]: Stopping request to {0} for {1} ", Url, ItemID);
+
+ if (Request != null)
+ Request.Abort();
}
}
}
diff --git a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
index eb6c5ac..113dcd7 100644
--- a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
+++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
@@ -45,7 +45,13 @@ namespace OpenSim.Region.Framework.Interfaces
{
UUID MakeHttpRequest(string url, string parameters, string body);
UUID StartHttpRequest(uint localID, UUID itemID, string url, List parameters, Dictionary headers, string body);
- void StopHttpRequest(uint m_localID, UUID m_itemID);
+
+ ///
+ /// Stop and remove all http requests for the given script.
+ ///
+ ///
+ void StopHttpRequestsForScript(UUID id);
+
IServiceRequest GetNextCompletedRequest();
void RemoveCompletedRequest(UUID id);
}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 47a9cdc..1c59624 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -28,7 +28,9 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using System.Reflection;
using System.Threading;
+using log4net;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Monitoring;
@@ -45,6 +47,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
///
public class AsyncCommandManager
{
+// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
private static Thread cmdHandlerThread;
private static int cmdHandlerThreadCycleSleepms;
@@ -225,6 +229,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
///
public static void RemoveScript(IScriptEngine engine, uint localID, UUID itemID)
{
+// m_log.DebugFormat("[ASYNC COMMAND MANAGER]: Removing facilities for script {0}", itemID);
+
// Remove a specific script
// Remove dataserver events
@@ -236,7 +242,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// Remove from: HttpRequest
IHttpRequestModule iHttpReq = engine.World.RequestModuleInterface();
if (iHttpReq != null)
- iHttpReq.StopHttpRequest(localID, itemID);
+ iHttpReq.StopHttpRequestsForScript(itemID);
IWorldComm comms = engine.World.RequestModuleInterface();
if (comms != null)
--
cgit v1.1
From f281a994e8544d95961ef669a0fe14c0cba7f175 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 4 Apr 2013 00:49:07 +0100
Subject: refactor: Simplify ScriptsHttpRequests.GetNextCompletedRequest to
more simply iterate through pending requests without unnecessary checks.
---
.../Scripting/HttpRequest/ScriptsHttpRequests.cs | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 1c251b8..ebf56cd 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -293,19 +293,13 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
{
lock (HttpListLock)
{
- foreach (UUID luid in m_pendingRequests.Keys)
+ foreach (HttpRequestClass req in m_pendingRequests.Values)
{
- HttpRequestClass tmpReq;
-
- if (m_pendingRequests.TryGetValue(luid, out tmpReq))
- {
- if (tmpReq.Finished)
- {
- return tmpReq;
- }
- }
+ if (req.Finished)
+ return req;
}
}
+
return null;
}
--
cgit v1.1
From f064075a85962039f4737ec9ca631c377a6197c9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 4 Apr 2013 01:06:57 +0100
Subject: Fix XmlRpcAdmin admin_exists_user call so that it actually returns
the last user login time rather than serializing the DateTime directly which
generates a set of unexpected fields.
lastlogin return is in unix timestamp format.
---
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 5d44b2a..d19b8b6 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1094,7 +1094,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
{
GridUserInfo userInfo = m_application.SceneManager.CurrentOrFirstScene.GridUserService.GetGridUserInfo(account.PrincipalID.ToString());
if (userInfo != null)
- responseData["lastlogin"] = userInfo.Login;
+ responseData["lastlogin"] = Util.ToUnixTime(userInfo.Login);
else
responseData["lastlogin"] = 0;
--
cgit v1.1
From d2367968e4227f8a6e37d22ed5904c4f1d87a15e Mon Sep 17 00:00:00 2001
From: teravus
Date: Thu, 4 Apr 2013 19:10:23 -0400
Subject: * In between the fog, a moment of clarity. This fixes mantis 6570
---
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index dfdd566..96a030b 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -453,7 +453,7 @@ namespace OpenSim.Framework.Servers.HttpServer
}
OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
-
+ resp.ReuseContext = true;
HandleRequest(req, resp);
--
cgit v1.1
From 0f008d5f7d4a34d4f7529036f5dd83742423c42f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 6 Apr 2013 01:44:06 +0100
Subject: When rezzing a coalesced object, check adjust position of all
components.
---
.../InventoryAccess/InventoryAccessModule.cs | 47 +++++++++++++---------
1 file changed, 27 insertions(+), 20 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index eaf4ce2..ebada5a 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -807,7 +807,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
}
}
- if (item != null && !DoPreRezWhenFromItem(remoteClient, item, objlist, pos, attachment))
+ if (item != null && !DoPreRezWhenFromItem(remoteClient, item, objlist, pos, veclist, attachment))
return null;
for (int i = 0; i < objlist.Count; i++)
@@ -905,10 +905,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
///
///
///
+ ///
+ /// List of vector position adjustments for a coalesced objects. For ordinary objects
+ /// this list will contain just Vector3.Zero. The order of adjustments must match the order of objlist
+ ///
///
/// true if we can processed with rezzing, false if we need to abort
private bool DoPreRezWhenFromItem(
- IClientAPI remoteClient, InventoryItemBase item, List objlist, Vector3 pos, bool isAttachment)
+ IClientAPI remoteClient, InventoryItemBase item, List objlist,
+ Vector3 pos, List veclist, bool isAttachment)
{
UUID fromUserInventoryItemId = UUID.Zero;
@@ -932,27 +937,29 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
}
int primcount = 0;
- foreach (SceneObjectGroup g in objlist)
- primcount += g.PrimCount;
-
- if (!m_Scene.Permissions.CanRezObject(
- primcount, remoteClient.AgentId, pos)
- && !isAttachment)
+ for(int i = 0; i < objlist.Count; i++)
{
- // The client operates in no fail mode. It will
- // have already removed the item from the folder
- // if it's no copy.
- // Put it back if it's not an attachment
- //
- if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!isAttachment))
- remoteClient.SendBulkUpdateInventory(item);
+ SceneObjectGroup g = objlist[i];
+
+ if (!m_Scene.Permissions.CanRezObject(
+ g.PrimCount, remoteClient.AgentId, pos + veclist[i])
+ && !isAttachment)
+ {
+ // The client operates in no fail mode. It will
+ // have already removed the item from the folder
+ // if it's no copy.
+ // Put it back if it's not an attachment
+ //
+ if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!isAttachment))
+ remoteClient.SendBulkUpdateInventory(item);
- ILandObject land = m_Scene.LandChannel.GetLandObject(pos.X, pos.Y);
- remoteClient.SendAlertMessage(string.Format(
- "Can't rez object '{0}' at <{1:F3}, {2:F3}, {3:F3}> on parcel '{4}' in region {5}.",
- item.Name, pos.X, pos.Y, pos.Z, land != null ? land.LandData.Name : "Unknown", m_Scene.RegionInfo.RegionName));
+ ILandObject land = m_Scene.LandChannel.GetLandObject(pos.X, pos.Y);
+ remoteClient.SendAlertMessage(string.Format(
+ "Can't rez object '{0}' at <{1:F3}, {2:F3}, {3:F3}> on parcel '{4}' in region {5}.",
+ item.Name, pos.X, pos.Y, pos.Z, land != null ? land.LandData.Name : "Unknown", m_Scene.Name));
- return false;
+ return false;
+ }
}
for (int i = 0; i < objlist.Count; i++)
--
cgit v1.1
From 7f070236f72058ba22d017048b978adea380f0a1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 6 Apr 2013 02:34:51 +0100
Subject: Fix taking (and rezzing) of coalesced objects in the non-root
subregions of megaregions.
This fixes the combined bounding box location for regions bigger than 256x256.
It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead.
It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region.
Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595. Thanks!
---
.../InventoryAccess/InventoryAccessModule.cs | 32 ++++-----
.../World/Permissions/PermissionsModule.cs | 2 +
OpenSim/Region/Framework/Scenes/Scene.cs | 12 ++--
.../RegionCombinerLargeLandChannel.cs | 83 ++++++++++++++--------
4 files changed, 76 insertions(+), 53 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index ebada5a..f796ec9 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -357,19 +357,19 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
foreach (SceneObjectGroup objectGroup in objlist)
{
- Vector3 inventoryStoredPosition = new Vector3
- (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
- ? 250
- : objectGroup.AbsolutePosition.X)
- ,
- (objectGroup.AbsolutePosition.Y > (int)Constants.RegionSize)
- ? 250
- : objectGroup.AbsolutePosition.Y,
- objectGroup.AbsolutePosition.Z);
-
- originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;
-
- objectGroup.AbsolutePosition = inventoryStoredPosition;
+// Vector3 inventoryStoredPosition = new Vector3
+// (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
+// ? 250
+// : objectGroup.AbsolutePosition.X)
+// ,
+// (objectGroup.AbsolutePosition.Y > (int)Constants.RegionSize)
+// ? 250
+// : objectGroup.AbsolutePosition.Y,
+// objectGroup.AbsolutePosition.Z);
+//
+// originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;
+//
+// objectGroup.AbsolutePosition = inventoryStoredPosition;
// Make sure all bits but the ones we want are clear
// on take.
@@ -397,9 +397,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
else
itemXml = SceneObjectSerializer.ToOriginalXmlFormat(objlist[0], !asAttachment);
- // Restore the position of each group now that it has been stored to inventory.
- foreach (SceneObjectGroup objectGroup in objlist)
- objectGroup.AbsolutePosition = originalPositions[objectGroup.UUID];
+// // Restore the position of each group now that it has been stored to inventory.
+// foreach (SceneObjectGroup objectGroup in objlist)
+// objectGroup.AbsolutePosition = originalPositions[objectGroup.UUID];
InventoryItemBase item = CreateItemForObject(action, remoteClient, objlist[0], folderID);
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 79dd4a0..77299be 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -1453,6 +1453,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
bool permission = false;
+ m_log.DebugFormat("[PERMISSIONS MODULE]: Checking rez object at {0} in {1}", objectPosition, m_scene.Name);
+
ILandObject land = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
if (land == null) return false;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 911a3e4..f50d3cd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5361,12 +5361,12 @@ namespace OpenSim.Region.Framework.Scenes
List objects,
out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ)
{
- minX = 256;
- maxX = -256;
- minY = 256;
- maxY = -256;
- minZ = 8192;
- maxZ = -256;
+ minX = float.MaxValue;
+ maxX = float.MinValue;
+ minY = float.MaxValue;
+ maxY = float.MinValue;
+ minZ = float.MaxValue;
+ maxZ = float.MinValue;
List offsets = new List();
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
index b4abc1d..4bf2a82 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
@@ -27,6 +27,8 @@
using System;
using System.Collections.Generic;
+using System.Reflection;
+using log4net;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
@@ -34,10 +36,10 @@ using OpenSim.Region.CoreModules.World.Land;
namespace OpenSim.Region.RegionCombinerModule
{
-public class RegionCombinerLargeLandChannel : ILandChannel
+ public class RegionCombinerLargeLandChannel : ILandChannel
{
- // private static readonly ILog m_log =
- // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
private RegionData RegData;
private ILandChannel RootRegionLandChannel;
private readonly List RegionConnections;
@@ -75,40 +77,51 @@ public class RegionCombinerLargeLandChannel : ILandChannel
public ILandObject GetLandObject(int x, int y)
{
- //m_log.DebugFormat("[BIGLANDTESTINT]: <{0},{1}>", x, y);
-
- if (x > 0 && x <= (int)Constants.RegionSize && y > 0 && y <= (int)Constants.RegionSize)
- {
- return RootRegionLandChannel.GetLandObject(x, y);
- }
- else
- {
- int offsetX = (x / (int)Constants.RegionSize);
- int offsetY = (y / (int)Constants.RegionSize);
- offsetX *= (int)Constants.RegionSize;
- offsetY *= (int)Constants.RegionSize;
-
- foreach (RegionData regionData in RegionConnections)
- {
- if (regionData.Offset.X == offsetX && regionData.Offset.Y == offsetY)
- {
- return regionData.RegionScene.LandChannel.GetLandObject(x - offsetX, y - offsetY);
- }
- }
- ILandObject obj = new LandObject(UUID.Zero, false, RegData.RegionScene);
- obj.LandData.Name = "NO LAND";
- return obj;
- }
+ return GetLandObject((float)x, (float)y);
+
+// m_log.DebugFormat("[BIGLANDTESTINT]: <{0},{1}>", x, y);
+//
+// if (x > 0 && x <= (int)Constants.RegionSize && y > 0 && y <= (int)Constants.RegionSize)
+// {
+// return RootRegionLandChannel.GetLandObject(x, y);
+// }
+// else
+// {
+// int offsetX = (x / (int)Constants.RegionSize);
+// int offsetY = (y / (int)Constants.RegionSize);
+// offsetX *= (int)Constants.RegionSize;
+// offsetY *= (int)Constants.RegionSize;
+//
+// foreach (RegionData regionData in RegionConnections)
+// {
+// if (regionData.Offset.X == offsetX && regionData.Offset.Y == offsetY)
+// {
+// m_log.DebugFormat(
+// "[REGION COMBINER LARGE LAND CHANNEL]: Found region {0} at offset {1},{2}",
+// regionData.RegionScene.Name, offsetX, offsetY);
+//
+// return regionData.RegionScene.LandChannel.GetLandObject(x - offsetX, y - offsetY);
+// }
+// }
+// //ILandObject obj = new LandObject(UUID.Zero, false, RegData.RegionScene);
+// //obj.LandData.Name = "NO LAND";
+// //return obj;
+// }
+//
+// m_log.DebugFormat("[REGION COMBINER LARGE LAND CHANNEL]: No region found at {0},{1}, returning null", x, y);
+//
+// return null;
}
public ILandObject GetLandObject(int localID)
{
+ // XXX: Possibly should be looking in every land channel, not just the root.
return RootRegionLandChannel.GetLandObject(localID);
}
public ILandObject GetLandObject(float x, float y)
{
- //m_log.DebugFormat("[BIGLANDTESTFLOAT]: <{0},{1}>", x, y);
+// m_log.DebugFormat("[BIGLANDTESTFLOAT]: <{0},{1}>", x, y);
if (x > 0 && x <= (int)Constants.RegionSize && y > 0 && y <= (int)Constants.RegionSize)
{
@@ -125,14 +138,22 @@ public class RegionCombinerLargeLandChannel : ILandChannel
{
if (regionData.Offset.X == offsetX && regionData.Offset.Y == offsetY)
{
+// m_log.DebugFormat(
+// "[REGION COMBINER LARGE LAND CHANNEL]: Found region {0} at offset {1},{2}",
+// regionData.RegionScene.Name, offsetX, offsetY);
+
return regionData.RegionScene.LandChannel.GetLandObject(x - offsetX, y - offsetY);
}
}
- ILandObject obj = new LandObject(UUID.Zero, false, RegData.RegionScene);
- obj.LandData.Name = "NO LAND";
- return obj;
+// ILandObject obj = new LandObject(UUID.Zero, false, RegData.RegionScene);
+// obj.LandData.Name = "NO LAND";
+// return obj;
}
+
+// m_log.DebugFormat("[REGION COMBINER LARGE LAND CHANNEL]: No region found at {0},{1}, returning null", x, y);
+
+ return null;
}
public bool IsForcefulBansAllowed()
--
cgit v1.1
From c7cd077e55c2e889f61bb2e28cd3254b15e07567 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Sun, 7 Apr 2013 17:31:44 -0700
Subject: Optimize the number of Simian calls to get the initial presence
information for the friends list. This is a pretty big performance
improvement on login. Note that you must upgrade simian to incorporate the
corresponding GetSessions call.
---
.../SimianGrid/SimianPresenceServiceConnector.cs | 193 +++++++++------------
1 file changed, 83 insertions(+), 110 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 854bea4..7bb06fb 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -137,10 +137,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
userID, sessionID, secureSessionID);
NameValueCollection requestArgs = new NameValueCollection
- {
- { "RequestMethod", "AddSession" },
- { "UserID", userID.ToString() }
- };
+ {
+ { "RequestMethod", "AddSession" },
+ { "UserID", userID.ToString() }
+ };
+
if (sessionID != UUID.Zero)
{
requestArgs["SessionID"] = sessionID.ToString();
@@ -158,13 +159,13 @@ namespace OpenSim.Services.Connectors.SimianGrid
public bool LogoutAgent(UUID sessionID)
{
-// m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for agent with sessionID " + sessionID);
+ // m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for agent with sessionID " + sessionID);
NameValueCollection requestArgs = new NameValueCollection
- {
- { "RequestMethod", "RemoveSession" },
- { "SessionID", sessionID.ToString() }
- };
+ {
+ { "RequestMethod", "RemoveSession" },
+ { "SessionID", sessionID.ToString() }
+ };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean();
@@ -177,13 +178,13 @@ namespace OpenSim.Services.Connectors.SimianGrid
public bool LogoutRegionAgents(UUID regionID)
{
-// m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for all agents in region " + regionID);
+ // m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for all agents in region " + regionID);
NameValueCollection requestArgs = new NameValueCollection
- {
- { "RequestMethod", "RemoveSessions" },
- { "SceneID", regionID.ToString() }
- };
+ {
+ { "RequestMethod", "RemoveSessions" },
+ { "SceneID", regionID.ToString() }
+ };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean();
@@ -202,49 +203,46 @@ namespace OpenSim.Services.Connectors.SimianGrid
public PresenceInfo GetAgent(UUID sessionID)
{
-// m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent with sessionID " + sessionID);
-
- NameValueCollection requestArgs = new NameValueCollection
- {
- { "RequestMethod", "GetSession" },
- { "SessionID", sessionID.ToString() }
- };
-
- OSDMap sessionResponse = WebUtil.PostToService(m_serverUrl, requestArgs);
- if (sessionResponse["Success"].AsBoolean())
+ OSDMap sessionResponse = GetSessionDataFromSessionID(sessionID);
+ if (sessionResponse == null)
{
- UUID userID = sessionResponse["UserID"].AsUUID();
- m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID);
-
- requestArgs = new NameValueCollection
- {
- { "RequestMethod", "GetUser" },
- { "UserID", userID.ToString() }
- };
-
- OSDMap userResponse = WebUtil.PostToService(m_serverUrl, requestArgs);
- if (userResponse["Success"].AsBoolean())
- return ResponseToPresenceInfo(sessionResponse, userResponse);
- else
- m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + userResponse["Message"].AsString());
+ m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session {0}: {1}",sessionID.ToString(),sessionResponse["Message"].AsString());
+ return null;
}
- else
+
+ UUID userID = sessionResponse["UserID"].AsUUID();
+ OSDMap userResponse = GetUserData(userID);
+ if (userResponse == null)
{
- m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session " + sessionID + ": " + sessionResponse["Message"].AsString());
+ m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for {0}: {1}",userID.ToString(),userResponse["Message"].AsString());
+ return null;
}
- return null;
+ return ResponseToPresenceInfo(sessionResponse);
}
public PresenceInfo[] GetAgents(string[] userIDs)
{
- List presences = new List(userIDs.Length);
+ List presences = new List();
- for (int i = 0; i < userIDs.Length; i++)
+ NameValueCollection requestArgs = new NameValueCollection
+ {
+ { "RequestMethod", "GetSessions" },
+ { "UserIDList", String.Join(",",userIDs) }
+ };
+
+ OSDMap sessionListResponse = WebUtil.PostToService(m_serverUrl, requestArgs);
+ if (! sessionListResponse["Success"].AsBoolean())
{
- UUID userID;
- if (UUID.TryParse(userIDs[i], out userID) && userID != UUID.Zero)
- presences.AddRange(GetSessions(userID));
+ m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions: {0}",sessionListResponse["Message"].AsString());
+ return null;
+ }
+
+ OSDArray sessionList = sessionListResponse["Sessions"] as OSDArray;
+ for (int i = 0; i < sessionList.Count; i++)
+ {
+ OSDMap sessionInfo = sessionList[i] as OSDMap;
+ presences.Add(ResponseToPresenceInfo(sessionInfo));
}
return presences.ToArray();
@@ -262,7 +260,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
{
-// m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Logging out user " + userID);
+ // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Logging out user " + userID);
// Remove the session to mark this user offline
if (!LogoutAgent(sessionID))
@@ -270,11 +268,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
// Save our last position as user data
NameValueCollection requestArgs = new NameValueCollection
- {
- { "RequestMethod", "AddUserData" },
- { "UserID", userID.ToString() },
- { "LastLocation", SerializeLocation(regionID, lastPosition, lastLookAt) }
- };
+ {
+ { "RequestMethod", "AddUserData" },
+ { "UserID", userID.ToString() },
+ { "LastLocation", SerializeLocation(regionID, lastPosition, lastLookAt) }
+ };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean();
@@ -287,14 +285,14 @@ namespace OpenSim.Services.Connectors.SimianGrid
public bool SetHome(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
{
-// m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Setting home location for user " + userID);
+ // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Setting home location for user " + userID);
NameValueCollection requestArgs = new NameValueCollection
- {
- { "RequestMethod", "AddUserData" },
- { "UserID", userID.ToString() },
- { "HomeLocation", SerializeLocation(regionID, position, lookAt) }
- };
+ {
+ { "RequestMethod", "AddUserData" },
+ { "UserID", userID.ToString() },
+ { "HomeLocation", SerializeLocation(regionID, position, lookAt) }
+ };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean();
@@ -312,23 +310,14 @@ namespace OpenSim.Services.Connectors.SimianGrid
public GridUserInfo GetGridUserInfo(string user)
{
-// m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user);
+ // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user);
UUID userID = new UUID(user);
-// m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID);
-
- NameValueCollection requestArgs = new NameValueCollection
- {
- { "RequestMethod", "GetUser" },
- { "UserID", userID.ToString() }
- };
-
- OSDMap userResponse = WebUtil.PostToService(m_serverUrl, requestArgs);
- if (userResponse["Success"].AsBoolean())
+ OSDMap userResponse = GetUserData(userID);
+ if (userResponse != null)
return ResponseToGridUserInfo(userResponse);
- else
- m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + userResponse["Message"].AsString());
+ m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for {0}: {1}",userID,userResponse["Message"].AsString());
return null;
}
@@ -338,65 +327,49 @@ namespace OpenSim.Services.Connectors.SimianGrid
private OSDMap GetUserData(UUID userID)
{
-// m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID);
+ // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID);
NameValueCollection requestArgs = new NameValueCollection
- {
- { "RequestMethod", "GetUser" },
- { "UserID", userID.ToString() }
- };
+ {
+ { "RequestMethod", "GetUser" },
+ { "UserID", userID.ToString() }
+ };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean() && response["User"] is OSDMap)
return response;
- else
- m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + response["Message"].AsString());
+ m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for {0}; {1}",userID.ToString(),response["Message"].AsString());
return null;
}
- private List GetSessions(UUID userID)
+ private OSDMap GetSessionDataFromSessionID(UUID sessionID)
{
- List presences = new List(1);
-
- OSDMap userResponse = GetUserData(userID);
- if (userResponse != null)
- {
-// m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting sessions for " + userID);
-
- NameValueCollection requestArgs = new NameValueCollection
+ NameValueCollection requestArgs = new NameValueCollection
{
- { "RequestMethod", "GetSession" },
- { "UserID", userID.ToString() }
+ { "RequestMethod", "GetSession" },
+ { "SessionID", sessionID.ToString() }
};
- OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
- if (response["Success"].AsBoolean())
- {
- PresenceInfo presence = ResponseToPresenceInfo(response, userResponse);
- if (presence != null)
- presences.Add(presence);
- }
-// else
-// {
-// m_log.Debug("[SIMIAN PRESENCE CONNECTOR]: No session returned for " + userID + ": " + response["Message"].AsString());
-// }
- }
+ OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+ if (response["Success"].AsBoolean())
+ return response;
- return presences;
+ m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session data for {0}; {1}",sessionID.ToString(),response["Message"].AsString());
+ return null;
}
private bool UpdateSession(UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
{
// Save our current location as session data
NameValueCollection requestArgs = new NameValueCollection
- {
- { "RequestMethod", "UpdateSession" },
- { "SessionID", sessionID.ToString() },
- { "SceneID", regionID.ToString() },
- { "ScenePosition", lastPosition.ToString() },
- { "SceneLookAt", lastLookAt.ToString() }
- };
+ {
+ { "RequestMethod", "UpdateSession" },
+ { "SessionID", sessionID.ToString() },
+ { "SceneID", regionID.ToString() },
+ { "ScenePosition", lastPosition.ToString() },
+ { "SceneLookAt", lastLookAt.ToString() }
+ };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean();
@@ -407,7 +380,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
return success;
}
- private PresenceInfo ResponseToPresenceInfo(OSDMap sessionResponse, OSDMap userResponse)
+ private PresenceInfo ResponseToPresenceInfo(OSDMap sessionResponse)
{
if (sessionResponse == null)
return null;
--
cgit v1.1
From fe16dc09da3f2736fad5a9e792f5f81098b5f9a1 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 7 Apr 2013 08:27:49 -0700
Subject: BulletSim: complete movement of physical object action code out of
the physical object and into actors for setForce, setTorque, hover, lock axis
and avatar move.
---
.../Physics/BulletSPlugin/BSActorAvatarMove.cs | 287 +++++++++++++++++++
.../Region/Physics/BulletSPlugin/BSActorHover.cs | 176 ++++++++++++
.../Physics/BulletSPlugin/BSActorLockAxis.cs | 4 +-
.../Physics/BulletSPlugin/BSActorMoveToTarget.cs | 156 +++++++++++
.../Physics/BulletSPlugin/BSActorSetForce.cs | 137 +++++++++
.../Physics/BulletSPlugin/BSActorSetTorque.cs | 138 +++++++++
OpenSim/Region/Physics/BulletSPlugin/BSActors.cs | 12 +-
.../Region/Physics/BulletSPlugin/BSCharacter.cs | 268 +++---------------
.../Region/Physics/BulletSPlugin/BSPhysObject.cs | 226 ++++++---------
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 307 ++++-----------------
.../Region/Physics/BulletSPlugin/BulletSimTODO.txt | 3 +-
11 files changed, 1078 insertions(+), 636 deletions(-)
create mode 100755 OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
create mode 100755 OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
create mode 100755 OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
create mode 100755 OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
create mode 100755 OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
new file mode 100755
index 0000000..634a898
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -0,0 +1,287 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyrightD
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using OpenSim.Region.Physics.Manager;
+
+using OMV = OpenMetaverse;
+
+namespace OpenSim.Region.Physics.BulletSPlugin
+{
+public class BSActorAvatarMove : BSActor
+{
+ BSVMotor m_velocityMotor;
+
+ public BSActorAvatarMove(BSScene physicsScene, BSPhysObject pObj, string actorName)
+ : base(physicsScene, pObj, actorName)
+ {
+ m_velocityMotor = null;
+ m_physicsScene.DetailLog("{0},BSActorAvatarMove,constructor", m_controllingPrim.LocalID);
+ }
+
+ // BSActor.isActive
+ public override bool isActive
+ {
+ get { return Enabled && m_controllingPrim.IsPhysicallyActive; }
+ }
+
+ // Release any connections and resources used by the actor.
+ // BSActor.Dispose()
+ public override void Dispose()
+ {
+ Enabled = false;
+ }
+
+ // Called when physical parameters (properties set in Bullet) need to be re-applied.
+ // Called at taint-time.
+ // BSActor.Refresh()
+ public override void Refresh()
+ {
+ m_physicsScene.DetailLog("{0},BSActorAvatarMove,refresh", m_controllingPrim.LocalID);
+
+ // If not active any more, get rid of me (shouldn't ever happen, but just to be safe)
+ if (m_controllingPrim.RawForce == OMV.Vector3.Zero)
+ {
+ m_physicsScene.DetailLog("{0},BSActorAvatarMove,refresh,notAvatarMove,removing={1}", m_controllingPrim.LocalID, ActorName);
+ m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
+ return;
+ }
+
+ // If the object is physically active, add the hoverer prestep action
+ if (isActive)
+ {
+ ActivateAvatarMove();
+ }
+ else
+ {
+ DeactivateAvatarMove();
+ }
+ }
+
+ // The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
+ // Register a prestep action to restore physical requirements before the next simulation step.
+ // Called at taint-time.
+ // BSActor.RemoveBodyDependencies()
+ public override void RemoveBodyDependencies()
+ {
+ // Nothing to do for the hoverer since it is all software at pre-step action time.
+ }
+
+ public void SetVelocityAndTarget(OMV.Vector3 vel, OMV.Vector3 targ, bool inTaintTime)
+ {
+ m_physicsScene.TaintedObject(inTaintTime, "BSActorAvatarMove.setVelocityAndTarget", delegate()
+ {
+ m_velocityMotor.Reset();
+ m_velocityMotor.SetTarget(targ);
+ m_velocityMotor.SetCurrent(vel);
+ m_velocityMotor.Enabled = true;
+ });
+ }
+
+ // If a hover motor has not been created, create one and start the hovering.
+ private void ActivateAvatarMove()
+ {
+ if (m_velocityMotor == null)
+ {
+ // Infinite decay and timescale values so motor only changes current to target values.
+ m_velocityMotor = new BSVMotor("BSCharacter.Velocity",
+ 0.2f, // time scale
+ BSMotor.Infinite, // decay time scale
+ BSMotor.InfiniteVector, // friction timescale
+ 1f // efficiency
+ );
+ // _velocityMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG so motor will output detail log messages.
+
+ m_physicsScene.BeforeStep += Mover;
+ }
+ }
+
+ private void DeactivateAvatarMove()
+ {
+ if (m_velocityMotor != null)
+ {
+ m_physicsScene.BeforeStep -= Mover;
+ m_velocityMotor = null;
+ }
+ }
+
+ // Called just before the simulation step. Update the vertical position for hoverness.
+ private void Mover(float timeStep)
+ {
+ // Don't do movement while the object is selected.
+ if (!isActive)
+ return;
+
+ // TODO: Decide if the step parameters should be changed depending on the avatar's
+ // state (flying, colliding, ...). There is code in ODE to do this.
+
+ // COMMENTARY: when the user is making the avatar walk, except for falling, the velocity
+ // specified for the avatar is the one that should be used. For falling, if the avatar
+ // is not flying and is not colliding then it is presumed to be falling and the Z
+ // component is not fooled with (thus allowing gravity to do its thing).
+ // When the avatar is standing, though, the user has specified a velocity of zero and
+ // the avatar should be standing. But if the avatar is pushed by something in the world
+ // (raising elevator platform, moving vehicle, ...) the avatar should be allowed to
+ // move. Thus, the velocity cannot be forced to zero. The problem is that small velocity
+ // errors can creap in and the avatar will slowly float off in some direction.
+ // So, the problem is that, when an avatar is standing, we cannot tell creaping error
+ // from real pushing.
+ // The code below uses whether the collider is static or moving to decide whether to zero motion.
+
+ m_velocityMotor.Step(timeStep);
+ m_controllingPrim.IsStationary = false;
+
+ // If we're not supposed to be moving, make sure things are zero.
+ if (m_velocityMotor.ErrorIsZero() && m_velocityMotor.TargetValue == OMV.Vector3.Zero)
+ {
+ // The avatar shouldn't be moving
+ m_velocityMotor.Zero();
+
+ if (m_controllingPrim.IsColliding)
+ {
+ // If we are colliding with a stationary object, presume we're standing and don't move around
+ if (!m_controllingPrim.ColliderIsMoving)
+ {
+ m_physicsScene.DetailLog("{0},BSCharacter.MoveMotor,collidingWithStationary,zeroingMotion", m_controllingPrim.LocalID);
+ m_controllingPrim.IsStationary = true;
+ m_controllingPrim.ZeroMotion(true /* inTaintTime */);
+ }
+
+ // Standing has more friction on the ground
+ if (m_controllingPrim.Friction != BSParam.AvatarStandingFriction)
+ {
+ m_controllingPrim.Friction = BSParam.AvatarStandingFriction;
+ m_physicsScene.PE.SetFriction(m_controllingPrim.PhysBody, m_controllingPrim.Friction);
+ }
+ }
+ else
+ {
+ if (m_controllingPrim.Flying)
+ {
+ // Flying and not collising and velocity nearly zero.
+ m_controllingPrim.ZeroMotion(true /* inTaintTime */);
+ }
+ }
+
+ m_physicsScene.DetailLog("{0},BSCharacter.MoveMotor,taint,stopping,target={1},colliding={2}",
+ m_controllingPrim.LocalID, m_velocityMotor.TargetValue, m_controllingPrim.IsColliding);
+ }
+ else
+ {
+ // Supposed to be moving.
+ OMV.Vector3 stepVelocity = m_velocityMotor.CurrentValue;
+
+ if (m_controllingPrim.Friction != BSParam.AvatarFriction)
+ {
+ // Probably starting up walking. Set friction to moving friction.
+ m_controllingPrim.Friction = BSParam.AvatarFriction;
+ m_physicsScene.PE.SetFriction(m_controllingPrim.PhysBody, m_controllingPrim.Friction);
+ }
+
+ // If falling, we keep the world's downward vector no matter what the other axis specify.
+ // The check for RawVelocity.Z < 0 makes jumping work (temporary upward force).
+ if (!m_controllingPrim.Flying && !m_controllingPrim.IsColliding)
+ {
+ if (m_controllingPrim.RawVelocity.Z < 0)
+ stepVelocity.Z = m_controllingPrim.RawVelocity.Z;
+ // DetailLog("{0},BSCharacter.MoveMotor,taint,overrideStepZWithWorldZ,stepVel={1}", LocalID, stepVelocity);
+ }
+
+ // 'stepVelocity' is now the speed we'd like the avatar to move in. Turn that into an instantanous force.
+ OMV.Vector3 moveForce = (stepVelocity - m_controllingPrim.RawVelocity) * m_controllingPrim.Mass;
+
+ // Should we check for move force being small and forcing velocity to zero?
+
+ // Add special movement force to allow avatars to walk up stepped surfaces.
+ moveForce += WalkUpStairs();
+
+ m_physicsScene.DetailLog("{0},BSCharacter.MoveMotor,move,stepVel={1},vel={2},mass={3},moveForce={4}",
+ m_controllingPrim.LocalID, stepVelocity, m_controllingPrim.RawVelocity, m_controllingPrim.Mass, moveForce);
+ m_physicsScene.PE.ApplyCentralImpulse(m_controllingPrim.PhysBody, moveForce);
+ }
+ }
+
+ // Decide if the character is colliding with a low object and compute a force to pop the
+ // avatar up so it can walk up and over the low objects.
+ private OMV.Vector3 WalkUpStairs()
+ {
+ OMV.Vector3 ret = OMV.Vector3.Zero;
+
+ // This test is done if moving forward, not flying and is colliding with something.
+ // DetailLog("{0},BSCharacter.WalkUpStairs,IsColliding={1},flying={2},targSpeed={3},collisions={4}",
+ // LocalID, IsColliding, Flying, TargetSpeed, CollisionsLastTick.Count);
+ if (m_controllingPrim.IsColliding && !m_controllingPrim.Flying && m_controllingPrim.TargetVelocitySpeed > 0.1f /* && ForwardSpeed < 0.1f */)
+ {
+ // The range near the character's feet where we will consider stairs
+ float nearFeetHeightMin = m_controllingPrim.RawPosition.Z - (m_controllingPrim.Size.Z / 2f) + 0.05f;
+ float nearFeetHeightMax = nearFeetHeightMin + BSParam.AvatarStepHeight;
+
+ // Look for a collision point that is near the character's feet and is oriented the same as the charactor is
+ foreach (KeyValuePair kvp in m_controllingPrim.CollisionsLastTick.m_objCollisionList)
+ {
+ // Don't care about collisions with the terrain
+ if (kvp.Key > m_physicsScene.TerrainManager.HighestTerrainID)
+ {
+ OMV.Vector3 touchPosition = kvp.Value.Position;
+ // DetailLog("{0},BSCharacter.WalkUpStairs,min={1},max={2},touch={3}",
+ // LocalID, nearFeetHeightMin, nearFeetHeightMax, touchPosition);
+ if (touchPosition.Z >= nearFeetHeightMin && touchPosition.Z <= nearFeetHeightMax)
+ {
+ // This contact is within the 'near the feet' range.
+ // The normal should be our contact point to the object so it is pointing away
+ // thus the difference between our facing orientation and the normal should be small.
+ OMV.Vector3 directionFacing = OMV.Vector3.UnitX * m_controllingPrim.RawOrientation;
+ OMV.Vector3 touchNormal = OMV.Vector3.Normalize(kvp.Value.SurfaceNormal);
+ float diff = Math.Abs(OMV.Vector3.Distance(directionFacing, touchNormal));
+ if (diff < BSParam.AvatarStepApproachFactor)
+ {
+ // Found the stairs contact point. Push up a little to raise the character.
+ float upForce = (touchPosition.Z - nearFeetHeightMin) * m_controllingPrim.Mass * BSParam.AvatarStepForceFactor;
+ ret = new OMV.Vector3(0f, 0f, upForce);
+
+ // Also move the avatar up for the new height
+ OMV.Vector3 displacement = new OMV.Vector3(0f, 0f, BSParam.AvatarStepHeight / 2f);
+ m_controllingPrim.ForcePosition = m_controllingPrim.RawPosition + displacement;
+ }
+ m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs,touchPos={1},nearFeetMin={2},faceDir={3},norm={4},diff={5},ret={6}",
+ m_controllingPrim.LocalID, touchPosition, nearFeetHeightMin, directionFacing, touchNormal, diff, ret);
+ }
+ }
+ }
+ }
+
+ return ret;
+ }
+
+}
+}
+
+
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
new file mode 100755
index 0000000..8dd3700
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyrightD
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using OpenSim.Region.Physics.Manager;
+
+using OMV = OpenMetaverse;
+
+namespace OpenSim.Region.Physics.BulletSPlugin
+{
+public class BSActorHover : BSActor
+{
+ private BSFMotor m_hoverMotor;
+
+ public BSActorHover(BSScene physicsScene, BSPhysObject pObj, string actorName)
+ : base(physicsScene, pObj, actorName)
+ {
+ m_hoverMotor = null;
+ m_physicsScene.DetailLog("{0},BSActorHover,constructor", m_controllingPrim.LocalID);
+ }
+
+ // BSActor.isActive
+ public override bool isActive
+ {
+ get { return Enabled && m_controllingPrim.IsPhysicallyActive; }
+ }
+
+ // Release any connections and resources used by the actor.
+ // BSActor.Dispose()
+ public override void Dispose()
+ {
+ Enabled = false;
+ }
+
+ // Called when physical parameters (properties set in Bullet) need to be re-applied.
+ // Called at taint-time.
+ // BSActor.Refresh()
+ public override void Refresh()
+ {
+ m_physicsScene.DetailLog("{0},BSActorHover,refresh", m_controllingPrim.LocalID);
+
+ // If not active any more, get rid of me (shouldn't ever happen, but just to be safe)
+ if (!m_controllingPrim.HoverActive)
+ {
+ m_physicsScene.DetailLog("{0},BSActorHover,refresh,notHovering,removing={1}", m_controllingPrim.LocalID, ActorName);
+ m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
+ return;
+ }
+
+ // If the object is physically active, add the hoverer prestep action
+ if (isActive)
+ {
+ ActivateHover();
+ }
+ else
+ {
+ DeactivateHover();
+ }
+ }
+
+ // The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
+ // Register a prestep action to restore physical requirements before the next simulation step.
+ // Called at taint-time.
+ // BSActor.RemoveBodyDependencies()
+ public override void RemoveBodyDependencies()
+ {
+ // Nothing to do for the hoverer since it is all software at pre-step action time.
+ }
+
+ // If a hover motor has not been created, create one and start the hovering.
+ private void ActivateHover()
+ {
+ if (m_hoverMotor == null)
+ {
+ // Turning the target on
+ m_hoverMotor = new BSFMotor("BSActorHover",
+ m_controllingPrim.HoverTau, // timeScale
+ BSMotor.Infinite, // decay time scale
+ BSMotor.Infinite, // friction timescale
+ 1f // efficiency
+ );
+ m_hoverMotor.SetTarget(ComputeCurrentHoverHeight());
+ m_hoverMotor.SetCurrent(m_controllingPrim.RawPosition.Z);
+ m_hoverMotor.PhysicsScene = m_physicsScene; // DEBUG DEBUG so motor will output detail log messages.
+
+ m_physicsScene.BeforeStep += Hoverer;
+ }
+ }
+
+ private void DeactivateHover()
+ {
+ if (m_hoverMotor != null)
+ {
+ m_physicsScene.BeforeStep -= Hoverer;
+ m_hoverMotor = null;
+ }
+ }
+
+ // Called just before the simulation step. Update the vertical position for hoverness.
+ private void Hoverer(float timeStep)
+ {
+ // Don't do hovering while the object is selected.
+ if (!isActive)
+ return;
+
+ m_hoverMotor.SetCurrent(m_controllingPrim.RawPosition.Z);
+ m_hoverMotor.SetTarget(ComputeCurrentHoverHeight());
+ float targetHeight = m_hoverMotor.Step(timeStep);
+
+ // 'targetHeight' is where we'd like the Z of the prim to be at this moment.
+ // Compute the amount of force to push us there.
+ float moveForce = (targetHeight - m_controllingPrim.RawPosition.Z) * m_controllingPrim.RawMass;
+ // Undo anything the object thinks it's doing at the moment
+ moveForce = -m_controllingPrim.RawVelocity.Z * m_controllingPrim.Mass;
+
+ m_physicsScene.PE.ApplyCentralImpulse(m_controllingPrim.PhysBody, new OMV.Vector3(0f, 0f, moveForce));
+ m_physicsScene.DetailLog("{0},BSPrim.Hover,move,targHt={1},moveForce={2},mass={3}",
+ m_controllingPrim.LocalID, targetHeight, moveForce, m_controllingPrim.RawMass);
+ }
+
+ // Based on current position, determine what we should be hovering at now.
+ // Must recompute often. What if we walked offa cliff>
+ private float ComputeCurrentHoverHeight()
+ {
+ float ret = m_controllingPrim.HoverHeight;
+ float groundHeight = m_physicsScene.TerrainManager.GetTerrainHeightAtXYZ(m_controllingPrim.RawPosition);
+
+ switch (m_controllingPrim.HoverType)
+ {
+ case PIDHoverType.Ground:
+ ret = groundHeight + m_controllingPrim.HoverHeight;
+ break;
+ case PIDHoverType.GroundAndWater:
+ float waterHeight = m_physicsScene.TerrainManager.GetWaterLevelAtXYZ(m_controllingPrim.RawPosition);
+ if (groundHeight > waterHeight)
+ {
+ ret = groundHeight + m_controllingPrim.HoverHeight;
+ }
+ else
+ {
+ ret = waterHeight + m_controllingPrim.HoverHeight;
+ }
+ break;
+ }
+ return ret;
+ }
+}
+}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
index 7219617..c40a499 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
@@ -40,7 +40,7 @@ public class BSActorLockAxis : BSActor
BSConstraint LockAxisConstraint = null;
public BSActorLockAxis(BSScene physicsScene, BSPhysObject pObj, string actorName)
- : base(physicsScene, pObj,actorName)
+ : base(physicsScene, pObj, actorName)
{
m_physicsScene.DetailLog("{0},BSActorLockAxis,constructor", m_controllingPrim.LocalID);
LockAxisConstraint = null;
@@ -99,7 +99,7 @@ public class BSActorLockAxis : BSActor
// If a constraint is set up, remove it from the physical scene
RemoveAxisLockConstraint();
// Schedule a call before the next simulation step to restore the constraint.
- m_physicsScene.PostTaintObject(m_controllingPrim.LockedAxisActorName, m_controllingPrim.LocalID, delegate()
+ m_physicsScene.PostTaintObject("BSActorLockAxis:" + ActorName, m_controllingPrim.LocalID, delegate()
{
Refresh();
});
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
new file mode 100755
index 0000000..3517ef2
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyrightD
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using OpenSim.Region.Physics.Manager;
+
+using OMV = OpenMetaverse;
+
+namespace OpenSim.Region.Physics.BulletSPlugin
+{
+public class BSActorMoveToTarget : BSActor
+{
+ private BSVMotor m_targetMotor;
+
+ public BSActorMoveToTarget(BSScene physicsScene, BSPhysObject pObj, string actorName)
+ : base(physicsScene, pObj, actorName)
+ {
+ m_targetMotor = null;
+ m_physicsScene.DetailLog("{0},BSActorMoveToTarget,constructor", m_controllingPrim.LocalID);
+ }
+
+ // BSActor.isActive
+ public override bool isActive
+ {
+ get { return Enabled && m_controllingPrim.IsPhysicallyActive; }
+ }
+
+ // Release any connections and resources used by the actor.
+ // BSActor.Dispose()
+ public override void Dispose()
+ {
+ Enabled = false;
+ }
+
+ // Called when physical parameters (properties set in Bullet) need to be re-applied.
+ // Called at taint-time.
+ // BSActor.Refresh()
+ public override void Refresh()
+ {
+ m_physicsScene.DetailLog("{0},BSActorMoveToTarget,refresh", m_controllingPrim.LocalID);
+
+ // If not active any more, get rid of me (shouldn't ever happen, but just to be safe)
+ if (!m_controllingPrim.HoverActive)
+ {
+ m_physicsScene.DetailLog("{0},BSActorMoveToTarget,refresh,notMoveToTarget,removing={1}", m_controllingPrim.LocalID, ActorName);
+ m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
+ return;
+ }
+
+ // If the object is physically active, add the hoverer prestep action
+ if (isActive)
+ {
+ ActivateMoveToTarget();
+ }
+ else
+ {
+ DeactivateMoveToTarget();
+ }
+ }
+
+ // The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
+ // Register a prestep action to restore physical requirements before the next simulation step.
+ // Called at taint-time.
+ // BSActor.RemoveBodyDependencies()
+ public override void RemoveBodyDependencies()
+ {
+ // Nothing to do for the hoverer since it is all software at pre-step action time.
+ }
+
+ // If a hover motor has not been created, create one and start the hovering.
+ private void ActivateMoveToTarget()
+ {
+ if (m_targetMotor == null)
+ {
+ // We're taking over after this.
+ m_controllingPrim.ZeroMotion(true);
+
+ m_targetMotor = new BSVMotor("BSPrim.PIDTarget",
+ m_controllingPrim.MoveToTargetTau, // timeScale
+ BSMotor.Infinite, // decay time scale
+ BSMotor.InfiniteVector, // friction timescale
+ 1f // efficiency
+ );
+ m_targetMotor.PhysicsScene = m_physicsScene; // DEBUG DEBUG so motor will output detail log messages.
+ m_targetMotor.SetTarget(m_controllingPrim.MoveToTargetTarget);
+ m_targetMotor.SetCurrent(m_controllingPrim.RawPosition);
+
+ m_physicsScene.BeforeStep += Mover;
+ }
+ }
+
+ private void DeactivateMoveToTarget()
+ {
+ if (m_targetMotor != null)
+ {
+ m_physicsScene.BeforeStep -= Mover;
+ m_targetMotor = null;
+ }
+ }
+
+ // Called just before the simulation step. Update the vertical position for hoverness.
+ private void Mover(float timeStep)
+ {
+ // Don't do hovering while the object is selected.
+ if (!isActive)
+ return;
+
+ OMV.Vector3 origPosition = m_controllingPrim.RawPosition; // DEBUG DEBUG (for printout below)
+
+ // 'movePosition' is where we'd like the prim to be at this moment.
+ OMV.Vector3 movePosition = m_controllingPrim.RawPosition + m_targetMotor.Step(timeStep);
+
+ // If we are very close to our target, turn off the movement motor.
+ if (m_targetMotor.ErrorIsZero())
+ {
+ m_physicsScene.DetailLog("{0},BSPrim.PIDTarget,zeroMovement,movePos={1},pos={2},mass={3}",
+ m_controllingPrim.LocalID, movePosition, m_controllingPrim.RawPosition, m_controllingPrim.Mass);
+ m_controllingPrim.ForcePosition = m_targetMotor.TargetValue;
+ m_targetMotor.Enabled = false;
+ }
+ else
+ {
+ m_controllingPrim.ForcePosition = movePosition;
+ }
+ m_physicsScene.DetailLog("{0},BSPrim.PIDTarget,move,fromPos={1},movePos={2}", m_controllingPrim.LocalID, origPosition, movePosition);
+ }
+}
+}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
new file mode 100755
index 0000000..d942490
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyrightD
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using OpenSim.Region.Physics.Manager;
+
+using OMV = OpenMetaverse;
+
+namespace OpenSim.Region.Physics.BulletSPlugin
+{
+public class BSActorSetForce : BSActor
+{
+ BSFMotor m_forceMotor;
+
+ public BSActorSetForce(BSScene physicsScene, BSPhysObject pObj, string actorName)
+ : base(physicsScene, pObj, actorName)
+ {
+ m_forceMotor = null;
+ m_physicsScene.DetailLog("{0},BSActorSetForce,constructor", m_controllingPrim.LocalID);
+ }
+
+ // BSActor.isActive
+ public override bool isActive
+ {
+ get { return Enabled && m_controllingPrim.IsPhysicallyActive; }
+ }
+
+ // Release any connections and resources used by the actor.
+ // BSActor.Dispose()
+ public override void Dispose()
+ {
+ Enabled = false;
+ }
+
+ // Called when physical parameters (properties set in Bullet) need to be re-applied.
+ // Called at taint-time.
+ // BSActor.Refresh()
+ public override void Refresh()
+ {
+ m_physicsScene.DetailLog("{0},BSActorSetForce,refresh", m_controllingPrim.LocalID);
+
+ // If not active any more, get rid of me (shouldn't ever happen, but just to be safe)
+ if (m_controllingPrim.RawForce == OMV.Vector3.Zero)
+ {
+ m_physicsScene.DetailLog("{0},BSActorSetForce,refresh,notSetForce,removing={1}", m_controllingPrim.LocalID, ActorName);
+ m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
+ return;
+ }
+
+ // If the object is physically active, add the hoverer prestep action
+ if (isActive)
+ {
+ ActivateSetForce();
+ }
+ else
+ {
+ DeactivateSetForce();
+ }
+ }
+
+ // The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
+ // Register a prestep action to restore physical requirements before the next simulation step.
+ // Called at taint-time.
+ // BSActor.RemoveBodyDependencies()
+ public override void RemoveBodyDependencies()
+ {
+ // Nothing to do for the hoverer since it is all software at pre-step action time.
+ }
+
+ // If a hover motor has not been created, create one and start the hovering.
+ private void ActivateSetForce()
+ {
+ if (m_forceMotor == null)
+ {
+ // A fake motor that might be used someday
+ m_forceMotor = new BSFMotor("setForce", 1f, 1f, 1f, 1f);
+
+ m_physicsScene.BeforeStep += Mover;
+ }
+ }
+
+ private void DeactivateSetForce()
+ {
+ if (m_forceMotor != null)
+ {
+ m_physicsScene.BeforeStep -= Mover;
+ m_forceMotor = null;
+ }
+ }
+
+ // Called just before the simulation step. Update the vertical position for hoverness.
+ private void Mover(float timeStep)
+ {
+ // Don't do force while the object is selected.
+ if (!isActive)
+ return;
+
+ m_physicsScene.DetailLog("{0},BSActorSetForce,preStep,force={1}", m_controllingPrim.LocalID, m_controllingPrim.RawForce);
+ if (m_controllingPrim.PhysBody.HasPhysicalBody)
+ {
+ m_physicsScene.PE.ApplyCentralForce(m_controllingPrim.PhysBody, m_controllingPrim.RawForce);
+ m_controllingPrim.ActivateIfPhysical(false);
+ }
+
+ // TODO:
+ }
+}
+}
+
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
new file mode 100755
index 0000000..e0f719f
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyrightD
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using OpenSim.Region.Physics.Manager;
+
+using OMV = OpenMetaverse;
+
+namespace OpenSim.Region.Physics.BulletSPlugin
+{
+public class BSActorSetTorque : BSActor
+{
+ BSFMotor m_torqueMotor;
+
+ public BSActorSetTorque(BSScene physicsScene, BSPhysObject pObj, string actorName)
+ : base(physicsScene, pObj, actorName)
+ {
+ m_torqueMotor = null;
+ m_physicsScene.DetailLog("{0},BSActorSetTorque,constructor", m_controllingPrim.LocalID);
+ }
+
+ // BSActor.isActive
+ public override bool isActive
+ {
+ get { return Enabled && m_controllingPrim.IsPhysicallyActive; }
+ }
+
+ // Release any connections and resources used by the actor.
+ // BSActor.Dispose()
+ public override void Dispose()
+ {
+ Enabled = false;
+ }
+
+ // Called when physical parameters (properties set in Bullet) need to be re-applied.
+ // Called at taint-time.
+ // BSActor.Refresh()
+ public override void Refresh()
+ {
+ m_physicsScene.DetailLog("{0},BSActorSetTorque,refresh", m_controllingPrim.LocalID);
+
+ // If not active any more, get rid of me (shouldn't ever happen, but just to be safe)
+ if (m_controllingPrim.RawTorque == OMV.Vector3.Zero)
+ {
+ m_physicsScene.DetailLog("{0},BSActorSetTorque,refresh,notSetTorque,removing={1}", m_controllingPrim.LocalID, ActorName);
+ m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
+ return;
+ }
+
+ // If the object is physically active, add the hoverer prestep action
+ if (isActive)
+ {
+ ActivateSetTorque();
+ }
+ else
+ {
+ DeactivateSetTorque();
+ }
+ }
+
+ // The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
+ // Register a prestep action to restore physical requirements before the next simulation step.
+ // Called at taint-time.
+ // BSActor.RemoveBodyDependencies()
+ public override void RemoveBodyDependencies()
+ {
+ // Nothing to do for the hoverer since it is all software at pre-step action time.
+ }
+
+ // If a hover motor has not been created, create one and start the hovering.
+ private void ActivateSetTorque()
+ {
+ if (m_torqueMotor == null)
+ {
+ // A fake motor that might be used someday
+ m_torqueMotor = new BSFMotor("setTorque", 1f, 1f, 1f, 1f);
+
+ m_physicsScene.BeforeStep += Mover;
+ }
+ }
+
+ private void DeactivateSetTorque()
+ {
+ if (m_torqueMotor != null)
+ {
+ m_physicsScene.BeforeStep -= Mover;
+ m_torqueMotor = null;
+ }
+ }
+
+ // Called just before the simulation step. Update the vertical position for hoverness.
+ private void Mover(float timeStep)
+ {
+ // Don't do force while the object is selected.
+ if (!isActive)
+ return;
+
+ m_physicsScene.DetailLog("{0},BSActorSetTorque,preStep,force={1}", m_controllingPrim.LocalID, m_controllingPrim.RawTorque);
+ if (m_controllingPrim.PhysBody.HasPhysicalBody)
+ {
+ m_controllingPrim.AddAngularForce(m_controllingPrim.RawTorque, false, true);
+ m_controllingPrim.ActivateIfPhysical(false);
+ }
+
+ // TODO:
+ }
+}
+}
+
+
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
index 5a19ba4..fb4d452 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
@@ -32,12 +32,12 @@ namespace OpenSim.Region.Physics.BulletSPlugin
{
public class BSActorCollection
{
- private BSScene PhysicsScene { get; set; }
+ private BSScene m_physicsScene { get; set; }
private Dictionary m_actors;
public BSActorCollection(BSScene physicsScene)
{
- PhysicsScene = physicsScene;
+ m_physicsScene = physicsScene;
m_actors = new Dictionary();
}
public void Add(string name, BSActor actor)
@@ -61,6 +61,10 @@ public class BSActorCollection
Release();
m_actors.Clear();
}
+ public void Dispose()
+ {
+ Clear();
+ }
public bool HasActor(string name)
{
return m_actors.ContainsKey(name);
@@ -71,6 +75,10 @@ public class BSActorCollection
act(kvp.Value);
}
+ public void Enable(bool enabl)
+ {
+ ForEachActor(a => a.Enable(enabl));
+ }
public void Release()
{
ForEachActor(a => a.Dispose());
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 25be416..09c9b16 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -46,9 +46,6 @@ public sealed class BSCharacter : BSPhysObject
private OMV.Vector3 _position;
private float _mass;
private float _avatarVolume;
- private OMV.Vector3 _force;
- private OMV.Vector3 _velocity;
- private OMV.Vector3 _torque;
private float _collisionScore;
private OMV.Vector3 _acceleration;
private OMV.Quaternion _orientation;
@@ -61,17 +58,13 @@ public sealed class BSCharacter : BSPhysObject
private OMV.Vector3 _rotationalVelocity;
private bool _kinematic;
private float _buoyancy;
- private bool _isStationaryStanding; // true is standing on a stationary object
- private BSVMotor _velocityMotor;
+ private BSActorAvatarMove m_moveActor;
+ private const string AvatarMoveActorName = "BSCharacter.AvatarMove";
private OMV.Vector3 _PIDTarget;
private bool _usePID;
private float _PIDTau;
- private bool _useHoverPID;
- private float _PIDHoverHeight;
- private PIDHoverType _PIDHoverType;
- private float _PIDHoverTao;
public BSCharacter(uint localID, String avName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 size, bool isFlying)
: base(parent_scene, localID, avName, "BSCharacter")
@@ -81,11 +74,10 @@ public sealed class BSCharacter : BSPhysObject
_flying = isFlying;
_orientation = OMV.Quaternion.Identity;
- _velocity = OMV.Vector3.Zero;
+ RawVelocity = OMV.Vector3.Zero;
_buoyancy = ComputeBuoyancyFromFlying(isFlying);
Friction = BSParam.AvatarStandingFriction;
Density = BSParam.AvatarDensity / BSParam.DensityScaleFactor;
- _isStationaryStanding = false;
// Old versions of ScenePresence passed only the height. If width and/or depth are zero,
// replace with the default values.
@@ -99,7 +91,12 @@ public sealed class BSCharacter : BSPhysObject
// set _avatarVolume and _mass based on capsule size, _density and Scale
ComputeAvatarVolumeAndMass();
- SetupMovementMotor();
+ // The avatar's movement is controlled by this motor that speeds up and slows down
+ // the avatar seeking to reach the motor's target speed.
+ // This motor runs as a prestep action for the avatar so it will keep the avatar
+ // standing as well as moving. Destruction of the avatar will destroy the pre-step action.
+ m_moveActor = new BSActorAvatarMove(PhysicsScene, this, AvatarMoveActorName);
+ PhysicalActors.Add(AvatarMoveActorName, m_moveActor);
DetailLog("{0},BSCharacter.create,call,size={1},scale={2},density={3},volume={4},mass={5}",
LocalID, _size, Scale, Density, _avatarVolume, RawMass);
@@ -139,10 +136,10 @@ public sealed class BSCharacter : BSPhysObject
ForcePosition = _position;
// Set the velocity
- _velocityMotor.Reset();
- _velocityMotor.SetTarget(_velocity);
- _velocityMotor.SetCurrent(_velocity);
- ForceVelocity = _velocity;
+ if (m_moveActor != null)
+ m_moveActor.SetVelocityAndTarget(RawVelocity, RawVelocity, false);
+
+ ForceVelocity = RawVelocity;
// This will enable or disable the flying buoyancy of the avatar.
// Needs to be reset especially when an avatar is recreated after crossing a region boundry.
@@ -176,162 +173,6 @@ public sealed class BSCharacter : BSPhysObject
PhysBody.ApplyCollisionMask(PhysicsScene);
}
- // The avatar's movement is controlled by this motor that speeds up and slows down
- // the avatar seeking to reach the motor's target speed.
- // This motor runs as a prestep action for the avatar so it will keep the avatar
- // standing as well as moving. Destruction of the avatar will destroy the pre-step action.
- private void SetupMovementMotor()
- {
- // Infinite decay and timescale values so motor only changes current to target values.
- _velocityMotor = new BSVMotor("BSCharacter.Velocity",
- 0.2f, // time scale
- BSMotor.Infinite, // decay time scale
- BSMotor.InfiniteVector, // friction timescale
- 1f // efficiency
- );
- // _velocityMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG so motor will output detail log messages.
-
- RegisterPreStepAction("BSCharactor.Movement", LocalID, delegate(float timeStep)
- {
- // TODO: Decide if the step parameters should be changed depending on the avatar's
- // state (flying, colliding, ...). There is code in ODE to do this.
-
- // COMMENTARY: when the user is making the avatar walk, except for falling, the velocity
- // specified for the avatar is the one that should be used. For falling, if the avatar
- // is not flying and is not colliding then it is presumed to be falling and the Z
- // component is not fooled with (thus allowing gravity to do its thing).
- // When the avatar is standing, though, the user has specified a velocity of zero and
- // the avatar should be standing. But if the avatar is pushed by something in the world
- // (raising elevator platform, moving vehicle, ...) the avatar should be allowed to
- // move. Thus, the velocity cannot be forced to zero. The problem is that small velocity
- // errors can creap in and the avatar will slowly float off in some direction.
- // So, the problem is that, when an avatar is standing, we cannot tell creaping error
- // from real pushing.
- // The code below uses whether the collider is static or moving to decide whether to zero motion.
-
- _velocityMotor.Step(timeStep);
- _isStationaryStanding = false;
-
- // If we're not supposed to be moving, make sure things are zero.
- if (_velocityMotor.ErrorIsZero() && _velocityMotor.TargetValue == OMV.Vector3.Zero)
- {
- // The avatar shouldn't be moving
- _velocityMotor.Zero();
-
- if (IsColliding)
- {
- // If we are colliding with a stationary object, presume we're standing and don't move around
- if (!ColliderIsMoving)
- {
- DetailLog("{0},BSCharacter.MoveMotor,collidingWithStationary,zeroingMotion", LocalID);
- _isStationaryStanding = true;
- ZeroMotion(true /* inTaintTime */);
- }
-
- // Standing has more friction on the ground
- if (Friction != BSParam.AvatarStandingFriction)
- {
- Friction = BSParam.AvatarStandingFriction;
- PhysicsScene.PE.SetFriction(PhysBody, Friction);
- }
- }
- else
- {
- if (Flying)
- {
- // Flying and not collising and velocity nearly zero.
- ZeroMotion(true /* inTaintTime */);
- }
- }
-
- DetailLog("{0},BSCharacter.MoveMotor,taint,stopping,target={1},colliding={2}", LocalID, _velocityMotor.TargetValue, IsColliding);
- }
- else
- {
- // Supposed to be moving.
- OMV.Vector3 stepVelocity = _velocityMotor.CurrentValue;
-
- if (Friction != BSParam.AvatarFriction)
- {
- // Probably starting up walking. Set friction to moving friction.
- Friction = BSParam.AvatarFriction;
- PhysicsScene.PE.SetFriction(PhysBody, Friction);
- }
-
- // If falling, we keep the world's downward vector no matter what the other axis specify.
- // The check for _velocity.Z < 0 makes jumping work (temporary upward force).
- if (!Flying && !IsColliding)
- {
- if (_velocity.Z < 0)
- stepVelocity.Z = _velocity.Z;
- // DetailLog("{0},BSCharacter.MoveMotor,taint,overrideStepZWithWorldZ,stepVel={1}", LocalID, stepVelocity);
- }
-
- // 'stepVelocity' is now the speed we'd like the avatar to move in. Turn that into an instantanous force.
- OMV.Vector3 moveForce = (stepVelocity - _velocity) * Mass;
-
- // Should we check for move force being small and forcing velocity to zero?
-
- // Add special movement force to allow avatars to walk up stepped surfaces.
- moveForce += WalkUpStairs();
-
- DetailLog("{0},BSCharacter.MoveMotor,move,stepVel={1},vel={2},mass={3},moveForce={4}", LocalID, stepVelocity, _velocity, Mass, moveForce);
- PhysicsScene.PE.ApplyCentralImpulse(PhysBody, moveForce);
- }
- });
- }
-
- // Decide if the character is colliding with a low object and compute a force to pop the
- // avatar up so it can walk up and over the low objects.
- private OMV.Vector3 WalkUpStairs()
- {
- OMV.Vector3 ret = OMV.Vector3.Zero;
-
- // This test is done if moving forward, not flying and is colliding with something.
- // DetailLog("{0},BSCharacter.WalkUpStairs,IsColliding={1},flying={2},targSpeed={3},collisions={4}",
- // LocalID, IsColliding, Flying, TargetSpeed, CollisionsLastTick.Count);
- if (IsColliding && !Flying && TargetVelocitySpeed > 0.1f /* && ForwardSpeed < 0.1f */)
- {
- // The range near the character's feet where we will consider stairs
- float nearFeetHeightMin = RawPosition.Z - (Size.Z / 2f) + 0.05f;
- float nearFeetHeightMax = nearFeetHeightMin + BSParam.AvatarStepHeight;
-
- // Look for a collision point that is near the character's feet and is oriented the same as the charactor is
- foreach (KeyValuePair kvp in CollisionsLastTick.m_objCollisionList)
- {
- // Don't care about collisions with the terrain
- if (kvp.Key > PhysicsScene.TerrainManager.HighestTerrainID)
- {
- OMV.Vector3 touchPosition = kvp.Value.Position;
- // DetailLog("{0},BSCharacter.WalkUpStairs,min={1},max={2},touch={3}",
- // LocalID, nearFeetHeightMin, nearFeetHeightMax, touchPosition);
- if (touchPosition.Z >= nearFeetHeightMin && touchPosition.Z <= nearFeetHeightMax)
- {
- // This contact is within the 'near the feet' range.
- // The normal should be our contact point to the object so it is pointing away
- // thus the difference between our facing orientation and the normal should be small.
- OMV.Vector3 directionFacing = OMV.Vector3.UnitX * RawOrientation;
- OMV.Vector3 touchNormal = OMV.Vector3.Normalize(kvp.Value.SurfaceNormal);
- float diff = Math.Abs(OMV.Vector3.Distance(directionFacing, touchNormal));
- if (diff < BSParam.AvatarStepApproachFactor)
- {
- // Found the stairs contact point. Push up a little to raise the character.
- float upForce = (touchPosition.Z - nearFeetHeightMin) * Mass * BSParam.AvatarStepForceFactor;
- ret = new OMV.Vector3(0f, 0f, upForce);
-
- // Also move the avatar up for the new height
- OMV.Vector3 displacement = new OMV.Vector3(0f, 0f, BSParam.AvatarStepHeight / 2f);
- ForcePosition = RawPosition + displacement;
- }
- DetailLog("{0},BSCharacter.WalkUpStairs,touchPos={1},nearFeetMin={2},faceDir={3},norm={4},diff={5},ret={6}",
- LocalID, touchPosition, nearFeetHeightMin, directionFacing, touchNormal, diff, ret);
- }
- }
- }
- }
-
- return ret;
- }
public override void RequestPhysicsterseUpdate()
{
@@ -403,7 +244,7 @@ public sealed class BSCharacter : BSPhysObject
// Called at taint time!
public override void ZeroMotion(bool inTaintTime)
{
- _velocity = OMV.Vector3.Zero;
+ RawVelocity = OMV.Vector3.Zero;
_acceleration = OMV.Vector3.Zero;
_rotationalVelocity = OMV.Vector3.Zero;
@@ -542,15 +383,15 @@ public sealed class BSCharacter : BSPhysObject
}
public override OMV.Vector3 Force {
- get { return _force; }
+ get { return RawForce; }
set {
- _force = value;
+ RawForce = value;
// m_log.DebugFormat("{0}: Force = {1}", LogHeader, _force);
PhysicsScene.TaintedObject("BSCharacter.SetForce", delegate()
{
- DetailLog("{0},BSCharacter.setForce,taint,force={1}", LocalID, _force);
+ DetailLog("{0},BSCharacter.setForce,taint,force={1}", LocalID, RawForce);
if (PhysBody.HasPhysicalBody)
- PhysicsScene.PE.SetObjectForce(PhysBody, _force);
+ PhysicsScene.PE.SetObjectForce(PhysBody, RawForce);
});
}
}
@@ -573,7 +414,7 @@ public sealed class BSCharacter : BSPhysObject
{
get
{
- return m_targetVelocity;
+ return base.m_targetVelocity;
}
set
{
@@ -583,51 +424,39 @@ public sealed class BSCharacter : BSPhysObject
if (_setAlwaysRun)
targetVel *= new OMV.Vector3(BSParam.AvatarAlwaysRunFactor, BSParam.AvatarAlwaysRunFactor, 0f);
- PhysicsScene.TaintedObject("BSCharacter.setTargetVelocity", delegate()
- {
- _velocityMotor.Reset();
- _velocityMotor.SetTarget(targetVel);
- _velocityMotor.SetCurrent(_velocity);
- _velocityMotor.Enabled = true;
- });
+ if (m_moveActor != null)
+ m_moveActor.SetVelocityAndTarget(RawVelocity, targetVel, false /* inTaintTime */);
}
}
- public override OMV.Vector3 RawVelocity
- {
- get { return _velocity; }
- set { _velocity = value; }
- }
// Directly setting velocity means this is what the user really wants now.
public override OMV.Vector3 Velocity {
- get { return _velocity; }
+ get { return RawVelocity; }
set {
- _velocity = value;
- // m_log.DebugFormat("{0}: set velocity = {1}", LogHeader, _velocity);
+ RawVelocity = value;
+ // m_log.DebugFormat("{0}: set velocity = {1}", LogHeader, RawVelocity);
PhysicsScene.TaintedObject("BSCharacter.setVelocity", delegate()
{
- _velocityMotor.Reset();
- _velocityMotor.SetCurrent(_velocity);
- _velocityMotor.SetTarget(_velocity);
- _velocityMotor.Enabled = false;
+ if (m_moveActor != null)
+ m_moveActor.SetVelocityAndTarget(RawVelocity, RawVelocity, true /* inTaintTime */);
- DetailLog("{0},BSCharacter.setVelocity,taint,vel={1}", LocalID, _velocity);
- ForceVelocity = _velocity;
+ DetailLog("{0},BSCharacter.setVelocity,taint,vel={1}", LocalID, RawVelocity);
+ ForceVelocity = RawVelocity;
});
}
}
public override OMV.Vector3 ForceVelocity {
- get { return _velocity; }
+ get { return RawVelocity; }
set {
PhysicsScene.AssertInTaintTime("BSCharacter.ForceVelocity");
- _velocity = value;
- PhysicsScene.PE.SetLinearVelocity(PhysBody, _velocity);
+ RawVelocity = value;
+ PhysicsScene.PE.SetLinearVelocity(PhysBody, RawVelocity);
PhysicsScene.PE.Activate(PhysBody, true);
}
}
public override OMV.Vector3 Torque {
- get { return _torque; }
- set { _torque = value;
+ get { return RawTorque; }
+ set { RawTorque = value;
}
}
public override float CollisionScore {
@@ -783,27 +612,6 @@ public sealed class BSCharacter : BSPhysObject
set { _PIDTau = value; }
}
- // Used for llSetHoverHeight and maybe vehicle height
- // Hover Height will override MoveTo target's Z
- public override bool PIDHoverActive {
- set { _useHoverPID = value; }
- }
- public override float PIDHoverHeight {
- set { _PIDHoverHeight = value; }
- }
- public override PIDHoverType PIDHoverType {
- set { _PIDHoverType = value; }
- }
- public override float PIDHoverTau {
- set { _PIDHoverTao = value; }
- }
-
- // For RotLookAt
- public override OMV.Quaternion APIDTarget { set { return; } }
- public override bool APIDActive { set { return; } }
- public override float APIDStrength { set { return; } }
- public override float APIDDamping { set { return; } }
-
public override void AddForce(OMV.Vector3 force, bool pushforce)
{
// Since this force is being applied in only one step, make this a force per second.
@@ -833,7 +641,7 @@ public sealed class BSCharacter : BSPhysObject
}
}
- public override void AddAngularForce(OMV.Vector3 force, bool pushforce) {
+ public override void AddAngularForce(OMV.Vector3 force, bool pushforce, bool inTaintTime) {
}
public override void SetMomentum(OMV.Vector3 momentum) {
}
@@ -887,7 +695,7 @@ public sealed class BSCharacter : BSPhysObject
public override void UpdateProperties(EntityProperties entprop)
{
// Don't change position if standing on a stationary object.
- if (!_isStationaryStanding)
+ if (!IsStationary)
_position = entprop.Position;
_orientation = entprop.Rotation;
@@ -896,8 +704,8 @@ public sealed class BSCharacter : BSPhysObject
// and will send agent updates to the clients if velocity changes by more than
// 0.001m/s. Bullet introduces a lot of jitter in the velocity which causes many
// extra updates.
- if (!entprop.Velocity.ApproxEquals(_velocity, 0.1f))
- _velocity = entprop.Velocity;
+ if (!entprop.Velocity.ApproxEquals(RawVelocity, 0.1f))
+ RawVelocity = entprop.Velocity;
_acceleration = entprop.Acceleration;
_rotationalVelocity = entprop.RotationalVelocity;
@@ -920,7 +728,7 @@ public sealed class BSCharacter : BSPhysObject
// base.RequestPhysicsterseUpdate();
DetailLog("{0},BSCharacter.UpdateProperties,call,pos={1},orient={2},vel={3},accel={4},rotVel={5}",
- LocalID, _position, _orientation, _velocity, _acceleration, _rotationalVelocity);
+ LocalID, _position, _orientation, RawVelocity, _acceleration, _rotationalVelocity);
}
}
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 98ea833..644bc7e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
* VariableName: used by the simulator and performs taint operations, etc
* RawVariableName: direct reference to the BulletSim storage for the variable value
* ForceVariableName: direct reference (store and fetch) to the value in the physics engine.
- * The last two (and certainly the last one) should be referenced only in taint-time.
+ * The last one should only be referenced in taint-time.
*/
/*
@@ -84,6 +84,7 @@ public abstract class BSPhysObject : PhysicsActor
// Initialize variables kept in base.
GravModifier = 1.0f;
Gravity = new OMV.Vector3(0f, 0f, BSParam.Gravity);
+ HoverActive = false;
// We don't have any physical representation yet.
PhysBody = new BulletBody(localID);
@@ -110,11 +111,10 @@ public abstract class BSPhysObject : PhysicsActor
// Tell the object to clean up.
public virtual void Destroy()
{
- UnRegisterAllPreStepActions();
- UnRegisterAllPostStepActions();
+ PhysicalActors.Enable(false);
PhysicsScene.TaintedObject("BSPhysObject.Destroy", delegate()
{
- PhysicalActors.Release();
+ PhysicalActors.Dispose();
});
}
@@ -203,15 +203,48 @@ public abstract class BSPhysObject : PhysicsActor
public abstract OMV.Quaternion RawOrientation { get; set; }
public abstract OMV.Quaternion ForceOrientation { get; set; }
- public abstract OMV.Vector3 RawVelocity { get; set; }
+ public OMV.Vector3 RawVelocity { get; set; }
public abstract OMV.Vector3 ForceVelocity { get; set; }
+ public OMV.Vector3 RawForce { get; set; }
+ public OMV.Vector3 RawTorque { get; set; }
+ public override void AddAngularForce(OMV.Vector3 force, bool pushforce)
+ {
+ AddAngularForce(force, pushforce, false);
+ }
+ public abstract void AddAngularForce(OMV.Vector3 force, bool pushforce, bool inTaintTime);
+
public abstract OMV.Vector3 ForceRotationalVelocity { get; set; }
public abstract float ForceBuoyancy { get; set; }
public virtual bool ForceBodyShapeRebuild(bool inTaintTime) { return false; }
+ public override bool PIDActive { set { MoveToTargetActive = value; } }
+ public override OMV.Vector3 PIDTarget { set { MoveToTargetTarget = value; } }
+ public override float PIDTau { set { MoveToTargetTau = value; } }
+
+ public bool MoveToTargetActive { get; set; }
+ public OMV.Vector3 MoveToTargetTarget { get; set; }
+ public float MoveToTargetTau { get; set; }
+
+ // Used for llSetHoverHeight and maybe vehicle height. Hover Height will override MoveTo target's Z
+ public override bool PIDHoverActive { set { HoverActive = value; } }
+ public override float PIDHoverHeight { set { HoverHeight = value; } }
+ public override PIDHoverType PIDHoverType { set { HoverType = value; } }
+ public override float PIDHoverTau { set { HoverTau = value; } }
+
+ public bool HoverActive { get; set; }
+ public float HoverHeight { get; set; }
+ public PIDHoverType HoverType { get; set; }
+ public float HoverTau { get; set; }
+
+ // For RotLookAt
+ public override OMV.Quaternion APIDTarget { set { return; } }
+ public override bool APIDActive { set { return; } }
+ public override float APIDStrength { set { return; } }
+ public override float APIDDamping { set { return; } }
+
// The current velocity forward
public virtual float ForwardSpeed
{
@@ -237,7 +270,44 @@ public abstract class BSPhysObject : PhysicsActor
public OMV.Vector3 LockedAxis { get; set; } // zero means locked. one means free.
public readonly OMV.Vector3 LockedAxisFree = new OMV.Vector3(1f, 1f, 1f); // All axis are free
- public readonly String LockedAxisActorName = "BSPrim.LockedAxis";
+
+ // Enable physical actions. Bullet will keep sleeping non-moving physical objects so
+ // they need waking up when parameters are changed.
+ // Called in taint-time!!
+ public void ActivateIfPhysical(bool forceIt)
+ {
+ if (IsPhysical && PhysBody.HasPhysicalBody)
+ PhysicsScene.PE.Activate(PhysBody, forceIt);
+ }
+
+ // 'actors' act on the physical object to change or constrain its motion. These can range from
+ // hovering to complex vehicle motion.
+ public delegate BSActor CreateActor();
+ public void CreateRemoveActor(bool createRemove, string actorName, bool inTaintTime, CreateActor creator)
+ {
+ if (createRemove)
+ {
+ PhysicsScene.TaintedObject(inTaintTime, "BSPrim.CreateRemoveActor:" + actorName, delegate()
+ {
+ if (!PhysicalActors.HasActor(actorName))
+ {
+ DetailLog("{0},BSPrim.CreateRemoveActor,taint,registerActor,a={1}", LocalID, actorName);
+ PhysicalActors.Add(actorName, creator());
+ }
+ });
+ }
+ else
+ {
+ PhysicsScene.TaintedObject(inTaintTime, "BSPrim.CreateRemoveActor:" + actorName, delegate()
+ {
+ if (PhysicalActors.HasActor(actorName))
+ {
+ DetailLog("{0},BSPrim.CreateRemoveActor,taint,unregisterActor,a={1}", LocalID, actorName);
+ PhysicalActors.RemoveAndRelease(actorName);
+ }
+ });
+ }
+ }
#region Collisions
@@ -255,7 +325,9 @@ public abstract class BSPhysObject : PhysicsActor
protected CollisionFlags CurrentCollisionFlags { get; set; }
// On a collision, check the collider and remember if the last collider was moving
// Used to modify the standing of avatars (avatars on stationary things stand still)
- protected bool ColliderIsMoving;
+ public bool ColliderIsMoving;
+ // Used by BSCharacter to manage standing (and not slipping)
+ public bool IsStationary;
// Count of collisions for this object
protected long CollisionAccumulation { get; set; }
@@ -293,7 +365,7 @@ public abstract class BSPhysObject : PhysicsActor
protected CollisionEventUpdate CollisionCollection;
// Remember collisions from last tick for fancy collision based actions
// (like a BSCharacter walking up stairs).
- protected CollisionEventUpdate CollisionsLastTick;
+ public CollisionEventUpdate CollisionsLastTick;
// The simulation step is telling this object about a collision.
// Return 'true' if a collision was processed and should be sent up.
@@ -424,104 +496,6 @@ public abstract class BSPhysObject : PhysicsActor
public BSActorCollection PhysicalActors;
- // There are some actions that must be performed for a physical object before each simulation step.
- // These actions are optional so, rather than scanning all the physical objects and asking them
- // if they have anything to do, a physical object registers for an event call before the step is performed.
- // This bookkeeping makes it easy to add, remove and clean up after all these registrations.
- private Dictionary RegisteredPrestepActions = new Dictionary();
- private Dictionary RegisteredPoststepActions = new Dictionary();
- protected void RegisterPreStepAction(string op, uint id, BSScene.PreStepAction actn)
- {
- string identifier = op + "-" + id.ToString();
-
- lock (RegisteredPrestepActions)
- {
- // Clean out any existing action
- UnRegisterPreStepAction(op, id);
- RegisteredPrestepActions[identifier] = actn;
- PhysicsScene.BeforeStep += actn;
- }
- DetailLog("{0},BSPhysObject.RegisterPreStepAction,id={1}", LocalID, identifier);
- }
-
- // Unregister a pre step action. Safe to call if the action has not been registered.
- // Returns 'true' if an action was actually removed
- protected bool UnRegisterPreStepAction(string op, uint id)
- {
- string identifier = op + "-" + id.ToString();
- bool removed = false;
- lock (RegisteredPrestepActions)
- {
- if (RegisteredPrestepActions.ContainsKey(identifier))
- {
- PhysicsScene.BeforeStep -= RegisteredPrestepActions[identifier];
- RegisteredPrestepActions.Remove(identifier);
- removed = true;
- }
- }
- DetailLog("{0},BSPhysObject.UnRegisterPreStepAction,id={1},removed={2}", LocalID, identifier, removed);
- return removed;
- }
-
- protected void UnRegisterAllPreStepActions()
- {
- lock (RegisteredPrestepActions)
- {
- foreach (KeyValuePair kvp in RegisteredPrestepActions)
- {
- PhysicsScene.BeforeStep -= kvp.Value;
- }
- RegisteredPrestepActions.Clear();
- }
- DetailLog("{0},BSPhysObject.UnRegisterAllPreStepActions,", LocalID);
- }
-
- protected void RegisterPostStepAction(string op, uint id, BSScene.PostStepAction actn)
- {
- string identifier = op + "-" + id.ToString();
-
- lock (RegisteredPoststepActions)
- {
- // Clean out any existing action
- UnRegisterPostStepAction(op, id);
- RegisteredPoststepActions[identifier] = actn;
- PhysicsScene.AfterStep += actn;
- }
- DetailLog("{0},BSPhysObject.RegisterPostStepAction,id={1}", LocalID, identifier);
- }
-
- // Unregister a pre step action. Safe to call if the action has not been registered.
- // Returns 'true' if an action was actually removed.
- protected bool UnRegisterPostStepAction(string op, uint id)
- {
- string identifier = op + "-" + id.ToString();
- bool removed = false;
- lock (RegisteredPoststepActions)
- {
- if (RegisteredPoststepActions.ContainsKey(identifier))
- {
- PhysicsScene.AfterStep -= RegisteredPoststepActions[identifier];
- RegisteredPoststepActions.Remove(identifier);
- removed = true;
- }
- }
- DetailLog("{0},BSPhysObject.UnRegisterPostStepAction,id={1},removed={2}", LocalID, identifier, removed);
- return removed;
- }
-
- protected void UnRegisterAllPostStepActions()
- {
- lock (RegisteredPoststepActions)
- {
- foreach (KeyValuePair kvp in RegisteredPoststepActions)
- {
- PhysicsScene.AfterStep -= kvp.Value;
- }
- RegisteredPoststepActions.Clear();
- }
- DetailLog("{0},BSPhysObject.UnRegisterAllPostStepActions,", LocalID);
- }
-
// When an update to the physical properties happens, this event is fired to let
// different actors to modify the update before it is passed around
public delegate void PreUpdatePropertyAction(ref EntityProperties entprop);
@@ -533,46 +507,6 @@ public abstract class BSPhysObject : PhysicsActor
actions(ref entprop);
}
- private Dictionary RegisteredPreUpdatePropertyActions = new Dictionary();
- public void RegisterPreUpdatePropertyAction(string identifier, PreUpdatePropertyAction actn)
- {
- lock (RegisteredPreUpdatePropertyActions)
- {
- // Clean out any existing action
- UnRegisterPreUpdatePropertyAction(identifier);
- RegisteredPreUpdatePropertyActions[identifier] = actn;
- OnPreUpdateProperty += actn;
- }
- DetailLog("{0},BSPhysObject.RegisterPreUpdatePropertyAction,id={1}", LocalID, identifier);
- }
- public bool UnRegisterPreUpdatePropertyAction(string identifier)
- {
- bool removed = false;
- lock (RegisteredPreUpdatePropertyActions)
- {
- if (RegisteredPreUpdatePropertyActions.ContainsKey(identifier))
- {
- OnPreUpdateProperty -= RegisteredPreUpdatePropertyActions[identifier];
- RegisteredPreUpdatePropertyActions.Remove(identifier);
- removed = true;
- }
- }
- DetailLog("{0},BSPhysObject.UnRegisterPreUpdatePropertyAction,id={1},removed={2}", LocalID, identifier, removed);
- return removed;
- }
- public void UnRegisterAllPreUpdatePropertyActions()
- {
- lock (RegisteredPreUpdatePropertyActions)
- {
- foreach (KeyValuePair kvp in RegisteredPreUpdatePropertyActions)
- {
- OnPreUpdateProperty -= kvp.Value;
- }
- RegisteredPreUpdatePropertyActions.Clear();
- }
- DetailLog("{0},BSPhysObject.UnRegisterAllPreUpdatePropertyAction,", LocalID);
- }
-
#endregion // Per Simulation Step actions
// High performance detailed logging routine used by the physical objects.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index e56276a..71fea59 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -55,9 +55,6 @@ public class BSPrim : BSPhysObject
private OMV.Vector3 _position;
private float _mass; // the mass of this object
- private OMV.Vector3 _force;
- private OMV.Vector3 _velocity;
- private OMV.Vector3 _torque;
private OMV.Vector3 _acceleration;
private OMV.Quaternion _orientation;
private int _physicsActorType;
@@ -73,16 +70,13 @@ public class BSPrim : BSPhysObject
private int CrossingFailures { get; set; }
public BSDynamics VehicleActor;
- public string VehicleActorName = "BasicVehicle";
+ public const string VehicleActorName = "BasicVehicle";
- private BSVMotor _targetMotor;
- private OMV.Vector3 _PIDTarget;
- private float _PIDTau;
-
- private BSFMotor _hoverMotor;
- private float _PIDHoverHeight;
- private PIDHoverType _PIDHoverType;
- private float _PIDHoverTau;
+ public const string HoverActorName = "HoverActor";
+ public const String LockedAxisActorName = "BSPrim.LockedAxis";
+ public const string MoveToTargetActorName = "MoveToTargetActor";
+ public const string SetForceActorName = "SetForceActor";
+ public const string SetTorqueActorName = "SetTorqueActor";
public BSPrim(uint localID, String primName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 size,
OMV.Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical)
@@ -95,7 +89,7 @@ public class BSPrim : BSPhysObject
Scale = size; // prims are the size the user wants them to be (different for BSCharactes).
_orientation = rotation;
_buoyancy = 0f;
- _velocity = OMV.Vector3.Zero;
+ RawVelocity = OMV.Vector3.Zero;
_rotationalVelocity = OMV.Vector3.Zero;
BaseShape = pbs;
_isPhysical = pisPhysical;
@@ -233,7 +227,7 @@ public class BSPrim : BSPhysObject
// Called at taint time!
public override void ZeroMotion(bool inTaintTime)
{
- _velocity = OMV.Vector3.Zero;
+ RawVelocity = OMV.Vector3.Zero;
_acceleration = OMV.Vector3.Zero;
_rotationalVelocity = OMV.Vector3.Zero;
@@ -270,19 +264,17 @@ public class BSPrim : BSPhysObject
if (axis.Z != 1) locking.Z = 0f;
LockedAxis = locking;
- if (LockedAxis != LockedAxisFree)
+ CreateRemoveActor(LockedAxis != LockedAxisFree /* creatActor */, LockedAxisActorName, false /* inTaintTime */, delegate()
{
- PhysicsScene.TaintedObject("BSPrim.LockAngularMotion", delegate()
- {
- // If there is not already an axis locker, make one
- if (!PhysicalActors.HasActor(LockedAxisActorName))
- {
- DetailLog("{0},BSPrim.LockAngularMotion,taint,registeringLockAxisActor", LocalID);
- PhysicalActors.Add(LockedAxisActorName, new BSActorLockAxis(PhysicsScene, this, LockedAxisActorName));
- }
- UpdatePhysicalParameters();
- });
- }
+ return new BSActorLockAxis(PhysicsScene, this, LockedAxisActorName);
+ });
+
+ // Update parameters so the new actor's Refresh() action is called at the right time.
+ PhysicsScene.TaintedObject("BSPrim.LockAngularMotion", delegate()
+ {
+ UpdatePhysicalParameters();
+ });
+
return;
}
@@ -407,9 +399,9 @@ public class BSPrim : BSPhysObject
ZeroMotion(inTaintTime);
ret = true;
}
- if (_velocity.LengthSquared() > BSParam.MaxLinearVelocity)
+ if (RawVelocity.LengthSquared() > BSParam.MaxLinearVelocity)
{
- _velocity = Util.ClampV(_velocity, BSParam.MaxLinearVelocity);
+ RawVelocity = Util.ClampV(RawVelocity, BSParam.MaxLinearVelocity);
ret = true;
}
if (_rotationalVelocity.LengthSquared() > BSParam.MaxAngularVelocitySquared)
@@ -506,35 +498,13 @@ public class BSPrim : BSPhysObject
}
public override OMV.Vector3 Force {
- get { return _force; }
+ get { return RawForce; }
set {
- _force = value;
- if (_force != OMV.Vector3.Zero)
- {
- // If the force is non-zero, it must be reapplied each tick because
- // Bullet clears the forces applied last frame.
- RegisterPreStepAction("BSPrim.setForce", LocalID,
- delegate(float timeStep)
- {
- if (!IsPhysicallyActive || _force == OMV.Vector3.Zero)
- {
- UnRegisterPreStepAction("BSPrim.setForce", LocalID);
- return;
- }
-
- DetailLog("{0},BSPrim.setForce,preStep,force={1}", LocalID, _force);
- if (PhysBody.HasPhysicalBody)
- {
- PhysicsScene.PE.ApplyCentralForce(PhysBody, _force);
- ActivateIfPhysical(false);
- }
- }
- );
- }
- else
+ RawForce = value;
+ CreateRemoveActor(RawForce == OMV.Vector3.Zero, SetForceActorName, false /* inTaintTime */, delegate()
{
- UnRegisterPreStepAction("BSPrim.setForce", LocalID);
- }
+ return new BSActorSetForce(PhysicsScene, this, SetForceActorName);
+ });
}
}
@@ -670,62 +640,39 @@ public class BSPrim : BSPhysObject
}
}
}
- public override OMV.Vector3 RawVelocity
- {
- get { return _velocity; }
- set { _velocity = value; }
- }
public override OMV.Vector3 Velocity {
- get { return _velocity; }
+ get { return RawVelocity; }
set {
- _velocity = value;
+ RawVelocity = value;
PhysicsScene.TaintedObject("BSPrim.setVelocity", delegate()
{
- // DetailLog("{0},BSPrim.SetVelocity,taint,vel={1}", LocalID, _velocity);
- ForceVelocity = _velocity;
+ // DetailLog("{0},BSPrim.SetVelocity,taint,vel={1}", LocalID, RawVelocity);
+ ForceVelocity = RawVelocity;
});
}
}
public override OMV.Vector3 ForceVelocity {
- get { return _velocity; }
+ get { return RawVelocity; }
set {
PhysicsScene.AssertInTaintTime("BSPrim.ForceVelocity");
- _velocity = Util.ClampV(value, BSParam.MaxLinearVelocity);
+ RawVelocity = Util.ClampV(value, BSParam.MaxLinearVelocity);
if (PhysBody.HasPhysicalBody)
{
- DetailLog("{0},BSPrim.ForceVelocity,taint,vel={1}", LocalID, _velocity);
- PhysicsScene.PE.SetLinearVelocity(PhysBody, _velocity);
+ DetailLog("{0},BSPrim.ForceVelocity,taint,vel={1}", LocalID, RawVelocity);
+ PhysicsScene.PE.SetLinearVelocity(PhysBody, RawVelocity);
ActivateIfPhysical(false);
}
}
}
public override OMV.Vector3 Torque {
- get { return _torque; }
+ get { return RawTorque; }
set {
- _torque = value;
- if (_torque != OMV.Vector3.Zero)
+ RawTorque = value;
+ CreateRemoveActor(RawTorque == OMV.Vector3.Zero, SetTorqueActorName, false /* inTaintTime */, delegate()
{
- // If the torque is non-zero, it must be reapplied each tick because
- // Bullet clears the forces applied last frame.
- RegisterPreStepAction("BSPrim.setTorque", LocalID,
- delegate(float timeStep)
- {
- if (!IsPhysicallyActive || _torque == OMV.Vector3.Zero)
- {
- UnRegisterPreStepAction("BSPrim.setTorque", LocalID);
- return;
- }
-
- if (PhysBody.HasPhysicalBody)
- AddAngularForce(_torque, false, true);
- }
- );
- }
- else
- {
- UnRegisterPreStepAction("BSPrim.setTorque", LocalID);
- }
+ return new BSActorSetTorque(PhysicsScene, this, SetTorqueActorName);
+ });
// DetailLog("{0},BSPrim.SetTorque,call,torque={1}", LocalID, _torque);
}
}
@@ -909,7 +856,7 @@ public class BSPrim : BSPhysObject
// For good measure, make sure the transform is set through to the motion state
ForcePosition = _position;
- ForceVelocity = _velocity;
+ ForceVelocity = RawVelocity;
ForceRotationalVelocity = _rotationalVelocity;
// A dynamic object has mass
@@ -966,15 +913,6 @@ public class BSPrim : BSPhysObject
}
}
- // Enable physical actions. Bullet will keep sleeping non-moving physical objects so
- // they need waking up when parameters are changed.
- // Called in taint-time!!
- private void ActivateIfPhysical(bool forceIt)
- {
- if (IsPhysical && PhysBody.HasPhysicalBody)
- PhysicsScene.PE.Activate(PhysBody, forceIt);
- }
-
// Turn on or off the flag controlling whether collision events are returned to the simulator.
private void EnableCollisions(bool wantsCollisionEvents)
{
@@ -1096,78 +1034,13 @@ public class BSPrim : BSPhysObject
}
}
- // Used for MoveTo
- public override OMV.Vector3 PIDTarget {
- set
- {
- // TODO: add a sanity check -- don't move more than a region or something like that.
- _PIDTarget = value;
- }
- }
- public override float PIDTau {
- set { _PIDTau = value; }
- }
public override bool PIDActive {
set {
- if (value)
- {
- // We're taking over after this.
- ZeroMotion(true);
-
- _targetMotor = new BSVMotor("BSPrim.PIDTarget",
- _PIDTau, // timeScale
- BSMotor.Infinite, // decay time scale
- BSMotor.InfiniteVector, // friction timescale
- 1f // efficiency
- );
- _targetMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG so motor will output detail log messages.
- _targetMotor.SetTarget(_PIDTarget);
- _targetMotor.SetCurrent(RawPosition);
- /*
- _targetMotor = new BSPIDVMotor("BSPrim.PIDTarget");
- _targetMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG so motor will output detail log messages.
-
- _targetMotor.SetTarget(_PIDTarget);
- _targetMotor.SetCurrent(RawPosition);
- _targetMotor.TimeScale = _PIDTau;
- _targetMotor.Efficiency = 1f;
- */
-
- RegisterPreStepAction("BSPrim.PIDTarget", LocalID, delegate(float timeStep)
- {
- if (!IsPhysicallyActive)
- {
- UnRegisterPreStepAction("BSPrim.PIDTarget", LocalID);
- return;
- }
-
- OMV.Vector3 origPosition = RawPosition; // DEBUG DEBUG (for printout below)
-
- // 'movePosition' is where we'd like the prim to be at this moment.
- OMV.Vector3 movePosition = RawPosition + _targetMotor.Step(timeStep);
-
- // If we are very close to our target, turn off the movement motor.
- if (_targetMotor.ErrorIsZero())
- {
- DetailLog("{0},BSPrim.PIDTarget,zeroMovement,movePos={1},pos={2},mass={3}",
- LocalID, movePosition, RawPosition, Mass);
- ForcePosition = _targetMotor.TargetValue;
- _targetMotor.Enabled = false;
- }
- else
- {
- _position = movePosition;
- PositionSanityCheck(true /* intaintTime */);
- ForcePosition = _position;
- }
- DetailLog("{0},BSPrim.PIDTarget,move,fromPos={1},movePos={2}", LocalID, origPosition, movePosition);
- });
- }
- else
+ base.MoveToTargetActive = value;
+ CreateRemoveActor(MoveToTargetActive, MoveToTargetActorName, false /* inTaintTime */, delegate()
{
- // Stop any targetting
- UnRegisterPreStepAction("BSPrim.PIDTarget", LocalID);
- }
+ return new BSActorMoveToTarget(PhysicsScene, this, MoveToTargetActorName);
+ });
}
}
@@ -1175,88 +1048,14 @@ public class BSPrim : BSPhysObject
// Hover Height will override MoveTo target's Z
public override bool PIDHoverActive {
set {
- if (value)
- {
- // Turning the target on
- _hoverMotor = new BSFMotor("BSPrim.Hover",
- _PIDHoverTau, // timeScale
- BSMotor.Infinite, // decay time scale
- BSMotor.Infinite, // friction timescale
- 1f // efficiency
- );
- _hoverMotor.SetTarget(ComputeCurrentPIDHoverHeight());
- _hoverMotor.SetCurrent(RawPosition.Z);
- _hoverMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG so motor will output detail log messages.
-
- RegisterPreStepAction("BSPrim.Hover", LocalID, delegate(float timeStep)
- {
- // Don't do hovering while the object is selected.
- if (!IsPhysicallyActive)
- return;
-
- _hoverMotor.SetCurrent(RawPosition.Z);
- _hoverMotor.SetTarget(ComputeCurrentPIDHoverHeight());
- float targetHeight = _hoverMotor.Step(timeStep);
-
- // 'targetHeight' is where we'd like the Z of the prim to be at this moment.
- // Compute the amount of force to push us there.
- float moveForce = (targetHeight - RawPosition.Z) * Mass;
- // Undo anything the object thinks it's doing at the moment
- moveForce = -RawVelocity.Z * Mass;
-
- PhysicsScene.PE.ApplyCentralImpulse(PhysBody, new OMV.Vector3(0f, 0f, moveForce));
- DetailLog("{0},BSPrim.Hover,move,targHt={1},moveForce={2},mass={3}", LocalID, targetHeight, moveForce, Mass);
- });
- }
- else
+ base.HoverActive = value;
+ CreateRemoveActor(HoverActive /* creatActor */, HoverActorName, false /* inTaintTime */, delegate()
{
- UnRegisterPreStepAction("BSPrim.Hover", LocalID);
- }
- }
- }
- public override float PIDHoverHeight {
- set { _PIDHoverHeight = value; }
- }
- public override PIDHoverType PIDHoverType {
- set { _PIDHoverType = value; }
- }
- public override float PIDHoverTau {
- set { _PIDHoverTau = value; }
- }
- // Based on current position, determine what we should be hovering at now.
- // Must recompute often. What if we walked offa cliff>
- private float ComputeCurrentPIDHoverHeight()
- {
- float ret = _PIDHoverHeight;
- float groundHeight = PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(RawPosition);
-
- switch (_PIDHoverType)
- {
- case PIDHoverType.Ground:
- ret = groundHeight + _PIDHoverHeight;
- break;
- case PIDHoverType.GroundAndWater:
- float waterHeight = PhysicsScene.TerrainManager.GetWaterLevelAtXYZ(RawPosition);
- if (groundHeight > waterHeight)
- {
- ret = groundHeight + _PIDHoverHeight;
- }
- else
- {
- ret = waterHeight + _PIDHoverHeight;
- }
- break;
+ return new BSActorHover(PhysicsScene, this, HoverActorName);
+ });
}
- return ret;
}
-
- // For RotLookAt
- public override OMV.Quaternion APIDTarget { set { return; } }
- public override bool APIDActive { set { return; } }
- public override float APIDStrength { set { return; } }
- public override float APIDDamping { set { return; } }
-
public override void AddForce(OMV.Vector3 force, bool pushforce) {
// Per documentation, max force is limited.
OMV.Vector3 addForce = Util.ClampV(force, BSParam.MaxAddForceMagnitude);
@@ -1324,10 +1123,8 @@ public class BSPrim : BSPhysObject
}
}
- public override void AddAngularForce(OMV.Vector3 force, bool pushforce) {
- AddAngularForce(force, pushforce, false);
- }
- public void AddAngularForce(OMV.Vector3 force, bool pushforce, bool inTaintTime)
+ // BSPhysObject.AddAngularForce()
+ public override void AddAngularForce(OMV.Vector3 force, bool pushforce, bool inTaintTime)
{
if (force.IsFinite())
{
@@ -1694,8 +1491,8 @@ public class BSPrim : BSPhysObject
_orientation = entprop.Rotation;
// DEBUG DEBUG DEBUG -- smooth velocity changes a bit. The simulator seems to be
// very sensitive to velocity changes.
- if (entprop.Velocity == OMV.Vector3.Zero || !entprop.Velocity.ApproxEquals(_velocity, BSParam.UpdateVelocityChangeThreshold))
- _velocity = entprop.Velocity;
+ if (entprop.Velocity == OMV.Vector3.Zero || !entprop.Velocity.ApproxEquals(RawVelocity, BSParam.UpdateVelocityChangeThreshold))
+ RawVelocity = entprop.Velocity;
_acceleration = entprop.Acceleration;
_rotationalVelocity = entprop.RotationalVelocity;
@@ -1705,7 +1502,7 @@ public class BSPrim : BSPhysObject
if (PositionSanityCheck(true /* inTaintTime */ ))
{
entprop.Position = _position;
- entprop.Velocity = _velocity;
+ entprop.Velocity = RawVelocity;
entprop.RotationalVelocity = _rotationalVelocity;
entprop.Acceleration = _acceleration;
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
index 8a15abe..a0131c7 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
@@ -6,7 +6,6 @@ Enable vehicle border crossings (at least as poorly as ODE)
Terrain skirts
Avatar created in previous region and not new region when crossing border
Vehicle recreated in new sim at small Z value (offset from root value?) (DONE)
-Lock axis
Deleting a linkset while standing on the root will leave the physical shape of the root behind.
Not sure if it is because standing on it. Done with large prim linksets.
Linkset child rotations.
@@ -344,3 +343,5 @@ Angular motion around Z moves the vehicle in world Z and not vehicle Z in ODE.
Verify that angular motion specified around Z moves in the vehicle coordinates.
DONE 20130120: BulletSim properly applies force in vehicle relative coordinates.
Nebadon vehicles turning funny in arena (DONE)
+Lock axis (DONE 20130401)
+
--
cgit v1.1
From a7a1b8b7e9269b446e3396a35153b00942c1e35b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 7 Apr 2013 14:05:35 -0700
Subject: BulletSim: clean up actor code so routines use the same coding
pattern. Fix a few enabling problems.
---
.../Physics/BulletSPlugin/BSActorAvatarMove.cs | 22 ++---
.../Region/Physics/BulletSPlugin/BSActorHover.cs | 6 +-
.../Physics/BulletSPlugin/BSActorLockAxis.cs | 105 ++++++++++-----------
.../Physics/BulletSPlugin/BSActorMoveToTarget.cs | 12 +--
.../Physics/BulletSPlugin/BSActorSetForce.cs | 2 +-
.../Physics/BulletSPlugin/BSActorSetTorque.cs | 4 +-
OpenSim/Region/Physics/BulletSPlugin/BSActors.cs | 49 +++++++---
.../Region/Physics/BulletSPlugin/BSCharacter.cs | 3 +
.../Region/Physics/BulletSPlugin/BSPhysObject.cs | 35 +++----
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 22 ++---
10 files changed, 137 insertions(+), 123 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index 634a898..8416740 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -67,14 +67,6 @@ public class BSActorAvatarMove : BSActor
{
m_physicsScene.DetailLog("{0},BSActorAvatarMove,refresh", m_controllingPrim.LocalID);
- // If not active any more, get rid of me (shouldn't ever happen, but just to be safe)
- if (m_controllingPrim.RawForce == OMV.Vector3.Zero)
- {
- m_physicsScene.DetailLog("{0},BSActorAvatarMove,refresh,notAvatarMove,removing={1}", m_controllingPrim.LocalID, ActorName);
- m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
- return;
- }
-
// If the object is physically active, add the hoverer prestep action
if (isActive)
{
@@ -95,14 +87,19 @@ public class BSActorAvatarMove : BSActor
// Nothing to do for the hoverer since it is all software at pre-step action time.
}
+ // Usually called when target velocity changes to set the current velocity and the target
+ // into the movement motor.
public void SetVelocityAndTarget(OMV.Vector3 vel, OMV.Vector3 targ, bool inTaintTime)
{
m_physicsScene.TaintedObject(inTaintTime, "BSActorAvatarMove.setVelocityAndTarget", delegate()
{
- m_velocityMotor.Reset();
- m_velocityMotor.SetTarget(targ);
- m_velocityMotor.SetCurrent(vel);
- m_velocityMotor.Enabled = true;
+ if (m_velocityMotor != null)
+ {
+ m_velocityMotor.Reset();
+ m_velocityMotor.SetTarget(targ);
+ m_velocityMotor.SetCurrent(vel);
+ m_velocityMotor.Enabled = true;
+ }
});
}
@@ -119,6 +116,7 @@ public class BSActorAvatarMove : BSActor
1f // efficiency
);
// _velocityMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG so motor will output detail log messages.
+ SetVelocityAndTarget(m_controllingPrim.RawVelocity, m_controllingPrim.TargetVelocity, true /* inTaintTime */);
m_physicsScene.BeforeStep += Mover;
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
index 8dd3700..e8310df 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
@@ -67,12 +67,10 @@ public class BSActorHover : BSActor
{
m_physicsScene.DetailLog("{0},BSActorHover,refresh", m_controllingPrim.LocalID);
- // If not active any more, get rid of me (shouldn't ever happen, but just to be safe)
+ // If not active any more, turn me off
if (!m_controllingPrim.HoverActive)
{
- m_physicsScene.DetailLog("{0},BSActorHover,refresh,notHovering,removing={1}", m_controllingPrim.LocalID, ActorName);
- m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
- return;
+ SetEnabled(false);
}
// If the object is physically active, add the hoverer prestep action
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
index c40a499..09ee32b 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
@@ -36,7 +36,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
{
public class BSActorLockAxis : BSActor
{
- bool TryExperimentalLockAxisCode = true;
BSConstraint LockAxisConstraint = null;
public BSActorLockAxis(BSScene physicsScene, BSPhysObject pObj, string actorName)
@@ -69,18 +68,13 @@ public class BSActorLockAxis : BSActor
// If all the axis are free, we don't need to exist
if (m_controllingPrim.LockedAxis == m_controllingPrim.LockedAxisFree)
{
- m_physicsScene.DetailLog("{0},BSActorLockAxis,refresh,allAxisFree,removing={1}", m_controllingPrim.LocalID, ActorName);
- m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
- return;
+ Enabled = false;
}
+
// If the object is physically active, add the axis locking constraint
- if (Enabled
- && m_controllingPrim.IsPhysicallyActive
- && TryExperimentalLockAxisCode
- && m_controllingPrim.LockedAxis != m_controllingPrim.LockedAxisFree)
+ if (isActive)
{
- if (LockAxisConstraint == null)
- AddAxisLockConstraint();
+ AddAxisLockConstraint();
}
else
{
@@ -108,58 +102,61 @@ public class BSActorLockAxis : BSActor
private void AddAxisLockConstraint()
{
- // Lock that axis by creating a 6DOF constraint that has one end in the world and
- // the other in the object.
- // http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?p=20817
- // http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?p=26380
+ if (LockAxisConstraint == null)
+ {
+ // Lock that axis by creating a 6DOF constraint that has one end in the world and
+ // the other in the object.
+ // http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?p=20817
+ // http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?p=26380
- // Remove any existing axis constraint (just to be sure)
- RemoveAxisLockConstraint();
+ // Remove any existing axis constraint (just to be sure)
+ RemoveAxisLockConstraint();
- BSConstraint6Dof axisConstrainer = new BSConstraint6Dof(m_physicsScene.World, m_controllingPrim.PhysBody,
- OMV.Vector3.Zero, OMV.Quaternion.Identity,
- false /* useLinearReferenceFrameB */, true /* disableCollisionsBetweenLinkedBodies */);
- LockAxisConstraint = axisConstrainer;
- m_physicsScene.Constraints.AddConstraint(LockAxisConstraint);
+ BSConstraint6Dof axisConstrainer = new BSConstraint6Dof(m_physicsScene.World, m_controllingPrim.PhysBody,
+ OMV.Vector3.Zero, OMV.Quaternion.Identity,
+ false /* useLinearReferenceFrameB */, true /* disableCollisionsBetweenLinkedBodies */);
+ LockAxisConstraint = axisConstrainer;
+ m_physicsScene.Constraints.AddConstraint(LockAxisConstraint);
- // The constraint is tied to the world and oriented to the prim.
+ // The constraint is tied to the world and oriented to the prim.
- // Free to move linearly in the region
- OMV.Vector3 linearLow = OMV.Vector3.Zero;
- OMV.Vector3 linearHigh = m_physicsScene.TerrainManager.DefaultRegionSize;
- axisConstrainer.SetLinearLimits(linearLow, linearHigh);
+ // Free to move linearly in the region
+ OMV.Vector3 linearLow = OMV.Vector3.Zero;
+ OMV.Vector3 linearHigh = m_physicsScene.TerrainManager.DefaultRegionSize;
+ axisConstrainer.SetLinearLimits(linearLow, linearHigh);
- // Angular with some axis locked
- float fPI = (float)Math.PI;
- OMV.Vector3 angularLow = new OMV.Vector3(-fPI, -fPI, -fPI);
- OMV.Vector3 angularHigh = new OMV.Vector3(fPI, fPI, fPI);
- if (m_controllingPrim.LockedAxis.X != 1f)
- {
- angularLow.X = 0f;
- angularHigh.X = 0f;
- }
- if (m_controllingPrim.LockedAxis.Y != 1f)
- {
- angularLow.Y = 0f;
- angularHigh.Y = 0f;
- }
- if (m_controllingPrim.LockedAxis.Z != 1f)
- {
- angularLow.Z = 0f;
- angularHigh.Z = 0f;
- }
- if (!axisConstrainer.SetAngularLimits(angularLow, angularHigh))
- {
- m_physicsScene.DetailLog("{0},BSActorLockAxis.AddAxisLockConstraint,failedSetAngularLimits", m_controllingPrim.LocalID);
- }
+ // Angular with some axis locked
+ float fPI = (float)Math.PI;
+ OMV.Vector3 angularLow = new OMV.Vector3(-fPI, -fPI, -fPI);
+ OMV.Vector3 angularHigh = new OMV.Vector3(fPI, fPI, fPI);
+ if (m_controllingPrim.LockedAxis.X != 1f)
+ {
+ angularLow.X = 0f;
+ angularHigh.X = 0f;
+ }
+ if (m_controllingPrim.LockedAxis.Y != 1f)
+ {
+ angularLow.Y = 0f;
+ angularHigh.Y = 0f;
+ }
+ if (m_controllingPrim.LockedAxis.Z != 1f)
+ {
+ angularLow.Z = 0f;
+ angularHigh.Z = 0f;
+ }
+ if (!axisConstrainer.SetAngularLimits(angularLow, angularHigh))
+ {
+ m_physicsScene.DetailLog("{0},BSActorLockAxis.AddAxisLockConstraint,failedSetAngularLimits", m_controllingPrim.LocalID);
+ }
- m_physicsScene.DetailLog("{0},BSActorLockAxis.AddAxisLockConstraint,create,linLow={1},linHi={2},angLow={3},angHi={4}",
- m_controllingPrim.LocalID, linearLow, linearHigh, angularLow, angularHigh);
+ m_physicsScene.DetailLog("{0},BSActorLockAxis.AddAxisLockConstraint,create,linLow={1},linHi={2},angLow={3},angHi={4}",
+ m_controllingPrim.LocalID, linearLow, linearHigh, angularLow, angularHigh);
- // Constants from one of the posts mentioned above and used in Bullet's ConstraintDemo.
- axisConstrainer.TranslationalLimitMotor(true /* enable */, 5.0f, 0.1f);
+ // Constants from one of the posts mentioned above and used in Bullet's ConstraintDemo.
+ axisConstrainer.TranslationalLimitMotor(true /* enable */, 5.0f, 0.1f);
- axisConstrainer.RecomputeConstraintVariables(m_controllingPrim.RawMass);
+ axisConstrainer.RecomputeConstraintVariables(m_controllingPrim.RawMass);
+ }
}
private void RemoveAxisLockConstraint()
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
index 3517ef2..16c2b14 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
@@ -67,15 +67,12 @@ public class BSActorMoveToTarget : BSActor
{
m_physicsScene.DetailLog("{0},BSActorMoveToTarget,refresh", m_controllingPrim.LocalID);
- // If not active any more, get rid of me (shouldn't ever happen, but just to be safe)
- if (!m_controllingPrim.HoverActive)
+ // If not active any more...
+ if (!m_controllingPrim.MoveToTargetActive)
{
- m_physicsScene.DetailLog("{0},BSActorMoveToTarget,refresh,notMoveToTarget,removing={1}", m_controllingPrim.LocalID, ActorName);
- m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
- return;
+ Enabled = false;
}
- // If the object is physically active, add the hoverer prestep action
if (isActive)
{
ActivateMoveToTarget();
@@ -92,7 +89,7 @@ public class BSActorMoveToTarget : BSActor
// BSActor.RemoveBodyDependencies()
public override void RemoveBodyDependencies()
{
- // Nothing to do for the hoverer since it is all software at pre-step action time.
+ // Nothing to do for the moveToTarget since it is all software at pre-step action time.
}
// If a hover motor has not been created, create one and start the hovering.
@@ -144,7 +141,6 @@ public class BSActorMoveToTarget : BSActor
m_physicsScene.DetailLog("{0},BSPrim.PIDTarget,zeroMovement,movePos={1},pos={2},mass={3}",
m_controllingPrim.LocalID, movePosition, m_controllingPrim.RawPosition, m_controllingPrim.Mass);
m_controllingPrim.ForcePosition = m_targetMotor.TargetValue;
- m_targetMotor.Enabled = false;
}
else
{
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
index d942490..3ad138d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
@@ -71,7 +71,7 @@ public class BSActorSetForce : BSActor
if (m_controllingPrim.RawForce == OMV.Vector3.Zero)
{
m_physicsScene.DetailLog("{0},BSActorSetForce,refresh,notSetForce,removing={1}", m_controllingPrim.LocalID, ActorName);
- m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
+ Enabled = false;
return;
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
index e0f719f..159a3a8 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
@@ -70,8 +70,8 @@ public class BSActorSetTorque : BSActor
// If not active any more, get rid of me (shouldn't ever happen, but just to be safe)
if (m_controllingPrim.RawTorque == OMV.Vector3.Zero)
{
- m_physicsScene.DetailLog("{0},BSActorSetTorque,refresh,notSetTorque,removing={1}", m_controllingPrim.LocalID, ActorName);
- m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
+ m_physicsScene.DetailLog("{0},BSActorSetTorque,refresh,notSetTorque,disabling={1}", m_controllingPrim.LocalID, ActorName);
+ Enabled = false;
return;
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
index fb4d452..12a8817 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
@@ -42,24 +42,36 @@ public class BSActorCollection
}
public void Add(string name, BSActor actor)
{
- m_actors[name] = actor;
+ lock (m_actors)
+ {
+ if (!m_actors.ContainsKey(name))
+ {
+ m_actors[name] = actor;
+ }
+ }
}
public bool RemoveAndRelease(string name)
{
bool ret = false;
- if (m_actors.ContainsKey(name))
+ lock (m_actors)
{
- BSActor beingRemoved = m_actors[name];
- beingRemoved.Dispose();
- m_actors.Remove(name);
- ret = true;
+ if (m_actors.ContainsKey(name))
+ {
+ BSActor beingRemoved = m_actors[name];
+ m_actors.Remove(name);
+ beingRemoved.Dispose();
+ ret = true;
+ }
}
return ret;
}
public void Clear()
{
- Release();
- m_actors.Clear();
+ lock (m_actors)
+ {
+ Release();
+ m_actors.Clear();
+ }
}
public void Dispose()
{
@@ -69,15 +81,22 @@ public class BSActorCollection
{
return m_actors.ContainsKey(name);
}
+ public bool TryGetActor(string actorName, out BSActor theActor)
+ {
+ return m_actors.TryGetValue(actorName, out theActor);
+ }
public void ForEachActor(Action act)
{
- foreach (KeyValuePair kvp in m_actors)
- act(kvp.Value);
+ lock (m_actors)
+ {
+ foreach (KeyValuePair kvp in m_actors)
+ act(kvp.Value);
+ }
}
public void Enable(bool enabl)
{
- ForEachActor(a => a.Enable(enabl));
+ ForEachActor(a => a.SetEnabled(enabl));
}
public void Release()
{
@@ -106,7 +125,7 @@ public abstract class BSActor
{
protected BSScene m_physicsScene { get; private set; }
protected BSPhysObject m_controllingPrim { get; private set; }
- protected bool Enabled { get; set; }
+ public virtual bool Enabled { get; set; }
public string ActorName { get; private set; }
public BSActor(BSScene physicsScene, BSPhysObject pObj, string actorName)
@@ -122,8 +141,10 @@ public abstract class BSActor
{
get { return Enabled; }
}
- // Turn the actor on an off.
- public virtual void Enable(bool setEnabled)
+
+ // Turn the actor on an off. Only used by ActorCollection to set all enabled/disabled.
+ // Anyone else should assign true/false to 'Enabled'.
+ public void SetEnabled(bool setEnabled)
{
Enabled = setEnabled;
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 09c9b16..a0d58d3 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -160,6 +160,9 @@ public sealed class BSCharacter : BSPhysObject
// Make so capsule does not fall over
PhysicsScene.PE.SetAngularFactorV(PhysBody, OMV.Vector3.Zero);
+ // The avatar mover sets some parameters.
+ PhysicalActors.Refresh();
+
PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.CF_CHARACTER_OBJECT);
PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, PhysBody);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 644bc7e..64bf395 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -282,30 +282,31 @@ public abstract class BSPhysObject : PhysicsActor
// 'actors' act on the physical object to change or constrain its motion. These can range from
// hovering to complex vehicle motion.
+ // May be called at non-taint time as this just adds the actor to the action list and the real
+ // work is done during the simulation step.
+ // Note that, if the actor is already in the list and we are disabling same, the actor is just left
+ // in the list disabled.
public delegate BSActor CreateActor();
- public void CreateRemoveActor(bool createRemove, string actorName, bool inTaintTime, CreateActor creator)
+ public void EnableActor(bool enableActor, string actorName, CreateActor creator)
{
- if (createRemove)
+ lock (PhysicalActors)
{
- PhysicsScene.TaintedObject(inTaintTime, "BSPrim.CreateRemoveActor:" + actorName, delegate()
+ BSActor theActor;
+ if (PhysicalActors.TryGetActor(actorName, out theActor))
{
- if (!PhysicalActors.HasActor(actorName))
- {
- DetailLog("{0},BSPrim.CreateRemoveActor,taint,registerActor,a={1}", LocalID, actorName);
- PhysicalActors.Add(actorName, creator());
- }
- });
- }
- else
- {
- PhysicsScene.TaintedObject(inTaintTime, "BSPrim.CreateRemoveActor:" + actorName, delegate()
+ // The actor already exists so just turn it on or off
+ theActor.Enabled = enableActor;
+ }
+ else
{
- if (PhysicalActors.HasActor(actorName))
+ // The actor does not exist. If it should, create it.
+ if (enableActor)
{
- DetailLog("{0},BSPrim.CreateRemoveActor,taint,unregisterActor,a={1}", LocalID, actorName);
- PhysicalActors.RemoveAndRelease(actorName);
+ theActor = creator();
+ PhysicalActors.Add(actorName, theActor);
+ theActor.Enabled = true;
}
- });
+ }
}
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 71fea59..16c7a90 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -95,6 +95,7 @@ public class BSPrim : BSPhysObject
_isPhysical = pisPhysical;
_isVolumeDetect = false;
+ // We keep a handle to the vehicle actor so we can set vehicle parameters later.
VehicleActor = new BSDynamics(PhysicsScene, this, VehicleActorName);
PhysicalActors.Add(VehicleActorName, VehicleActor);
@@ -264,7 +265,7 @@ public class BSPrim : BSPhysObject
if (axis.Z != 1) locking.Z = 0f;
LockedAxis = locking;
- CreateRemoveActor(LockedAxis != LockedAxisFree /* creatActor */, LockedAxisActorName, false /* inTaintTime */, delegate()
+ EnableActor(LockedAxis != LockedAxisFree, LockedAxisActorName, delegate()
{
return new BSActorLockAxis(PhysicsScene, this, LockedAxisActorName);
});
@@ -501,7 +502,7 @@ public class BSPrim : BSPhysObject
get { return RawForce; }
set {
RawForce = value;
- CreateRemoveActor(RawForce == OMV.Vector3.Zero, SetForceActorName, false /* inTaintTime */, delegate()
+ EnableActor(RawForce != OMV.Vector3.Zero, SetForceActorName, delegate()
{
return new BSActorSetForce(PhysicsScene, this, SetForceActorName);
});
@@ -510,14 +511,13 @@ public class BSPrim : BSPhysObject
public override int VehicleType {
get {
- return (int)VehicleActor.Type; // if we are a vehicle, return that type
+ return (int)VehicleActor.Type;
}
set {
Vehicle type = (Vehicle)value;
PhysicsScene.TaintedObject("setVehicleType", delegate()
{
- // Done at taint time so we're sure the physics engine is not using the variables
// Vehicle code changes the parameters for this vehicle type.
VehicleActor.ProcessTypeChange(type);
ActivateIfPhysical(false);
@@ -669,11 +669,11 @@ public class BSPrim : BSPhysObject
get { return RawTorque; }
set {
RawTorque = value;
- CreateRemoveActor(RawTorque == OMV.Vector3.Zero, SetTorqueActorName, false /* inTaintTime */, delegate()
+ EnableActor(RawTorque != OMV.Vector3.Zero, SetTorqueActorName, delegate()
{
return new BSActorSetTorque(PhysicsScene, this, SetTorqueActorName);
});
- // DetailLog("{0},BSPrim.SetTorque,call,torque={1}", LocalID, _torque);
+ DetailLog("{0},BSPrim.SetTorque,call,torque={1}", LocalID, RawTorque);
}
}
public override OMV.Vector3 Acceleration {
@@ -786,7 +786,6 @@ public class BSPrim : BSPhysObject
MakeDynamic(IsStatic);
// Update vehicle specific parameters (after MakeDynamic() so can change physical parameters)
- VehicleActor.Refresh();
PhysicalActors.Refresh();
// Arrange for collision events if the simulator wants them
@@ -1037,7 +1036,7 @@ public class BSPrim : BSPhysObject
public override bool PIDActive {
set {
base.MoveToTargetActive = value;
- CreateRemoveActor(MoveToTargetActive, MoveToTargetActorName, false /* inTaintTime */, delegate()
+ EnableActor(MoveToTargetActive, MoveToTargetActorName, delegate()
{
return new BSActorMoveToTarget(PhysicsScene, this, MoveToTargetActorName);
});
@@ -1049,7 +1048,7 @@ public class BSPrim : BSPhysObject
public override bool PIDHoverActive {
set {
base.HoverActive = value;
- CreateRemoveActor(HoverActive /* creatActor */, HoverActorName, false /* inTaintTime */, delegate()
+ EnableActor(HoverActive, HoverActorName, delegate()
{
return new BSActorHover(PhysicsScene, this, HoverActorName);
});
@@ -1458,7 +1457,7 @@ public class BSPrim : BSPhysObject
{
// Create the correct physical representation for this type of object.
// Updates base.PhysBody and base.PhysShape with the new information.
- // Ignore 'forceRebuild'. This routine makes the right choices and changes of necessary.
+ // Ignore 'forceRebuild'. 'GetBodyAndShape' makes the right choices and changes of necessary.
PhysicsScene.Shapes.GetBodyAndShape(false /*forceRebuild */, PhysicsScene.World, this, null, delegate(BulletBody dBody)
{
// Called if the current prim body is about to be destroyed.
@@ -1472,9 +1471,9 @@ public class BSPrim : BSPhysObject
return;
}
+ // Called at taint-time
protected virtual void RemoveBodyDependencies()
{
- VehicleActor.RemoveBodyDependencies();
PhysicalActors.RemoveBodyDependencies();
}
@@ -1482,6 +1481,7 @@ public class BSPrim : BSPhysObject
// the world that things have changed.
public override void UpdateProperties(EntityProperties entprop)
{
+ // Let anyone (like the actors) modify the updated properties before they are pushed into the object and the simulator.
TriggerPreUpdatePropertyAction(ref entprop);
// DetailLog("{0},BSPrim.UpdateProperties,entry,entprop={1}", LocalID, entprop); // DEBUG DEBUG
--
cgit v1.1
From 99f39836a1879a807bb7d6bf5bf793c3a99584c4 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 8 Apr 2013 06:27:01 -0700
Subject: BulletSim: moving comments around. No functional change.
---
OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs | 2 +-
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 10 +---------
OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 9 +++++++++
3 files changed, 11 insertions(+), 10 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
index 159a3a8..7a791ec 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
@@ -65,7 +65,7 @@ public class BSActorSetTorque : BSActor
// BSActor.Refresh()
public override void Refresh()
{
- m_physicsScene.DetailLog("{0},BSActorSetTorque,refresh", m_controllingPrim.LocalID);
+ m_physicsScene.DetailLog("{0},BSActorSetTorque,refresh,torque={1}", m_controllingPrim.LocalID, m_controllingPrim.RawTorque);
// If not active any more, get rid of me (shouldn't ever happen, but just to be safe)
if (m_controllingPrim.RawTorque == OMV.Vector3.Zero)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 16c7a90..3423d2e 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -1514,16 +1514,8 @@ public class BSPrim : BSPhysObject
LastEntityProperties = CurrentEntityProperties;
CurrentEntityProperties = entprop;
+ // Note that BSPrim can be overloaded by BSPrimLinkable which controls updates from root and children prims.
base.RequestPhysicsterseUpdate();
- /*
- else
- {
- // For debugging, report the movement of children
- DetailLog("{0},BSPrim.UpdateProperties,child,pos={1},orient={2},vel={3},accel={4},rotVel={5}",
- LocalID, entprop.Position, entprop.Rotation, entprop.Velocity,
- entprop.Acceleration, entprop.RotationalVelocity);
- }
- */
}
}
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index d65d407..28242d4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -163,6 +163,15 @@ public class BSPrimLinkable : BSPrimDisplaced
// TODO: this will have to change when linksets are articulated.
base.UpdateProperties(entprop);
}
+ /*
+ else
+ {
+ // For debugging, report the movement of children
+ DetailLog("{0},BSPrim.UpdateProperties,child,pos={1},orient={2},vel={3},accel={4},rotVel={5}",
+ LocalID, entprop.Position, entprop.Rotation, entprop.Velocity,
+ entprop.Acceleration, entprop.RotationalVelocity);
+ }
+ */
// The linkset might like to know about changing locations
Linkset.UpdateProperties(UpdatedProperties.EntPropUpdates, this);
}
--
cgit v1.1
From 8e04c752fc2bc1f27fce224d2aec3ea72edbc2cc Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Apr 2013 22:38:47 +0100
Subject: If OpenSimulator is writing a PID file and finds the file already
present on startup, logging an error since this is commonly due to an unclean
shutdown.
Unclean shutdown can cause constantly moving objects to disappear if an OAR has just been loaded and they have not reached persistence time threshold, among other problems.
---
OpenSim/Framework/Servers/ServerBase.cs | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'OpenSim')
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 657444c..2c4a687 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -76,6 +76,11 @@ namespace OpenSim.Framework.Servers
protected void CreatePIDFile(string path)
{
+ if (File.Exists(path))
+ m_log.ErrorFormat(
+ "[SERVER BASE]: Previous pid file {0} still exists on startup. Possibly previously unclean shutdown.",
+ path);
+
try
{
string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString();
--
cgit v1.1
From 8690a08881d41c285dd830b4b1646eb116ad098d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Apr 2013 23:02:11 +0100
Subject: minor: Log an exception if we aren't able to delete a script state
file rather than simply ignoring it.
This should never normally happen but if it does then it can be valuable diagonstic information.
---
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index bf19a42..1e6db43 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -520,8 +520,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
{
File.Delete(savedState);
}
- catch(Exception)
+ catch (Exception e)
{
+ m_log.Warn(
+ string.Format(
+ "[SCRIPT INSTANCE]: Could not delete script state {0} for script {1} (id {2}) in part {3} (id {4}) in object {5} in {6}. Exception ",
+ ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name),
+ e);
}
}
--
cgit v1.1
From 06068444e2486cb761d266c6831c54fc27d7d5c2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Apr 2013 23:21:13 +0100
Subject: Comment out rez perms logging I accidentally left in at 7f07023 (Sat
Apr 6 02:34:51 2013)
---
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 77299be..f8e93e1 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -1453,7 +1453,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
bool permission = false;
- m_log.DebugFormat("[PERMISSIONS MODULE]: Checking rez object at {0} in {1}", objectPosition, m_scene.Name);
+// m_log.DebugFormat("[PERMISSIONS MODULE]: Checking rez object at {0} in {1}", objectPosition, m_scene.Name);
ILandObject land = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
if (land == null) return false;
--
cgit v1.1
From e20b0d5695dc583d161b39fa26bfd56e63c7b30e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 10 Apr 2013 00:03:37 +0100
Subject: minor: Make exceptions thrown by MySQLAssetData more consistent.
---
OpenSim/Data/MySQL/MySQLAssetData.cs | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index cf80b3d..21362b9 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -142,7 +142,8 @@ namespace OpenSim.Data.MySQL
}
catch (Exception e)
{
- m_log.Error("[ASSETS DB]: MySql failure fetching asset " + assetID + ": " + e.Message);
+ m_log.Error(
+ string.Format("[ASSETS DB]: MySql failure fetching asset {0}. Exception ", assetID), e);
}
}
}
@@ -209,8 +210,11 @@ namespace OpenSim.Data.MySQL
}
catch (Exception e)
{
- m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
- asset.FullID, asset.Name, e.Message);
+ m_log.Error(
+ string.Format(
+ "[ASSET DB]: MySQL failure creating asset {0} with name {1}. Exception ",
+ asset.FullID, asset.Name)
+ , e);
}
}
}
@@ -241,10 +245,11 @@ namespace OpenSim.Data.MySQL
}
catch (Exception e)
{
- m_log.ErrorFormat(
- "[ASSETS DB]: " +
- "MySql failure updating access_time for asset {0} with name {1}" + Environment.NewLine + e.ToString()
- + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name);
+ m_log.Error(
+ string.Format(
+ "[ASSETS DB]: Failure updating access_time for asset {0} with name {1}. Exception ",
+ asset.FullID, asset.Name),
+ e);
}
}
}
@@ -284,8 +289,8 @@ namespace OpenSim.Data.MySQL
}
catch (Exception e)
{
- m_log.ErrorFormat(
- "[ASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString(), uuid);
+ m_log.Error(
+ string.Format("[ASSETS DB]: MySql failure fetching asset {0}. Exception ", uuid), e);
}
}
}
@@ -344,7 +349,11 @@ namespace OpenSim.Data.MySQL
}
catch (Exception e)
{
- m_log.Error("[ASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
+ m_log.Error(
+ string.Format(
+ "[ASSETS DB]: MySql failure fetching asset set from {0}, count {1}. Exception ",
+ start, count),
+ e);
}
}
}
--
cgit v1.1
From 29e28f4b84677fa1e1b138d0ede610c55add12f2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 10 Apr 2013 00:05:03 +0100
Subject: minor: remove mono compiler warnings in InventoryAccessModule
---
.../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index f796ec9..e0009bb 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -353,7 +353,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
bool asAttachment)
{
CoalescedSceneObjects coa = new CoalescedSceneObjects(UUID.Zero);
- Dictionary originalPositions = new Dictionary();
+// Dictionary originalPositions = new Dictionary();
foreach (SceneObjectGroup objectGroup in objlist)
{
@@ -936,8 +936,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
}
}
- int primcount = 0;
- for(int i = 0; i < objlist.Count; i++)
+ for (int i = 0; i < objlist.Count; i++)
{
SceneObjectGroup g = objlist[i];
--
cgit v1.1
From 148e46563f9f95e43a460780592deceed3dd5d14 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 10 Apr 2013 00:07:58 +0100
Subject: minor: fix mono compiler warning in ScriptsHttpRequests.cs
---
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 1 -
1 file changed, 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index ebf56cd..6793fc8 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -395,7 +395,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
//public bool HttpVerboseThrottle = true; // not implemented
public List HttpCustomHeaders = null;
public bool HttpPragmaNoCache = true;
- private Thread httpThread;
// Request info
private UUID _itemID;
--
cgit v1.1
From 17fd075f39df71d628db08b7c280150f231f8a26 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 9 Apr 2013 11:55:29 -0700
Subject: BulletSim: fix problem where large sets of mega-regions weren't
registering all the terrain with the base region.
---
OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
index cd15850..5240ad8 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
@@ -213,13 +213,13 @@ public sealed class BSTerrainManager : IDisposable
});
}
- // Another region is calling this region passing a terrain.
+ // Another region is calling this region and passing a terrain.
// A region that is not the mega-region root will pass its terrain to the root region so the root region
// physics engine will have all the terrains.
private void AddMegaRegionChildTerrain(uint id, float[] heightMap, Vector3 minCoords, Vector3 maxCoords)
{
// Since we are called by another region's thread, the action must be rescheduled onto our processing thread.
- PhysicsScene.PostTaintObject("TerrainManager.AddMegaRegionChild" + m_worldOffset.ToString(), 0, delegate()
+ PhysicsScene.PostTaintObject("TerrainManager.AddMegaRegionChild" + minCoords.ToString(), id, delegate()
{
UpdateTerrain(id, heightMap, minCoords, maxCoords);
});
@@ -306,7 +306,7 @@ public sealed class BSTerrainManager : IDisposable
newTerrainID = ++m_terrainCount;
DetailLog("{0},BSTerrainManager.UpdateTerrain:NewTerrain,taint,newID={1},minCoord={2},maxCoord={3}",
- BSScene.DetailLogZero, newTerrainID, minCoords, minCoords);
+ BSScene.DetailLogZero, newTerrainID, minCoords, maxCoords);
BSTerrainPhys newTerrainPhys = BuildPhysicalTerrain(terrainRegionBase, id, heightMap, minCoords, maxCoords);
m_terrains.Add(terrainRegionBase, newTerrainPhys);
--
cgit v1.1
From 59135c9a31875dc514b3ea2fe14021571807701d Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 9 Apr 2013 16:32:54 -0700
Subject: BulletSim: add Bullet HACD library invocation. Turned off by default
as not totally debugged. Updated DLLs and SOs with more debugged HACD library
code.
---
OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 53 ++++-
OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 1 +
.../Physics/BulletSPlugin/BSShapeCollection.cs | 223 ++++++++++++---------
3 files changed, 183 insertions(+), 94 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 385ed9e..06df85e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -86,6 +86,7 @@ public static class BSParam
public static bool ShouldForceSimplePrimMeshing { get; private set; } // if a cube or sphere, let Bullet do internal shapes
public static bool ShouldUseHullsForPhysicalObjects { get; private set; } // 'true' if should create hulls for physical objects
public static bool ShouldRemoveZeroWidthTriangles { get; private set; }
+ public static bool ShouldUseBulletHACD { get; set; }
public static float TerrainImplementation { get; private set; }
public static int TerrainMeshMagnification { get; private set; }
@@ -149,6 +150,15 @@ public static class BSParam
public static float CSHullVolumeConservationThresholdPercent { get; private set; }
public static int CSHullMaxVertices { get; private set; }
public static float CSHullMaxSkinWidth { get; private set; }
+ public static float BHullMaxVerticesPerHull { get; private set; } // 100
+ public static float BHullMinClusters { get; private set; } // 2
+ public static float BHullCompacityWeight { get; private set; } // 0.1
+ public static float BHullVolumeWeight { get; private set; } // 0.0
+ public static float BHullConcavity { get; private set; } // 100
+ public static bool BHullAddExtraDistPoints { get; private set; } // false
+ public static bool BHullAddNeighboursDistPoints { get; private set; } // false
+ public static bool BHullAddFacesPoints { get; private set; } // false
+ public static bool BHullShouldAdjustCollisionMargin { get; private set; } // false
// Linkset implementation parameters
public static float LinksetImplementation { get; private set; }
@@ -325,6 +335,10 @@ public static class BSParam
true,
(s) => { return ShouldRemoveZeroWidthTriangles; },
(s,v) => { ShouldRemoveZeroWidthTriangles = v; } ),
+ new ParameterDefn("ShouldUseBulletHACD", "If true, use the Bullet version of HACD",
+ false,
+ (s) => { return ShouldUseBulletHACD; },
+ (s,v) => { ShouldUseBulletHACD = v; } ),
new ParameterDefn("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions",
5,
@@ -663,10 +677,47 @@ public static class BSParam
(s) => { return CSHullMaxVertices; },
(s,v) => { CSHullMaxVertices = v; } ),
new ParameterDefn("CSHullMaxSkinWidth", "CS impl: skin width to apply to output hulls.",
- 0,
+ 0f,
(s) => { return CSHullMaxSkinWidth; },
(s,v) => { CSHullMaxSkinWidth = v; } ),
+ new ParameterDefn("BHullMaxVerticesPerHull", "Bullet impl: max number of vertices per created hull",
+ 100f,
+ (s) => { return BHullMaxVerticesPerHull; },
+ (s,v) => { BHullMaxVerticesPerHull = v; } ),
+ new ParameterDefn("BHullMinClusters", "Bullet impl: minimum number of hulls to create per mesh",
+ 2f,
+ (s) => { return BHullMinClusters; },
+ (s,v) => { BHullMinClusters = v; } ),
+ new ParameterDefn("BHullCompacityWeight", "Bullet impl: weight factor for how compact to make hulls",
+ 2f,
+ (s) => { return BHullCompacityWeight; },
+ (s,v) => { BHullCompacityWeight = v; } ),
+ new ParameterDefn("BHullVolumeWeight", "Bullet impl: weight factor for volume in created hull",
+ 0.1f,
+ (s) => { return BHullVolumeWeight; },
+ (s,v) => { BHullVolumeWeight = v; } ),
+ new ParameterDefn("BHullConcavity", "Bullet impl: weight factor for how convex a created hull can be",
+ 100f,
+ (s) => { return BHullConcavity; },
+ (s,v) => { BHullConcavity = v; } ),
+ new ParameterDefn("BHullAddExtraDistPoints", "Bullet impl: whether to add extra vertices for long distance vectors",
+ false,
+ (s) => { return BHullAddExtraDistPoints; },
+ (s,v) => { BHullAddExtraDistPoints = v; } ),
+ new ParameterDefn("BHullAddNeighboursDistPoints", "Bullet impl: whether to add extra vertices between neighbor hulls",
+ false,
+ (s) => { return BHullAddNeighboursDistPoints; },
+ (s,v) => { BHullAddNeighboursDistPoints = v; } ),
+ new ParameterDefn("BHullAddFacesPoints", "Bullet impl: whether to add extra vertices to break up hull faces",
+ false,
+ (s) => { return BHullAddFacesPoints; },
+ (s,v) => { BHullAddFacesPoints = v; } ),
+ new ParameterDefn("BHullShouldAdjustCollisionMargin", "Bullet impl: whether to shrink resulting hulls to account for collision margin",
+ false,
+ (s) => { return BHullShouldAdjustCollisionMargin; },
+ (s,v) => { BHullShouldAdjustCollisionMargin = v; } ),
+
new ParameterDefn("LinksetImplementation", "Type of linkset implementation (0=Constraint, 1=Compound, 2=Manual)",
(float)BSLinkset.LinksetImplementation.Compound,
(s) => { return LinksetImplementation; },
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 9818b05..8e05b58 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -316,6 +316,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
break;
case "bulletxna":
ret = new BSAPIXNA(engineName, this);
+ BSParam.ShouldUseBulletHACD = false;
break;
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index b6ac23d..bfa69b2 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -720,7 +720,7 @@ public sealed class BSShapeCollection : IDisposable
// Remove usage of the previous shape.
DereferenceShape(prim.PhysShape, shapeCallback);
- newShape = CreatePhysicalHull(prim.PhysObjectName, newHullKey, prim.BaseShape, prim.Size, lod);
+ newShape = CreatePhysicalHull(prim, newHullKey, prim.BaseShape, prim.Size, lod);
// It might not have been created if we're waiting for an asset.
newShape = VerifyMeshCreated(newShape, prim);
@@ -731,7 +731,7 @@ public sealed class BSShapeCollection : IDisposable
}
List m_hulls;
- private BulletShape CreatePhysicalHull(string objName, System.UInt64 newHullKey, PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
+ private BulletShape CreatePhysicalHull(BSPhysObject prim, System.UInt64 newHullKey, PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
{
BulletShape newShape = new BulletShape();
@@ -745,116 +745,153 @@ public sealed class BSShapeCollection : IDisposable
}
else
{
- // Build a new hull in the physical world.
- // Pass true for physicalness as this prevents the creation of bounding box which is not needed
- IMesh meshData = PhysicsScene.mesher.CreateMesh(objName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
- if (meshData != null)
+ if (BSParam.ShouldUseBulletHACD)
{
-
- int[] indices = meshData.getIndexListAsInt();
- List vertices = meshData.getVertexList();
-
- //format conversion from IMesh format to DecompDesc format
- List convIndices = new List();
- List convVertices = new List();
- for (int ii = 0; ii < indices.GetLength(0); ii++)
+ DetailLog("{0},BSShapeCollection.CreatePhysicalHull,shouldUseBulletHACD,entry", prim.LocalID);
+ MeshDesc meshDesc;
+ if (!Meshes.TryGetValue(newHullKey, out meshDesc))
{
- convIndices.Add(indices[ii]);
+ // That's odd because the mesh should have been created before the hull
+ // but, since it doesn't exist, create it.
+ newShape = CreatePhysicalMesh(prim, newHullKey, prim.BaseShape, prim.Size, lod);
+ DetailLog("{0},BSShapeCollection.CreatePhysicalHull,noMeshBuiltNew,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
+
+ if (newShape.HasPhysicalShape)
+ {
+ ReferenceShape(newShape);
+ Meshes.TryGetValue(newHullKey, out meshDesc);
+ }
}
- foreach (OMV.Vector3 vv in vertices)
+ if (meshDesc.shape.HasPhysicalShape)
{
- convVertices.Add(new float3(vv.X, vv.Y, vv.Z));
+ HACDParams parms;
+ parms.maxVerticesPerHull = BSParam.BHullMaxVerticesPerHull;
+ parms.minClusters = BSParam.BHullMinClusters;
+ parms.compacityWeight = BSParam.BHullCompacityWeight;
+ parms.volumeWeight = BSParam.BHullVolumeWeight;
+ parms.concavity = BSParam.BHullConcavity;
+ parms.addExtraDistPoints = BSParam.NumericBool(BSParam.BHullAddExtraDistPoints);
+ parms.addNeighboursDistPoints = BSParam.NumericBool(BSParam.BHullAddNeighboursDistPoints);
+ parms.addFacesPoints = BSParam.NumericBool(BSParam.BHullAddFacesPoints);
+ parms.shouldAdjustCollisionMargin = BSParam.NumericBool(BSParam.BHullShouldAdjustCollisionMargin);
+
+ DetailLog("{0},BSShapeCollection.CreatePhysicalHull,hullFromMesh,beforeCall", prim.LocalID, newShape.HasPhysicalShape);
+ newShape = PhysicsScene.PE.BuildHullShapeFromMesh(PhysicsScene.World, meshDesc.shape, parms);
+ DetailLog("{0},BSShapeCollection.CreatePhysicalHull,hullFromMesh,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
}
-
- uint maxDepthSplit = (uint)BSParam.CSHullMaxDepthSplit;
- if (BSParam.CSHullMaxDepthSplit != BSParam.CSHullMaxDepthSplitForSimpleShapes)
+ DetailLog("{0},BSShapeCollection.CreatePhysicalHull,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
+ }
+ if (!newShape.HasPhysicalShape)
+ {
+ // Build a new hull in the physical world.
+ // Pass true for physicalness as this prevents the creation of bounding box which is not needed
+ IMesh meshData = PhysicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
+ if (meshData != null)
{
- // Simple primitive shapes we know are convex so they are better implemented with
- // fewer hulls.
- // Check for simple shape (prim without cuts) and reduce split parameter if so.
- if (PrimHasNoCuts(pbs))
+ int[] indices = meshData.getIndexListAsInt();
+ List vertices = meshData.getVertexList();
+
+ //format conversion from IMesh format to DecompDesc format
+ List convIndices = new List();
+ List convVertices = new List();
+ for (int ii = 0; ii < indices.GetLength(0); ii++)
{
- maxDepthSplit = (uint)BSParam.CSHullMaxDepthSplitForSimpleShapes;
+ convIndices.Add(indices[ii]);
+ }
+ foreach (OMV.Vector3 vv in vertices)
+ {
+ convVertices.Add(new float3(vv.X, vv.Y, vv.Z));
}
- }
- // setup and do convex hull conversion
- m_hulls = new List();
- DecompDesc dcomp = new DecompDesc();
- dcomp.mIndices = convIndices;
- dcomp.mVertices = convVertices;
- dcomp.mDepth = maxDepthSplit;
- dcomp.mCpercent = BSParam.CSHullConcavityThresholdPercent;
- dcomp.mPpercent = BSParam.CSHullVolumeConservationThresholdPercent;
- dcomp.mMaxVertices = (uint)BSParam.CSHullMaxVertices;
- dcomp.mSkinWidth = BSParam.CSHullMaxSkinWidth;
- ConvexBuilder convexBuilder = new ConvexBuilder(HullReturn);
- // create the hull into the _hulls variable
- convexBuilder.process(dcomp);
-
- DetailLog("{0},BSShapeCollection.CreatePhysicalHull,key={1},inVert={2},inInd={3},split={4},hulls={5}",
- BSScene.DetailLogZero, newHullKey, indices.GetLength(0), vertices.Count, maxDepthSplit, m_hulls.Count);
-
- // Convert the vertices and indices for passing to unmanaged.
- // The hull information is passed as a large floating point array.
- // The format is:
- // convHulls[0] = number of hulls
- // convHulls[1] = number of vertices in first hull
- // convHulls[2] = hull centroid X coordinate
- // convHulls[3] = hull centroid Y coordinate
- // convHulls[4] = hull centroid Z coordinate
- // convHulls[5] = first hull vertex X
- // convHulls[6] = first hull vertex Y
- // convHulls[7] = first hull vertex Z
- // convHulls[8] = second hull vertex X
- // ...
- // convHulls[n] = number of vertices in second hull
- // convHulls[n+1] = second hull centroid X coordinate
- // ...
- //
- // TODO: is is very inefficient. Someday change the convex hull generator to return
- // data structures that do not need to be converted in order to pass to Bullet.
- // And maybe put the values directly into pinned memory rather than marshaling.
- int hullCount = m_hulls.Count;
- int totalVertices = 1; // include one for the count of the hulls
- foreach (ConvexResult cr in m_hulls)
- {
- totalVertices += 4; // add four for the vertex count and centroid
- totalVertices += cr.HullIndices.Count * 3; // we pass just triangles
- }
- float[] convHulls = new float[totalVertices];
+ uint maxDepthSplit = (uint)BSParam.CSHullMaxDepthSplit;
+ if (BSParam.CSHullMaxDepthSplit != BSParam.CSHullMaxDepthSplitForSimpleShapes)
+ {
+ // Simple primitive shapes we know are convex so they are better implemented with
+ // fewer hulls.
+ // Check for simple shape (prim without cuts) and reduce split parameter if so.
+ if (PrimHasNoCuts(pbs))
+ {
+ maxDepthSplit = (uint)BSParam.CSHullMaxDepthSplitForSimpleShapes;
+ }
+ }
- convHulls[0] = (float)hullCount;
- int jj = 1;
- foreach (ConvexResult cr in m_hulls)
- {
- // copy vertices for index access
- float3[] verts = new float3[cr.HullVertices.Count];
- int kk = 0;
- foreach (float3 ff in cr.HullVertices)
+ // setup and do convex hull conversion
+ m_hulls = new List();
+ DecompDesc dcomp = new DecompDesc();
+ dcomp.mIndices = convIndices;
+ dcomp.mVertices = convVertices;
+ dcomp.mDepth = maxDepthSplit;
+ dcomp.mCpercent = BSParam.CSHullConcavityThresholdPercent;
+ dcomp.mPpercent = BSParam.CSHullVolumeConservationThresholdPercent;
+ dcomp.mMaxVertices = (uint)BSParam.CSHullMaxVertices;
+ dcomp.mSkinWidth = BSParam.CSHullMaxSkinWidth;
+ ConvexBuilder convexBuilder = new ConvexBuilder(HullReturn);
+ // create the hull into the _hulls variable
+ convexBuilder.process(dcomp);
+
+ DetailLog("{0},BSShapeCollection.CreatePhysicalHull,key={1},inVert={2},inInd={3},split={4},hulls={5}",
+ BSScene.DetailLogZero, newHullKey, indices.GetLength(0), vertices.Count, maxDepthSplit, m_hulls.Count);
+
+ // Convert the vertices and indices for passing to unmanaged.
+ // The hull information is passed as a large floating point array.
+ // The format is:
+ // convHulls[0] = number of hulls
+ // convHulls[1] = number of vertices in first hull
+ // convHulls[2] = hull centroid X coordinate
+ // convHulls[3] = hull centroid Y coordinate
+ // convHulls[4] = hull centroid Z coordinate
+ // convHulls[5] = first hull vertex X
+ // convHulls[6] = first hull vertex Y
+ // convHulls[7] = first hull vertex Z
+ // convHulls[8] = second hull vertex X
+ // ...
+ // convHulls[n] = number of vertices in second hull
+ // convHulls[n+1] = second hull centroid X coordinate
+ // ...
+ //
+ // TODO: is is very inefficient. Someday change the convex hull generator to return
+ // data structures that do not need to be converted in order to pass to Bullet.
+ // And maybe put the values directly into pinned memory rather than marshaling.
+ int hullCount = m_hulls.Count;
+ int totalVertices = 1; // include one for the count of the hulls
+ foreach (ConvexResult cr in m_hulls)
{
- verts[kk++] = ff;
+ totalVertices += 4; // add four for the vertex count and centroid
+ totalVertices += cr.HullIndices.Count * 3; // we pass just triangles
}
+ float[] convHulls = new float[totalVertices];
- // add to the array one hull's worth of data
- convHulls[jj++] = cr.HullIndices.Count;
- convHulls[jj++] = 0f; // centroid x,y,z
- convHulls[jj++] = 0f;
- convHulls[jj++] = 0f;
- foreach (int ind in cr.HullIndices)
+ convHulls[0] = (float)hullCount;
+ int jj = 1;
+ foreach (ConvexResult cr in m_hulls)
{
- convHulls[jj++] = verts[ind].x;
- convHulls[jj++] = verts[ind].y;
- convHulls[jj++] = verts[ind].z;
+ // copy vertices for index access
+ float3[] verts = new float3[cr.HullVertices.Count];
+ int kk = 0;
+ foreach (float3 ff in cr.HullVertices)
+ {
+ verts[kk++] = ff;
+ }
+
+ // add to the array one hull's worth of data
+ convHulls[jj++] = cr.HullIndices.Count;
+ convHulls[jj++] = 0f; // centroid x,y,z
+ convHulls[jj++] = 0f;
+ convHulls[jj++] = 0f;
+ foreach (int ind in cr.HullIndices)
+ {
+ convHulls[jj++] = verts[ind].x;
+ convHulls[jj++] = verts[ind].y;
+ convHulls[jj++] = verts[ind].z;
+ }
}
+ // create the hull data structure in Bullet
+ newShape = PhysicsScene.PE.CreateHullShape(PhysicsScene.World, hullCount, convHulls);
}
- // create the hull data structure in Bullet
- newShape = PhysicsScene.PE.CreateHullShape(PhysicsScene.World, hullCount, convHulls);
}
+ newShape.shapeKey = newHullKey;
}
- newShape.shapeKey = newHullKey;
-
return newShape;
}
--
cgit v1.1
From 9cc41d511872fcd74a074ab484db2b981f3f5676 Mon Sep 17 00:00:00 2001
From: Vegaslon
Date: Tue, 9 Apr 2013 17:23:50 -0400
Subject: Another algorithm for AngularVerticalAttraction. This one Takes into
account all rotations before it and makes the corrections more close to the
time that sl does.
Signed-off-by: Robert Adams
---
OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 0fd1f73..723be0b 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1358,6 +1358,28 @@ namespace OpenSim.Region.Physics.BulletSPlugin
// If vertical attaction timescale is reasonable
if (enableAngularVerticalAttraction && m_verticalAttractionTimescale < m_verticalAttractionCutoff)
{
+ //Another formula to try got from :
+ //http://answers.unity3d.com/questions/10425/how-to-stabilize-angular-motion-alignment-of-hover.html
+ Vector3 VehicleUpAxis = Vector3.UnitZ *VehicleOrientation;
+ //Flipping what was originally a timescale into a speed variable and then multiplying it by 2 since only computing half
+ //the distance between the angles.
+ float VerticalAttractionSpeed=(1/m_verticalAttractionTimescale)*2.0f;
+ //making a prediction of where the up axis will be when this is applied rather then where it is now this makes for a smoother
+ //adjustment and less fighting between the various forces
+ Vector3 predictedUp = VehicleUpAxis * Quaternion.CreateFromAxisAngle(VehicleRotationalVelocity, 0f);
+ //this is only half the distance to the target so it will take 2 seconds to complete the turn.
+ Vector3 torqueVector = Vector3.Cross(predictedUp, Vector3.UnitZ);
+ //Scaling vector by our timescale since it is an acceleration it is r/s^2 or radians a timescale squared
+ Vector3 vertContributionV=torqueVector * VerticalAttractionSpeed *VerticalAttractionSpeed;
+ VehicleRotationalVelocity += vertContributionV;
+ VDetailLog("{0}, MoveAngular,verticalAttraction,UpAxis={1},PredictedUp={2},torqueVector={3},contrib={4}",
+ ControllingPrim.LocalID,
+ VehicleUpAxis,
+ predictedUp,
+ torqueVector,
+ vertContributionV);
+ //=====================================================================
+ /*
// Possible solution derived from a discussion at:
// http://stackoverflow.com/questions/14939657/computing-vector-from-quaternion-works-computing-quaternion-from-vector-does-no
@@ -1392,6 +1414,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
differenceAngle,
correctionRotation,
vertContributionV);
+ */
// ===================================================================
/*
--
cgit v1.1
From b53713cdda3c4e49913a6a82239da35d62f74e68 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 9 Apr 2013 17:14:15 -0700
Subject: BulletSim: some formatting changes.
---
OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 27 ++++++++++++++--------
1 file changed, 17 insertions(+), 10 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 723be0b..612c68b 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1360,19 +1360,26 @@ namespace OpenSim.Region.Physics.BulletSPlugin
{
//Another formula to try got from :
//http://answers.unity3d.com/questions/10425/how-to-stabilize-angular-motion-alignment-of-hover.html
- Vector3 VehicleUpAxis = Vector3.UnitZ *VehicleOrientation;
- //Flipping what was originally a timescale into a speed variable and then multiplying it by 2 since only computing half
- //the distance between the angles.
- float VerticalAttractionSpeed=(1/m_verticalAttractionTimescale)*2.0f;
- //making a prediction of where the up axis will be when this is applied rather then where it is now this makes for a smoother
- //adjustment and less fighting between the various forces
+
+ Vector3 VehicleUpAxis = Vector3.UnitZ * VehicleOrientation;
+
+ // Flipping what was originally a timescale into a speed variable and then multiplying it by 2
+ // since only computing half the distance between the angles.
+ float VerticalAttractionSpeed = (1 / m_verticalAttractionTimescale) * 2.0f;
+
+ // Make a prediction of where the up axis will be when this is applied rather then where it is now as
+ // this makes for a smoother adjustment and less fighting between the various forces.
Vector3 predictedUp = VehicleUpAxis * Quaternion.CreateFromAxisAngle(VehicleRotationalVelocity, 0f);
- //this is only half the distance to the target so it will take 2 seconds to complete the turn.
+
+ // This is only half the distance to the target so it will take 2 seconds to complete the turn.
Vector3 torqueVector = Vector3.Cross(predictedUp, Vector3.UnitZ);
- //Scaling vector by our timescale since it is an acceleration it is r/s^2 or radians a timescale squared
- Vector3 vertContributionV=torqueVector * VerticalAttractionSpeed *VerticalAttractionSpeed;
+
+ // Scale vector by our timescale since it is an acceleration it is r/s^2 or radians a timescale squared
+ Vector3 vertContributionV = torqueVector * VerticalAttractionSpeed * VerticalAttractionSpeed;
+
VehicleRotationalVelocity += vertContributionV;
- VDetailLog("{0}, MoveAngular,verticalAttraction,UpAxis={1},PredictedUp={2},torqueVector={3},contrib={4}",
+
+ VDetailLog("{0}, MoveAngular,verticalAttraction,UpAxis={1},PredictedUp={2},torqueVector={3},contrib={4}",
ControllingPrim.LocalID,
VehicleUpAxis,
predictedUp,
--
cgit v1.1
From 5f2cbfc0fd27198f8f05f4a9a4e2908d8b11752e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 9 Apr 2013 17:53:18 -0700
Subject: BulletSim: fixing problems with llMoveToTarget. Not all fixed yet.
---
OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs | 2 +-
.../Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs | 16 +++++++++++-----
OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 6 ++++++
3 files changed, 18 insertions(+), 6 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
index e8310df..92ace66 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
@@ -50,7 +50,7 @@ public class BSActorHover : BSActor
// BSActor.isActive
public override bool isActive
{
- get { return Enabled && m_controllingPrim.IsPhysicallyActive; }
+ get { return Enabled; }
}
// Release any connections and resources used by the actor.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
index 16c2b14..56aacc5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
@@ -50,7 +50,7 @@ public class BSActorMoveToTarget : BSActor
// BSActor.isActive
public override bool isActive
{
- get { return Enabled && m_controllingPrim.IsPhysicallyActive; }
+ get { return Enabled; }
}
// Release any connections and resources used by the actor.
@@ -65,7 +65,9 @@ public class BSActorMoveToTarget : BSActor
// BSActor.Refresh()
public override void Refresh()
{
- m_physicsScene.DetailLog("{0},BSActorMoveToTarget,refresh", m_controllingPrim.LocalID);
+ m_physicsScene.DetailLog("{0},BSActorMoveToTarget,refresh,enabled={1},active={2},target={3},tau={4}",
+ m_controllingPrim.LocalID, Enabled, m_controllingPrim.MoveToTargetActive,
+ m_controllingPrim.MoveToTargetTarget, m_controllingPrim.MoveToTargetTau );
// If not active any more...
if (!m_controllingPrim.MoveToTargetActive)
@@ -100,7 +102,7 @@ public class BSActorMoveToTarget : BSActor
// We're taking over after this.
m_controllingPrim.ZeroMotion(true);
- m_targetMotor = new BSVMotor("BSPrim.PIDTarget",
+ m_targetMotor = new BSVMotor("BSActorMoveToTargget.Activate",
m_controllingPrim.MoveToTargetTau, // timeScale
BSMotor.Infinite, // decay time scale
BSMotor.InfiniteVector, // friction timescale
@@ -138,15 +140,19 @@ public class BSActorMoveToTarget : BSActor
// If we are very close to our target, turn off the movement motor.
if (m_targetMotor.ErrorIsZero())
{
- m_physicsScene.DetailLog("{0},BSPrim.PIDTarget,zeroMovement,movePos={1},pos={2},mass={3}",
+ m_physicsScene.DetailLog("{0},BSActorMoveToTarget.Mover,zeroMovement,movePos={1},pos={2},mass={3}",
m_controllingPrim.LocalID, movePosition, m_controllingPrim.RawPosition, m_controllingPrim.Mass);
m_controllingPrim.ForcePosition = m_targetMotor.TargetValue;
+ // Setting the position does not cause the physics engine to generate a property update. Force it.
+ m_physicsScene.PE.PushUpdate(m_controllingPrim.PhysBody);
}
else
{
m_controllingPrim.ForcePosition = movePosition;
+ // Setting the position does not cause the physics engine to generate a property update. Force it.
+ m_physicsScene.PE.PushUpdate(m_controllingPrim.PhysBody);
}
- m_physicsScene.DetailLog("{0},BSPrim.PIDTarget,move,fromPos={1},movePos={2}", m_controllingPrim.LocalID, origPosition, movePosition);
+ m_physicsScene.DetailLog("{0},BSActorMoveToTarget.Mover,move,fromPos={1},movePos={2}", m_controllingPrim.LocalID, origPosition, movePosition);
}
}
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 64bf395..98eb4ca 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -295,6 +295,7 @@ public abstract class BSPhysObject : PhysicsActor
if (PhysicalActors.TryGetActor(actorName, out theActor))
{
// The actor already exists so just turn it on or off
+ DetailLog("{0},BSPhysObject.EnableActor,enablingExistingActor,name={1},enable={2}", LocalID, actorName, enableActor);
theActor.Enabled = enableActor;
}
else
@@ -302,10 +303,15 @@ public abstract class BSPhysObject : PhysicsActor
// The actor does not exist. If it should, create it.
if (enableActor)
{
+ DetailLog("{0},BSPhysObject.EnableActor,creatingActor,name={1}", LocalID, actorName);
theActor = creator();
PhysicalActors.Add(actorName, theActor);
theActor.Enabled = true;
}
+ else
+ {
+ DetailLog("{0},BSPhysObject.EnableActor,notCreatingActorSinceNotEnabled,name={1}", LocalID, actorName);
+ }
}
}
}
--
cgit v1.1
From c5de9840b05514eb659696239593e51e636398b8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 16 Apr 2013 21:58:24 +0100
Subject: refactor: Remove IClientNetworkServer.NetworkStop() in favour of
existing Stop().
This was an undocumented interface which I think was for long defunct region load balancing experiments.
Also adds method doc for some IClientNetworkServer methods.
---
OpenSim/Region/Application/OpenSimBase.cs | 2 +-
OpenSim/Region/ClientStack/IClientNetworkServer.cs | 15 +++++++++++++--
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 5 -----
3 files changed, 14 insertions(+), 8 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index c555915..d86eefe 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -737,7 +737,7 @@ namespace OpenSim
if (foundClientServer)
{
- m_clientServers[clientServerElement].NetworkStop();
+ m_clientServers[clientServerElement].Stop();
m_clientServers.RemoveAt(clientServerElement);
}
}
diff --git a/OpenSim/Region/ClientStack/IClientNetworkServer.cs b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
index 54a441b..bb7e6d0 100644
--- a/OpenSim/Region/ClientStack/IClientNetworkServer.cs
+++ b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
@@ -38,11 +38,22 @@ namespace OpenSim.Region.ClientStack
IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource,
AgentCircuitManager authenticateClass);
- void NetworkStop();
bool HandlesRegion(Location x);
- void AddScene(IScene x);
+ ///
+ /// Add the given scene to be handled by this IClientNetworkServer.
+ ///
+ ///
+ void AddScene(IScene scene);
+
+ ///
+ /// Start sending and receiving data.
+ ///
void Start();
+
+ ///
+ /// Stop sending and receiving data.
+ ///
void Stop();
}
}
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 72516cd..985aa4d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -62,11 +62,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_udpServer = new LLUDPServer(listenIP, ref port, proxyPortOffsetParm, allow_alternate_port, configSource, circuitManager);
}
- public void NetworkStop()
- {
- m_udpServer.Stop();
- }
-
public void AddScene(IScene scene)
{
m_udpServer.AddScene(scene);
--
cgit v1.1
From ce043c5141dde0ffed39d548bf680885a73e2908 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 17 Apr 2013 22:41:12 -0700
Subject: Allow changes to TextureEntry to propagate to viewers when MaterialID
changes
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 ++
1 file changed, 2 insertions(+)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 93d4da0..0e85b87 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4571,6 +4571,8 @@ namespace OpenSim.Region.Framework.Scenes
if (oldFace.TextureID != newFace.TextureID)
changeFlags |= Changed.TEXTURE;
+ if (oldFace.MaterialID != newFace.MaterialID)
+ changeFlags |= Changed.TEXTURE;
// Max change, skip the rest of testing
if (changeFlags == (Changed.TEXTURE | Changed.COLOR))
--
cgit v1.1
From 53122fad400e2d5bac5f02a3e153b6e76c9112b3 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 17 Apr 2013 23:10:02 -0700
Subject: Thanks lkalif for a fix to SendRegionHandshake() which fixes a
potential crash with Server-side baking enabled viewers
---
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 110e50e..02b326e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -791,11 +791,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
handshake.RegionInfo3.ColoName = Utils.EmptyBytes;
handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType);
handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
- handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[0];
-
+
+ handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[1];
+ handshake.RegionInfo4[0].RegionFlagsExtended = args.regionFlags;
+ handshake.RegionInfo4[0].RegionProtocols = 0; // 1 here would indicate that SSB is supported
+
OutPacket(handshake, ThrottleOutPacketType.Task);
}
+
public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
{
AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete);
--
cgit v1.1
From 7c839f176fab8166d4787ddbdffdda5f8d9e55ca Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 17 Apr 2013 23:14:28 -0700
Subject: amend previous commit, a line was left out
---
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 1 +
1 file changed, 1 insertion(+)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 02b326e..1609012 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -793,6 +793,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[1];
+ handshake.RegionInfo4[0] = new RegionHandshakePacket.RegionInfo4Block();
handshake.RegionInfo4[0].RegionFlagsExtended = args.regionFlags;
handshake.RegionInfo4[0].RegionProtocols = 0; // 1 here would indicate that SSB is supported
--
cgit v1.1
From d5419f0a463d67ef40c2212484fc95ca0a4b3b5b Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 18 Apr 2013 01:03:19 -0700
Subject: Initial experimental support for materials-capable viewers. This is
in a very early stage and this module is disabled by default and should only
be used by developers for testing as this module could cause data corruption
and/or viewer crashes. No materials are persisted yet.
---
.../Materials/MaterialsDemoModule.cs | 382 +++++++++++++++++++++
1 file changed, 382 insertions(+)
create mode 100644 OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
new file mode 100644
index 0000000..de2c3fc
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -0,0 +1,382 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Security.Cryptography; // for computing md5 hash
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
+using OpenSim.Framework;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+using Ionic.Zlib;
+
+// You will need to uncomment these lines if you are adding a region module to some other assembly which does not already
+// specify its assembly. Otherwise, the region modules in the assembly will not be picked up when OpenSimulator scans
+// the available DLLs
+//[assembly: Addin("MyModule", "1.0")]
+//[assembly: AddinDependency("OpenSim", "0.5")]
+
+namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
+{
+ ///
+ ///
+ // # # ## ##### # # # # # ####
+ // # # # # # # ## # # ## # # #
+ // # # # # # # # # # # # # # #
+ // # ## # ###### ##### # # # # # # # # ###
+ // ## ## # # # # # ## # # ## # #
+ // # # # # # # # # # # # ####
+ //
+ //
+ //
+ ////////////// WARNING //////////////////////////////////////////////////////////////////
+ /// This is an *Experimental* module for developing support for materials-capable viewers
+ /// This module should NOT be used in a production environment! It may cause data corruption and
+ /// viewer crashes. It should be only used to evaluate implementations of materials.
+ ///
+ /// CURRENTLY NO MATERIALS ARE PERSISTED ACROSS SIMULATOR RESTARTS OR ARE STORED IN ANY INVENTORY OR ASSETS
+ /// This may change in future implementations.
+ ///
+ /// To enable this module, add this string at the bottom of OpenSim.ini:
+ /// [MaterialsDemoModule]
+ ///
+ ///
+ ///
+
+ [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MaterialsDemoModule")]
+ public class MaterialsDemoModule : INonSharedRegionModule
+ {
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ public string Name { get { return "MaterialsDemoModule"; } }
+
+ public Type ReplaceableInterface { get { return null; } }
+
+ private Scene m_scene = null;
+ private bool m_enabled = false;
+
+ public void Initialise(IConfigSource source)
+ {
+ m_enabled = (source.Configs["MaterialsDemoModule"] != null);
+ if (!m_enabled)
+ return;
+
+ m_log.DebugFormat("[MaterialsDemoModule]: INITIALIZED MODULE");
+
+ }
+
+ public void Close()
+ {
+ if (!m_enabled)
+ return;
+
+ m_log.DebugFormat("[MaterialsDemoModule]: CLOSED MODULE");
+ }
+
+ public void AddRegion(Scene scene)
+ {
+ if (!m_enabled)
+ return;
+
+ m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} ADDED", scene.RegionInfo.RegionName);
+ m_scene = scene;
+ m_scene.EventManager.OnRegisterCaps += new EventManager.RegisterCapsEvent(OnRegisterCaps);
+ }
+
+ void OnRegisterCaps(OpenMetaverse.UUID agentID, OpenSim.Framework.Capabilities.Caps caps)
+ {
+ string capsBase = "/CAPS/" + caps.CapsObjectPath;
+
+ IRequestHandler renderMaterialsPostHandler = new RestStreamHandler("POST", capsBase + "/", RenderMaterialsPostCap);
+ caps.RegisterHandler("RenderMaterials", renderMaterialsPostHandler);
+
+ // OpenSimulator CAPs infrastructure seems to be somewhat hostile towards any CAP that requires both GET
+ // and POST handlers, (at least at the time this was originally written), so we first set up a POST
+ // handler normally and then add a GET handler via MainServer
+
+ IRequestHandler renderMaterialsGetHandler = new RestStreamHandler("GET", capsBase + "/", RenderMaterialsGetCap);
+ MainServer.Instance.AddStreamHandler(renderMaterialsGetHandler);
+ }
+
+ public void RemoveRegion(Scene scene)
+ {
+ if (!m_enabled)
+ return;
+
+ m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
+ }
+
+ public void RegionLoaded(Scene scene)
+ {
+ if (!m_enabled)
+ return;
+ m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} LOADED", scene.RegionInfo.RegionName);
+ }
+
+ public string RenderMaterialsPostCap(string request, string path,
+ string param, IOSHttpRequest httpRequest,
+ IOSHttpResponse httpResponse)
+ {
+ m_log.Debug("[MaterialsDemoModule]: POST cap handler");
+
+ OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
+ OSDMap resp = new OSDMap();
+
+ OSDMap materialsFromViewer = null;
+
+ if (req.ContainsKey("Zipped"))
+ {
+ OSD osd = null;
+
+ byte[] inBytes = req["Zipped"].AsBinary();
+
+ try
+ {
+ osd = ZDecompressBytesToOsd(inBytes);
+
+ if (osd != null && osd is OSDMap)
+ {
+ materialsFromViewer = osd as OSDMap;
+
+ if (materialsFromViewer.ContainsKey("FullMaterialsPerFace"))
+ {
+ OSD matsOsd = materialsFromViewer["FullMaterialsPerFace"];
+ if (matsOsd is OSDArray)
+ {
+ OSDArray matsArr = matsOsd as OSDArray;
+
+ try
+ {
+ foreach (OSDMap matsMap in matsArr)
+ {
+ m_log.Debug("[MaterialsDemoModule]: processing matsMap: " + OSDParser.SerializeJsonString(matsMap));
+
+ uint matLocalID = 0;
+ try { matLocalID = matsMap["ID"].AsUInteger(); }
+ catch (Exception e) { m_log.Warn("[MaterialsDemoModule]: cannot decode \"ID\" from matsMap: " + e.Message); }
+ m_log.Debug("[MaterialsDemoModule]: matLocalId: " + matLocalID.ToString());
+
+
+ OSDMap mat = null;
+ try { mat = matsMap["Material"] as OSDMap; }
+ catch (Exception e) { m_log.Warn("[MaterialsDemoModule]: cannot decode \"Material\" from matsMap: " + e.Message); }
+ m_log.Debug("[MaterialsDemoModule]: mat: " + OSDParser.SerializeJsonString(mat));
+
+ UUID id = HashOsd(mat);
+ m_knownMaterials[id] = mat;
+
+
+ var sop = m_scene.GetSceneObjectPart(matLocalID);
+ if (sop == null)
+ m_log.Debug("[MaterialsDemoModule]: null SOP for localId: " + matLocalID.ToString());
+ else
+ {
+ var te = sop.Shape.Textures;
+
+ if (te == null)
+ {
+ m_log.Debug("[MaterialsDemoModule]: null TextureEntry for localId: " + matLocalID.ToString());
+ }
+ else
+ {
+ int face = -1;
+
+ if (matsMap.ContainsKey("Face"))
+ {
+ face = matsMap["Face"].AsInteger();
+ if (te.FaceTextures == null) // && face == 0)
+ {
+ if (te.DefaultTexture == null)
+ m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture is null");
+ else
+ {
+ if (te.DefaultTexture.MaterialID == null)
+ m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture.MaterialID is null");
+ else
+ {
+ te.DefaultTexture.MaterialID = id;
+ }
+ }
+ }
+ else
+ {
+ if (te.FaceTextures.Length >= face - 1)
+ {
+ if (te.FaceTextures[face] == null)
+ te.DefaultTexture.MaterialID = id;
+ else
+ te.FaceTextures[face].MaterialID = id;
+ }
+ }
+ }
+ else
+ {
+ if (te.DefaultTexture != null)
+ te.DefaultTexture.MaterialID = id;
+ }
+
+ m_log.Debug("[MaterialsDemoModule]: setting material ID for face " + face.ToString() + " to " + id.ToString());
+
+ sop.UpdateTextureEntry(te);
+ }
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ m_log.Warn("[MaterialsDemoModule]: exception processing received material: " + e.Message);
+ }
+ }
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ m_log.Warn("[MaterialsDemoModule]: exception decoding zipped CAP payload: " + e.Message);
+ //return "";
+ }
+ m_log.Debug("[MaterialsDemoModule]: knownMaterials.Count: " + m_knownMaterials.Count.ToString());
+ }
+
+
+ string response = OSDParser.SerializeLLSDXmlString(resp);
+
+ m_log.Debug("[MaterialsDemoModule]: cap request: " + request);
+ m_log.Debug("[MaterialsDemoModule]: cap response: " + response);
+ return response;
+ }
+
+
+ public string RenderMaterialsGetCap(string request, string path,
+ string param, IOSHttpRequest httpRequest,
+ IOSHttpResponse httpResponse)
+ {
+ m_log.Debug("[MaterialsDemoModule]: GET cap handler");
+
+ OSDMap resp = new OSDMap();
+
+
+ int matsCount = 0;
+
+ OSDArray allOsd = new OSDArray();
+
+ foreach (KeyValuePair kvp in m_knownMaterials)
+ {
+ OSDMap matMap = new OSDMap();
+
+ matMap["ID"] = OSD.FromBinary(kvp.Key.GetBytes());
+
+ matMap["Material"] = kvp.Value;
+ allOsd.Add(matMap);
+ matsCount++;
+ }
+
+
+ resp["Zipped"] = ZCompressOSD(allOsd, false);
+ m_log.Debug("[MaterialsDemoModule]: matsCount: " + matsCount.ToString());
+
+ return OSDParser.SerializeLLSDXmlString(resp);
+ }
+
+ public Dictionary m_knownMaterials = new Dictionary();
+
+ ///
+ /// computes a UUID by hashing a OSD object
+ ///
+ ///
+ ///
+ private static UUID HashOsd(OSD osd)
+ {
+ using (var md5 = MD5.Create())
+ using (MemoryStream ms = new MemoryStream(OSDParser.SerializeLLSDBinary(osd, false)))
+ return new UUID(md5.ComputeHash(ms), 0);
+ }
+
+ public static OSD ZCompressOSD(OSD inOsd, bool useHeader = true)
+ {
+ OSD osd = null;
+
+ using (MemoryStream msSinkCompressed = new MemoryStream())
+ {
+ using (Ionic.Zlib.ZlibStream zOut = new Ionic.Zlib.ZlibStream(msSinkCompressed,
+ Ionic.Zlib.CompressionMode.Compress, CompressionLevel.BestCompression, true))
+ {
+ CopyStream(new MemoryStream(OSDParser.SerializeLLSDBinary(inOsd, useHeader)), zOut);
+ zOut.Close();
+ }
+
+ msSinkCompressed.Seek(0L, SeekOrigin.Begin);
+ osd = OSD.FromBinary( msSinkCompressed.ToArray());
+ }
+
+ return osd;
+ }
+
+
+ public static OSD ZDecompressBytesToOsd(byte[] input)
+ {
+ OSD osd = null;
+
+ using (MemoryStream msSinkUnCompressed = new MemoryStream())
+ {
+ using (Ionic.Zlib.ZlibStream zOut = new Ionic.Zlib.ZlibStream(msSinkUnCompressed, CompressionMode.Decompress, true))
+ {
+ CopyStream(new MemoryStream(input), zOut);
+ zOut.Close();
+ }
+ msSinkUnCompressed.Seek(0L, SeekOrigin.Begin);
+ osd = OSDParser.DeserializeLLSDBinary(msSinkUnCompressed.ToArray());
+ }
+
+ return osd;
+ }
+
+ static void CopyStream(System.IO.Stream input, System.IO.Stream output)
+ {
+ byte[] buffer = new byte[2048];
+ int len;
+ while ((len = input.Read(buffer, 0, 2048)) > 0)
+ {
+ output.Write(buffer, 0, len);
+ }
+
+ output.Flush();
+ }
+
+ }
+}
\ No newline at end of file
--
cgit v1.1
From 06829c4082ba10fc9d3b4b37f42f01ab005c5e23 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 18 Apr 2013 01:29:50 -0700
Subject: remove default parameter value that apparently mono cant handle
---
OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index de2c3fc..74a4ea7 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -327,7 +327,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
return new UUID(md5.ComputeHash(ms), 0);
}
- public static OSD ZCompressOSD(OSD inOsd, bool useHeader = true)
+ public static OSD ZCompressOSD(OSD inOsd, bool useHeader)
{
OSD osd = null;
--
cgit v1.1
From 9ae24cac2fcf5ac00ec8e4ccae5e58e9ff90db74 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 19 Apr 2013 00:35:06 -0700
Subject: Materials-capable viewers send ImageUpdate packets when updating
materials that are normally sent via RenderMaterials CAP. This can cause a
race condition for updating TextureEntry fields. Therefore filter any
TextureEntry updates so they only update if something actually changed.
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 46 ++++++++++++++++------
1 file changed, 35 insertions(+), 11 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0e85b87..347a2b5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4549,6 +4549,14 @@ namespace OpenSim.Region.Framework.Scenes
oldTex.DefaultTexture = fallbackOldFace;
}
+ // Materials capable viewers can send a ObjectImage packet
+ // when nothing in TE has changed. MaterialID should be updated
+ // by the RenderMaterials CAP handler, so updating it here may cause a
+ // race condtion. Therefore, if no non-materials TE fields have changed,
+ // we should ignore any changes and not update Shape.TextureEntry
+
+ bool otherFieldsChanged = false;
+
for (int i = 0 ; i < GetNumberOfSides(); i++)
{
@@ -4571,24 +4579,40 @@ namespace OpenSim.Region.Framework.Scenes
if (oldFace.TextureID != newFace.TextureID)
changeFlags |= Changed.TEXTURE;
- if (oldFace.MaterialID != newFace.MaterialID)
- changeFlags |= Changed.TEXTURE;
// Max change, skip the rest of testing
if (changeFlags == (Changed.TEXTURE | Changed.COLOR))
break;
+
+ if (!otherFieldsChanged)
+ {
+ if (oldFace.Bump != newFace.Bump) otherFieldsChanged = true;
+ if (oldFace.Fullbright != newFace.Fullbright) otherFieldsChanged = true;
+ if (oldFace.Glow != newFace.Glow) otherFieldsChanged = true;
+ if (oldFace.MediaFlags != newFace.MediaFlags) otherFieldsChanged = true;
+ if (oldFace.OffsetU != newFace.OffsetU) otherFieldsChanged = true;
+ if (oldFace.OffsetV != newFace.OffsetV) otherFieldsChanged = true;
+ if (oldFace.RepeatU != newFace.RepeatU) otherFieldsChanged = true;
+ if (oldFace.RepeatV != newFace.RepeatV) otherFieldsChanged = true;
+ if (oldFace.Rotation != newFace.Rotation) otherFieldsChanged = true;
+ if (oldFace.Shiny != newFace.Shiny) otherFieldsChanged = true;
+ if (oldFace.TexMapType != newFace.TexMapType) otherFieldsChanged = true;
+ }
}
- m_shape.TextureEntry = newTex.GetBytes();
- if (changeFlags != 0)
- TriggerScriptChangedEvent(changeFlags);
- UpdateFlag = UpdateRequired.FULL;
- ParentGroup.HasGroupChanged = true;
+ if (changeFlags != 0 || otherFieldsChanged)
+ {
+ m_shape.TextureEntry = newTex.GetBytes();
+ if (changeFlags != 0)
+ TriggerScriptChangedEvent(changeFlags);
+ UpdateFlag = UpdateRequired.FULL;
+ ParentGroup.HasGroupChanged = true;
- //This is madness..
- //ParentGroup.ScheduleGroupForFullUpdate();
- //This is sparta
- ScheduleFullUpdate();
+ //This is madness..
+ //ParentGroup.ScheduleGroupForFullUpdate();
+ //This is sparta
+ ScheduleFullUpdate();
+ }
}
public void aggregateScriptEvents()
--
cgit v1.1
From 258804cc043530927f442cd76337a3dab4ec742b Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 19 Apr 2013 22:19:57 -0700
Subject: RenderMaterials POST Cap now return material entries when invoked
with an OSDArray of MaterialIDs
---
.../Materials/MaterialsDemoModule.cs | 169 +++++++++++++--------
1 file changed, 108 insertions(+), 61 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 74a4ea7..7002e66 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -48,7 +48,7 @@ using Ionic.Zlib;
// You will need to uncomment these lines if you are adding a region module to some other assembly which does not already
// specify its assembly. Otherwise, the region modules in the assembly will not be picked up when OpenSimulator scans
// the available DLLs
-//[assembly: Addin("MyModule", "1.0")]
+//[assembly: Addin("MaterialsDemoModule", "1.0")]
//[assembly: AddinDependency("OpenSim", "0.5")]
namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
@@ -159,6 +159,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
OSDMap materialsFromViewer = null;
+ OSDArray respArr = new OSDArray();
+
if (req.ContainsKey("Zipped"))
{
OSD osd = null;
@@ -169,101 +171,145 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
{
osd = ZDecompressBytesToOsd(inBytes);
- if (osd != null && osd is OSDMap)
+ if (osd != null)
{
- materialsFromViewer = osd as OSDMap;
-
- if (materialsFromViewer.ContainsKey("FullMaterialsPerFace"))
+ if (osd is OSDArray) // assume array of MaterialIDs designating requested material entries
{
- OSD matsOsd = materialsFromViewer["FullMaterialsPerFace"];
- if (matsOsd is OSDArray)
+ foreach (OSD elem in (OSDArray)osd)
{
- OSDArray matsArr = matsOsd as OSDArray;
try
{
- foreach (OSDMap matsMap in matsArr)
+ UUID id = new UUID(elem.AsBinary(), 0);
+
+ if (m_knownMaterials.ContainsKey(id))
+ {
+ m_log.Info("[MaterialsDemoModule]: request for known material ID: " + id.ToString());
+ OSDMap matMap = new OSDMap();
+ matMap["ID"] = OSD.FromBinary(id.GetBytes());
+
+ matMap["Material"] = m_knownMaterials[id];
+ respArr.Add(matMap);
+ }
+ else
+ m_log.Info("[MaterialsDemoModule]: request for UNKNOWN material ID: " + id.ToString());
+ }
+ catch (Exception e)
+ {
+ // report something here?
+ continue;
+ }
+ }
+ }
+ else if (osd is OSDMap) // reqest to assign a material
+ {
+ materialsFromViewer = osd as OSDMap;
+
+ if (materialsFromViewer.ContainsKey("FullMaterialsPerFace"))
+ {
+ OSD matsOsd = materialsFromViewer["FullMaterialsPerFace"];
+ if (matsOsd is OSDArray)
+ {
+ OSDArray matsArr = matsOsd as OSDArray;
+
+ try
{
- m_log.Debug("[MaterialsDemoModule]: processing matsMap: " + OSDParser.SerializeJsonString(matsMap));
+ foreach (OSDMap matsMap in matsArr)
+ {
+ m_log.Debug("[MaterialsDemoModule]: processing matsMap: " + OSDParser.SerializeJsonString(matsMap));
- uint matLocalID = 0;
- try { matLocalID = matsMap["ID"].AsUInteger(); }
- catch (Exception e) { m_log.Warn("[MaterialsDemoModule]: cannot decode \"ID\" from matsMap: " + e.Message); }
- m_log.Debug("[MaterialsDemoModule]: matLocalId: " + matLocalID.ToString());
+ uint matLocalID = 0;
+ try { matLocalID = matsMap["ID"].AsUInteger(); }
+ catch (Exception e) { m_log.Warn("[MaterialsDemoModule]: cannot decode \"ID\" from matsMap: " + e.Message); }
+ m_log.Debug("[MaterialsDemoModule]: matLocalId: " + matLocalID.ToString());
- OSDMap mat = null;
- try { mat = matsMap["Material"] as OSDMap; }
- catch (Exception e) { m_log.Warn("[MaterialsDemoModule]: cannot decode \"Material\" from matsMap: " + e.Message); }
- m_log.Debug("[MaterialsDemoModule]: mat: " + OSDParser.SerializeJsonString(mat));
+ OSDMap mat = null;
+ try { mat = matsMap["Material"] as OSDMap; }
+ catch (Exception e) { m_log.Warn("[MaterialsDemoModule]: cannot decode \"Material\" from matsMap: " + e.Message); }
+ m_log.Debug("[MaterialsDemoModule]: mat: " + OSDParser.SerializeJsonString(mat));
- UUID id = HashOsd(mat);
- m_knownMaterials[id] = mat;
+ UUID id = HashOsd(mat);
+ m_knownMaterials[id] = mat;
- var sop = m_scene.GetSceneObjectPart(matLocalID);
- if (sop == null)
- m_log.Debug("[MaterialsDemoModule]: null SOP for localId: " + matLocalID.ToString());
- else
- {
- var te = sop.Shape.Textures;
-
- if (te == null)
- {
- m_log.Debug("[MaterialsDemoModule]: null TextureEntry for localId: " + matLocalID.ToString());
- }
+ var sop = m_scene.GetSceneObjectPart(matLocalID);
+ if (sop == null)
+ m_log.Debug("[MaterialsDemoModule]: null SOP for localId: " + matLocalID.ToString());
else
{
- int face = -1;
+ //var te = sop.Shape.Textures;
+ var te = new Primitive.TextureEntry(sop.Shape.TextureEntry, 0, sop.Shape.TextureEntry.Length);
- if (matsMap.ContainsKey("Face"))
+ if (te == null)
+ {
+ m_log.Debug("[MaterialsDemoModule]: null TextureEntry for localId: " + matLocalID.ToString());
+ }
+ else
{
- face = matsMap["Face"].AsInteger();
- if (te.FaceTextures == null) // && face == 0)
+ int face = -1;
+
+ if (matsMap.ContainsKey("Face"))
{
- if (te.DefaultTexture == null)
- m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture is null");
- else
+ face = matsMap["Face"].AsInteger();
+ if (te.FaceTextures == null) // && face == 0)
{
- if (te.DefaultTexture.MaterialID == null)
- m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture.MaterialID is null");
+ if (te.DefaultTexture == null)
+ m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture is null");
else
{
- te.DefaultTexture.MaterialID = id;
+ if (te.DefaultTexture.MaterialID == null)
+ m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture.MaterialID is null");
+ else
+ {
+ te.DefaultTexture.MaterialID = id;
+ }
+ }
+ }
+ else
+ {
+ if (te.FaceTextures.Length >= face - 1)
+ {
+ if (te.FaceTextures[face] == null)
+ te.DefaultTexture.MaterialID = id;
+ else
+ te.FaceTextures[face].MaterialID = id;
}
}
}
else
{
- if (te.FaceTextures.Length >= face - 1)
- {
- if (te.FaceTextures[face] == null)
- te.DefaultTexture.MaterialID = id;
- else
- te.FaceTextures[face].MaterialID = id;
- }
+ if (te.DefaultTexture != null)
+ te.DefaultTexture.MaterialID = id;
}
- }
- else
- {
- if (te.DefaultTexture != null)
- te.DefaultTexture.MaterialID = id;
- }
- m_log.Debug("[MaterialsDemoModule]: setting material ID for face " + face.ToString() + " to " + id.ToString());
+ m_log.Debug("[MaterialsDemoModule]: setting material ID for face " + face.ToString() + " to " + id.ToString());
+
+ //we cant use sop.UpdateTextureEntry(te); because it filters so do it manually
- sop.UpdateTextureEntry(te);
+ if (sop.ParentGroup != null)
+ {
+ sop.Shape.TextureEntry = te.GetBytes();
+ sop.TriggerScriptChangedEvent(Changed.TEXTURE);
+ sop.UpdateFlag = UpdateRequired.FULL;
+ sop.ParentGroup.HasGroupChanged = true;
+
+ sop.ScheduleFullUpdate();
+
+ }
+ }
}
}
}
- }
- catch (Exception e)
- {
- m_log.Warn("[MaterialsDemoModule]: exception processing received material: " + e.Message);
+ catch (Exception e)
+ {
+ m_log.Warn("[MaterialsDemoModule]: exception processing received material: " + e.Message);
+ }
}
}
}
}
+
}
catch (Exception e)
{
@@ -273,7 +319,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
m_log.Debug("[MaterialsDemoModule]: knownMaterials.Count: " + m_knownMaterials.Count.ToString());
}
-
+
+ resp["Zipped"] = ZCompressOSD(respArr, false);
string response = OSDParser.SerializeLLSDXmlString(resp);
m_log.Debug("[MaterialsDemoModule]: cap request: " + request);
--
cgit v1.1
From 233f76177997cbe12aa100a3511d45bc1e9ccc5f Mon Sep 17 00:00:00 2001
From: dahlia
Date: Sat, 20 Apr 2013 02:08:22 -0700
Subject: handle PUT verb for RenderMaterials Cap
---
OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 7002e66..4501dad 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -130,7 +130,11 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
// handler normally and then add a GET handler via MainServer
IRequestHandler renderMaterialsGetHandler = new RestStreamHandler("GET", capsBase + "/", RenderMaterialsGetCap);
- MainServer.Instance.AddStreamHandler(renderMaterialsGetHandler);
+ MainServer.Instance.AddStreamHandler(renderMaterialsGetHandler);
+
+ // materials viewer seems to use either POST or PUT, so assign POST handler for PUT as well
+ IRequestHandler renderMaterialsPutHandler = new RestStreamHandler("PUT", capsBase + "/", RenderMaterialsPostCap);
+ MainServer.Instance.AddStreamHandler(renderMaterialsPutHandler);
}
public void RemoveRegion(Scene scene)
--
cgit v1.1
From 69f07fdb349a2671fe86f96f119c0ea1276faacb Mon Sep 17 00:00:00 2001
From: dahlia
Date: Sat, 20 Apr 2013 23:39:07 -0700
Subject: Materials persistence via SceneObjectPart.dynAttrs. This appears to
work across region restarts and taking objects into inventory, but probably
will not work across archiving via OAR or IAR as materials texture assets may
not be adequately referenced to trigger archiving.
---
.../Materials/MaterialsDemoModule.cs | 162 ++++++++++++++++++++-
1 file changed, 154 insertions(+), 8 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 4501dad..4ab6609 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -62,15 +62,21 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
// ## ## # # # # # ## # # ## # #
// # # # # # # # # # # # ####
//
- //
+ // THIS MODULE IS FOR EXPERIMENTAL USE ONLY AND MAY CAUSE REGION OR ASSET CORRUPTION!
//
////////////// WARNING //////////////////////////////////////////////////////////////////
/// This is an *Experimental* module for developing support for materials-capable viewers
/// This module should NOT be used in a production environment! It may cause data corruption and
/// viewer crashes. It should be only used to evaluate implementations of materials.
///
- /// CURRENTLY NO MATERIALS ARE PERSISTED ACROSS SIMULATOR RESTARTS OR ARE STORED IN ANY INVENTORY OR ASSETS
- /// This may change in future implementations.
+ /// Materials are persisted via SceneObjectPart.dynattrs. This is a relatively new feature
+ /// of OpenSimulator and is not field proven at the time this module was written. Persistence
+ /// may fail or become corrupt and this could cause viewer crashes due to erroneous materials
+ /// data being sent to viewers. Materials descriptions might survive IAR, OAR, or other means
+ /// of archiving however the texture resources used by these materials probably will not as they
+ /// may not be adequately referenced to ensure proper archiving.
+ ///
+ ///
///
/// To enable this module, add this string at the bottom of OpenSim.ini:
/// [MaterialsDemoModule]
@@ -89,6 +95,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
private Scene m_scene = null;
private bool m_enabled = false;
+
+ public Dictionary m_knownMaterials = new Dictionary();
public void Initialise(IConfigSource source)
{
@@ -97,7 +105,6 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
return;
m_log.DebugFormat("[MaterialsDemoModule]: INITIALIZED MODULE");
-
}
public void Close()
@@ -116,6 +123,14 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} ADDED", scene.RegionInfo.RegionName);
m_scene = scene;
m_scene.EventManager.OnRegisterCaps += new EventManager.RegisterCapsEvent(OnRegisterCaps);
+ m_scene.EventManager.OnObjectAddedToScene += new Action(EventManager_OnObjectAddedToScene);
+ }
+
+ void EventManager_OnObjectAddedToScene(SceneObjectGroup obj)
+ {
+ foreach (var part in obj.Parts)
+ if (part != null)
+ GetStoredMaterialsForPart(part);
}
void OnRegisterCaps(OpenMetaverse.UUID agentID, OpenSim.Framework.Capabilities.Caps caps)
@@ -147,11 +162,130 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
public void RegionLoaded(Scene scene)
{
- if (!m_enabled)
+ }
+
+ OSDMap GetMaterial(UUID id)
+ {
+ OSDMap map = null;
+ if (m_knownMaterials.ContainsKey(id))
+ {
+ map = new OSDMap();
+ map["ID"] = OSD.FromBinary(id.GetBytes());
+ map["Material"] = m_knownMaterials[id];
+ }
+ return map;
+ }
+
+ void GetStoredMaterialsForPart(SceneObjectPart part)
+ {
+ OSDMap OSMaterials = null;
+ OSDArray matsArr = null;
+
+ if (part.DynAttrs == null)
+ {
+ m_log.Warn("[MaterialsDemoModule]: NULL DYNATTRS :( ");
+ }
+
+ lock (part.DynAttrs)
+ {
+ if (part.DynAttrs.ContainsKey("OS:Materials"))
+ OSMaterials = part.DynAttrs["OS:Materials"];
+ if (OSMaterials != null && OSMaterials.ContainsKey("Materials"))
+ {
+
+ OSD osd = OSMaterials["Materials"];
+ if (osd is OSDArray)
+ matsArr = osd as OSDArray;
+ }
+ }
+
+ if (OSMaterials == null)
return;
- m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} LOADED", scene.RegionInfo.RegionName);
+
+ m_log.Info("[MaterialsDemoModule]: OSMaterials: " + OSDParser.SerializeJsonString(OSMaterials));
+
+
+ if (matsArr == null)
+ {
+ m_log.Info("[MaterialsDemoModule]: matsArr is null :( ");
+ return;
+ }
+
+ foreach (OSD elemOsd in matsArr)
+ {
+ if (elemOsd != null && elemOsd is OSDMap)
+ {
+
+ OSDMap matMap = elemOsd as OSDMap;
+ if (matMap.ContainsKey("ID") && matMap.ContainsKey("Material"))
+ {
+ try
+ {
+ m_knownMaterials[matMap["ID"].AsUUID()] = (OSDMap)matMap["Material"];
+ }
+ catch (Exception e)
+ {
+ m_log.Warn("[MaterialsDemoModule]: exception decoding persisted material: " + e.ToString());
+ }
+ }
+ }
+ }
}
+
+ void StoreMaterialsForPart(SceneObjectPart part)
+ {
+ try
+ {
+ if (part == null || part.Shape == null)
+ return;
+
+ Dictionary mats = new Dictionary();
+
+ Primitive.TextureEntry te = part.Shape.Textures;
+
+ if (te.DefaultTexture != null)
+ {
+ if (m_knownMaterials.ContainsKey(te.DefaultTexture.MaterialID))
+ mats[te.DefaultTexture.MaterialID] = m_knownMaterials[te.DefaultTexture.MaterialID];
+ }
+
+ if (te.FaceTextures != null)
+ {
+ foreach (var face in te.FaceTextures)
+ {
+ if (face != null)
+ {
+ if (m_knownMaterials.ContainsKey(face.MaterialID))
+ mats[face.MaterialID] = m_knownMaterials[face.MaterialID];
+ }
+ }
+ }
+ if (mats.Count == 0)
+ return;
+
+ OSDArray matsArr = new OSDArray();
+ foreach (KeyValuePair kvp in mats)
+ {
+ OSDMap matOsd = new OSDMap();
+ matOsd["ID"] = OSD.FromUUID(kvp.Key);
+ matOsd["Material"] = kvp.Value;
+ matsArr.Add(matOsd);
+ }
+
+ OSDMap OSMaterials = new OSDMap();
+ OSMaterials["Materials"] = matsArr;
+
+ lock (part.DynAttrs)
+ part.DynAttrs["OS:Materials"] = OSMaterials;
+ }
+ catch (Exception e)
+ {
+ m_log.Warn("[MaterialsDemoModule]: exception in StoreMaterialsForPart(): " + e.ToString());
+ }
+ }
+
+
public string RenderMaterialsPostCap(string request, string path,
string param, IOSHttpRequest httpRequest,
IOSHttpResponse httpResponse)
@@ -300,6 +434,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
sop.ScheduleFullUpdate();
+ StoreMaterialsForPart(sop);
}
}
}
@@ -327,7 +462,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
resp["Zipped"] = ZCompressOSD(respArr, false);
string response = OSDParser.SerializeLLSDXmlString(resp);
- m_log.Debug("[MaterialsDemoModule]: cap request: " + request);
+ //m_log.Debug("[MaterialsDemoModule]: cap request: " + request);
+ m_log.Debug("[MaterialsDemoModule]: cap request (zipped portion): " + ZippedOsdBytesToString(req["Zipped"].AsBinary()));
m_log.Debug("[MaterialsDemoModule]: cap response: " + response);
return response;
}
@@ -364,7 +500,17 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
return OSDParser.SerializeLLSDXmlString(resp);
}
- public Dictionary m_knownMaterials = new Dictionary();
+ static string ZippedOsdBytesToString(byte[] bytes)
+ {
+ try
+ {
+ return OSDParser.SerializeJsonString(ZDecompressBytesToOsd(bytes));
+ }
+ catch (Exception e)
+ {
+ return "ZippedOsdBytesToString caught an exception: " + e.ToString();
+ }
+ }
///
/// computes a UUID by hashing a OSD object
--
cgit v1.1
From 293a024c141d3567d42169f625bc449b89a1b59d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 22 Apr 2013 22:24:41 +0200
Subject: Allow callers to set the invoice parameter for GenericMessage
---
OpenSim/Framework/IClientAPI.cs | 4 ++--
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 14 ++++++++++++--
.../CoreModules/World/LightShare/LightShareModule.cs | 4 ++--
.../Agent/InternetRelayClientView/Server/IRCClientView.cs | 4 ++--
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 4 ++--
OpenSim/Tests/Common/Mock/TestClient.cs | 4 ++--
6 files changed, 22 insertions(+), 12 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f6b7689..10ead39 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1116,8 +1116,8 @@ namespace OpenSim.Framework
void SendInstantMessage(GridInstantMessage im);
- void SendGenericMessage(string method, List message);
- void SendGenericMessage(string method, List message);
+ void SendGenericMessage(string method, UUID invoice, List message);
+ void SendGenericMessage(string method, UUID invoice, List message);
void SendLayerData(float[] map);
void SendLayerData(int px, int py, float[] map);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1609012..1eb953c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -900,9 +900,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
}
- public void SendGenericMessage(string method, List message)
+ public void SendGenericMessage(string method, UUID invoice, List message)
{
GenericMessagePacket gmp = new GenericMessagePacket();
+
+ gmp.AgentData.AgentID = AgentId;
+ gmp.AgentData.SessionID = m_sessionId;
+ gmp.AgentData.TransactionID = invoice;
+
gmp.MethodData.Method = Util.StringToBytes256(method);
gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
int i = 0;
@@ -915,9 +920,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(gmp, ThrottleOutPacketType.Task);
}
- public void SendGenericMessage(string method, List message)
+ public void SendGenericMessage(string method, UUID invoice, List message)
{
GenericMessagePacket gmp = new GenericMessagePacket();
+
+ gmp.AgentData.AgentID = AgentId;
+ gmp.AgentData.SessionID = m_sessionId;
+ gmp.AgentData.TransactionID = invoice;
+
gmp.MethodData.Method = Util.StringToBytes256(method);
gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
int i = 0;
diff --git a/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
index 4e20196..89f3280 100644
--- a/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
+++ b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
@@ -195,12 +195,12 @@ namespace OpenSim.Region.CoreModules.World.LightShare
if (m_scene.RegionInfo.WindlightSettings.valid)
{
List param = compileWindlightSettings(wl);
- client.SendGenericMessage("Windlight", param);
+ client.SendGenericMessage("Windlight", UUID.Random(), param);
}
else
{
List param = new List();
- client.SendGenericMessage("WindlightReset", param);
+ client.SendGenericMessage("WindlightReset", UUID.Random(), param);
}
}
}
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 0ac56fa..915ebd8 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -971,12 +971,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
// TODO
}
- public void SendGenericMessage(string method, List message)
+ public void SendGenericMessage(string method, UUID invoice, List message)
{
}
- public void SendGenericMessage(string method, List message)
+ public void SendGenericMessage(string method, UUID invoice, List message)
{
}
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 6bd27f0..0ee00e9 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -620,12 +620,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC
}
- public void SendGenericMessage(string method, List message)
+ public void SendGenericMessage(string method, UUID invoice, List message)
{
}
- public void SendGenericMessage(string method, List message)
+ public void SendGenericMessage(string method, UUID invoice, List message)
{
}
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 2d4fef1..d26e3f7 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -541,12 +541,12 @@ namespace OpenSim.Tests.Common.Mock
}
- public void SendGenericMessage(string method, List message)
+ public void SendGenericMessage(string method, UUID invoice, List message)
{
}
- public void SendGenericMessage(string method, List message)
+ public void SendGenericMessage(string method, UUID invoice, List message)
{
}
--
cgit v1.1
From e1ac68315491a0962bd4d089f7190e1b82607f43 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 21 Apr 2013 15:59:39 -0700
Subject: BulletSim: fix crash when deleting llVolumeDetect enabled objects.
Bullet's check for an object being linked into the world does not work for
Bullet's ghost objects so BulletSim was deleting the object while it was
still linked into the physical world structures.
---
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index bfa69b2..1976c42 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -162,11 +162,8 @@ public sealed class BSShapeCollection : IDisposable
// If the caller needs to know the old body is going away, pass the event up.
if (bodyCallback != null) bodyCallback(body);
- if (PhysicsScene.PE.IsInWorld(PhysicsScene.World, body))
- {
- PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, body);
- if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceBody,removingFromWorld. Body={1}", body.ID, body);
- }
+ // Removing an object not in the world is a NOOP
+ PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, body);
// Zero any reference to the shape so it is not freed when the body is deleted.
PhysicsScene.PE.SetCollisionShape(PhysicsScene.World, body, null);
--
cgit v1.1
From 115e0aaf830d31530680b38afd705380be3f284a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 23 Apr 2013 21:54:32 +0100
Subject: Fix issue in ConciergeModule where UpdateBroker was sending malformed
XML if any number of avatars other than 1 was in the region.
I don't know how well the rest of ConiergeModule works since I've practically never looked at this code.
Addresses http://opensimulator.org/mantis/view.php?id=6605
---
OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
index 018357a..c48e585 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
@@ -375,11 +375,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
scene.GetRootAgentCount(), scene.RegionInfo.RegionName,
scene.RegionInfo.RegionID,
DateTime.UtcNow.ToString("s")));
+
scene.ForEachRootScenePresence(delegate(ScenePresence sp)
{
- list.Append(String.Format(" \n", sp.Name, sp.UUID));
- list.Append("");
+ list.Append(String.Format(" \n", sp.Name, sp.UUID));
});
+
+ list.Append("");
string payload = list.ToString();
// post via REST to broker
--
cgit v1.1
From 522ab85045066cb58bb76881032adab7cc6a2d68 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 23 Apr 2013 18:31:12 -0700
Subject: BulletSim: improve avatar stair walking up. Add more parameters to
control force of both position change and up force that move avatars over
barrier. Default parameters are for steps up to 0.5m in height.
---
.../Physics/BulletSPlugin/BSActorAvatarMove.cs | 103 +++++++++++++++++----
OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 15 ++-
.../Region/Physics/BulletSPlugin/BSPhysObject.cs | 22 ++++-
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 5 +
.../Region/Physics/BulletSPlugin/BulletSimTODO.txt | 3 +
5 files changed, 123 insertions(+), 25 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index 8416740..bd5ee0b1 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -40,10 +40,16 @@ public class BSActorAvatarMove : BSActor
{
BSVMotor m_velocityMotor;
+ // Set to true if we think we're going up stairs.
+ // This state is remembered because collisions will turn on and off as we go up stairs.
+ int m_walkingUpStairs;
+ float m_lastStepUp;
+
public BSActorAvatarMove(BSScene physicsScene, BSPhysObject pObj, string actorName)
: base(physicsScene, pObj, actorName)
{
m_velocityMotor = null;
+ m_walkingUpStairs = 0;
m_physicsScene.DetailLog("{0},BSActorAvatarMove,constructor", m_controllingPrim.LocalID);
}
@@ -119,6 +125,8 @@ public class BSActorAvatarMove : BSActor
SetVelocityAndTarget(m_controllingPrim.RawVelocity, m_controllingPrim.TargetVelocity, true /* inTaintTime */);
m_physicsScene.BeforeStep += Mover;
+
+ m_walkingUpStairs = 0;
}
}
@@ -216,8 +224,6 @@ public class BSActorAvatarMove : BSActor
// 'stepVelocity' is now the speed we'd like the avatar to move in. Turn that into an instantanous force.
OMV.Vector3 moveForce = (stepVelocity - m_controllingPrim.RawVelocity) * m_controllingPrim.Mass;
- // Should we check for move force being small and forcing velocity to zero?
-
// Add special movement force to allow avatars to walk up stepped surfaces.
moveForce += WalkUpStairs();
@@ -233,24 +239,33 @@ public class BSActorAvatarMove : BSActor
{
OMV.Vector3 ret = OMV.Vector3.Zero;
+ m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs,IsColliding={1},flying={2},targSpeed={3},collisions={4},avHeight={5}",
+ m_controllingPrim.LocalID, m_controllingPrim.IsColliding, m_controllingPrim.Flying,
+ m_controllingPrim.TargetVelocitySpeed, m_controllingPrim.CollisionsLastTick.Count, m_controllingPrim.Size.Z);
// This test is done if moving forward, not flying and is colliding with something.
- // DetailLog("{0},BSCharacter.WalkUpStairs,IsColliding={1},flying={2},targSpeed={3},collisions={4}",
- // LocalID, IsColliding, Flying, TargetSpeed, CollisionsLastTick.Count);
- if (m_controllingPrim.IsColliding && !m_controllingPrim.Flying && m_controllingPrim.TargetVelocitySpeed > 0.1f /* && ForwardSpeed < 0.1f */)
+ // Check for stairs climbing if colliding, not flying and moving forward
+ if ( m_controllingPrim.IsColliding
+ && !m_controllingPrim.Flying
+ && m_controllingPrim.TargetVelocitySpeed > 0.1f )
{
// The range near the character's feet where we will consider stairs
- float nearFeetHeightMin = m_controllingPrim.RawPosition.Z - (m_controllingPrim.Size.Z / 2f) + 0.05f;
+ // float nearFeetHeightMin = m_controllingPrim.RawPosition.Z - (m_controllingPrim.Size.Z / 2f) + 0.05f;
+ // Note: there is a problem with the computation of the capsule height. Thus RawPosition is off
+ // from the height. Revisit size and this computation when height is scaled properly.
+ float nearFeetHeightMin = m_controllingPrim.RawPosition.Z - (m_controllingPrim.Size.Z / 2f) - 0.05f;
float nearFeetHeightMax = nearFeetHeightMin + BSParam.AvatarStepHeight;
- // Look for a collision point that is near the character's feet and is oriented the same as the charactor is
+ // Look for a collision point that is near the character's feet and is oriented the same as the charactor is.
+ // Find the highest 'good' collision.
+ OMV.Vector3 highestTouchPosition = OMV.Vector3.Zero;
foreach (KeyValuePair kvp in m_controllingPrim.CollisionsLastTick.m_objCollisionList)
{
// Don't care about collisions with the terrain
if (kvp.Key > m_physicsScene.TerrainManager.HighestTerrainID)
{
OMV.Vector3 touchPosition = kvp.Value.Position;
- // DetailLog("{0},BSCharacter.WalkUpStairs,min={1},max={2},touch={3}",
- // LocalID, nearFeetHeightMin, nearFeetHeightMax, touchPosition);
+ m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs,min={1},max={2},touch={3}",
+ m_controllingPrim.LocalID, nearFeetHeightMin, nearFeetHeightMax, touchPosition);
if (touchPosition.Z >= nearFeetHeightMin && touchPosition.Z <= nearFeetHeightMax)
{
// This contact is within the 'near the feet' range.
@@ -261,24 +276,76 @@ public class BSActorAvatarMove : BSActor
float diff = Math.Abs(OMV.Vector3.Distance(directionFacing, touchNormal));
if (diff < BSParam.AvatarStepApproachFactor)
{
- // Found the stairs contact point. Push up a little to raise the character.
- float upForce = (touchPosition.Z - nearFeetHeightMin) * m_controllingPrim.Mass * BSParam.AvatarStepForceFactor;
- ret = new OMV.Vector3(0f, 0f, upForce);
-
- // Also move the avatar up for the new height
- OMV.Vector3 displacement = new OMV.Vector3(0f, 0f, BSParam.AvatarStepHeight / 2f);
- m_controllingPrim.ForcePosition = m_controllingPrim.RawPosition + displacement;
+ if (highestTouchPosition.Z < touchPosition.Z)
+ highestTouchPosition = touchPosition;
}
- m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs,touchPos={1},nearFeetMin={2},faceDir={3},norm={4},diff={5},ret={6}",
- m_controllingPrim.LocalID, touchPosition, nearFeetHeightMin, directionFacing, touchNormal, diff, ret);
}
}
}
+ m_walkingUpStairs = 0;
+ // If there is a good step sensing, move the avatar over the step.
+ if (highestTouchPosition != OMV.Vector3.Zero)
+ {
+ // Remember that we are going up stairs. This is needed because collisions
+ // will stop when we move up so this smoothes out that effect.
+ m_walkingUpStairs = BSParam.AvatarStepSmoothingSteps;
+
+ m_lastStepUp = highestTouchPosition.Z - nearFeetHeightMin;
+ ret = ComputeStairCorrection(m_lastStepUp);
+ m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs,touchPos={1},nearFeetMin={2},ret={3}",
+ m_controllingPrim.LocalID, highestTouchPosition, nearFeetHeightMin, ret);
+ }
+ }
+ else
+ {
+ // If we used to be going up stairs but are not now, smooth the case where collision goes away while
+ // we are bouncing up the stairs.
+ if (m_walkingUpStairs > 0)
+ {
+ m_walkingUpStairs--;
+ ret = ComputeStairCorrection(m_lastStepUp);
+ }
}
return ret;
}
+ private OMV.Vector3 ComputeStairCorrection(float stepUp)
+ {
+ OMV.Vector3 ret = OMV.Vector3.Zero;
+ OMV.Vector3 displacement = OMV.Vector3.Zero;
+
+ if (stepUp > 0f)
+ {
+ // Found the stairs contact point. Push up a little to raise the character.
+ if (BSParam.AvatarStepForceFactor > 0f)
+ {
+ float upForce = stepUp * m_controllingPrim.Mass * BSParam.AvatarStepForceFactor;
+ ret = new OMV.Vector3(0f, 0f, upForce);
+ }
+
+ // Also move the avatar up for the new height
+ if (BSParam.AvatarStepUpCorrectionFactor > 0f)
+ {
+ // Move the avatar up related to the height of the collision
+ displacement = new OMV.Vector3(0f, 0f, stepUp * BSParam.AvatarStepUpCorrectionFactor);
+ m_controllingPrim.ForcePosition = m_controllingPrim.RawPosition + displacement;
+ }
+ else
+ {
+ if (BSParam.AvatarStepUpCorrectionFactor < 0f)
+ {
+ // Move the avatar up about the specified step height
+ displacement = new OMV.Vector3(0f, 0f, BSParam.AvatarStepHeight);
+ m_controllingPrim.ForcePosition = m_controllingPrim.RawPosition + displacement;
+ }
+ }
+ m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs.ComputeStairCorrection,disp={1},force={2}",
+ m_controllingPrim.LocalID, displacement, ret);
+
+ }
+ return ret;
+ }
}
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 06df85e..980d405 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -128,6 +128,8 @@ public static class BSParam
public static float AvatarStepHeight { get; private set; }
public static float AvatarStepApproachFactor { get; private set; }
public static float AvatarStepForceFactor { get; private set; }
+ public static float AvatarStepUpCorrectionFactor { get; private set; }
+ public static int AvatarStepSmoothingSteps { get; private set; }
// Vehicle parameters
public static float VehicleMaxLinearVelocity { get; private set; }
@@ -234,6 +236,7 @@ public static class BSParam
objectSet = pObjSetter;
}
/* Wish I could simplify using this definition but CLR doesn't store references so closure around delegates of references won't work
+ * TODO: Maybe use reflection and the name of the variable to create a reference for the getter/setter.
public ParameterDefn(string pName, string pDesc, T pDefault, ref T loc)
: base(pName, pDesc)
{
@@ -561,7 +564,7 @@ public static class BSParam
(s) => { return AvatarBelowGroundUpCorrectionMeters; },
(s,v) => { AvatarBelowGroundUpCorrectionMeters = v; } ),
new ParameterDefn("AvatarStepHeight", "Height of a step obstacle to consider step correction",
- 0.3f,
+ 0.6f,
(s) => { return AvatarStepHeight; },
(s,v) => { AvatarStepHeight = v; } ),
new ParameterDefn("AvatarStepApproachFactor", "Factor to control angle of approach to step (0=straight on)",
@@ -569,9 +572,17 @@ public static class BSParam
(s) => { return AvatarStepApproachFactor; },
(s,v) => { AvatarStepApproachFactor = v; } ),
new ParameterDefn("AvatarStepForceFactor", "Controls the amount of force up applied to step up onto a step",
- 2.0f,
+ 1.0f,
(s) => { return AvatarStepForceFactor; },
(s,v) => { AvatarStepForceFactor = v; } ),
+ new ParameterDefn("AvatarStepUpCorrectionFactor", "Multiplied by height of step collision to create up movement at step",
+ 1.0f,
+ (s) => { return AvatarStepUpCorrectionFactor; },
+ (s,v) => { AvatarStepUpCorrectionFactor = v; } ),
+ new ParameterDefn("AvatarStepSmoothingSteps", "Number of frames after a step collision that we continue walking up stairs",
+ 2,
+ (s) => { return AvatarStepSmoothingSteps; },
+ (s,v) => { AvatarStepSmoothingSteps = v; } ),
new ParameterDefn("VehicleMaxLinearVelocity", "Maximum velocity magnitude that can be assigned to a vehicle",
1000.0f,
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 98eb4ca..309d004 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -96,7 +96,7 @@ public abstract class BSPhysObject : PhysicsActor
SetMaterial((int)MaterialAttributes.Material.Wood);
CollisionCollection = new CollisionEventUpdate();
- CollisionsLastTick = CollisionCollection;
+ CollisionsLastReported = CollisionCollection;
SubscribedEventsMs = 0;
CollidingStep = 0;
CollidingGroundStep = 0;
@@ -368,11 +368,14 @@ public abstract class BSPhysObject : PhysicsActor
}
}
- // The collisions that have been collected this tick
+ // The collisions that have been collected for the next collision reporting (throttled by subscription)
protected CollisionEventUpdate CollisionCollection;
- // Remember collisions from last tick for fancy collision based actions
+ // This is the collision collection last reported to the Simulator.
+ public CollisionEventUpdate CollisionsLastReported;
+ // Remember the collisions recorded in the last tick for fancy collision checking
// (like a BSCharacter walking up stairs).
public CollisionEventUpdate CollisionsLastTick;
+ private long CollisionsLastTickStep = -1;
// The simulation step is telling this object about a collision.
// Return 'true' if a collision was processed and should be sent up.
@@ -399,6 +402,15 @@ public abstract class BSPhysObject : PhysicsActor
// For movement tests, remember if we are colliding with an object that is moving.
ColliderIsMoving = collidee != null ? (collidee.RawVelocity != OMV.Vector3.Zero) : false;
+ // Make a collection of the collisions that happened the last simulation tick.
+ // This is different than the collection created for sending up to the simulator as it is cleared every tick.
+ if (CollisionsLastTickStep != PhysicsScene.SimulationStep)
+ {
+ CollisionsLastTick = new CollisionEventUpdate();
+ CollisionsLastTickStep = PhysicsScene.SimulationStep;
+ }
+ CollisionsLastTick.AddCollider(collidingWith, new ContactPoint(contactPoint, contactNormal, pentrationDepth));
+
// If someone has subscribed for collision events log the collision so it will be reported up
if (SubscribedEvents()) {
CollisionCollection.AddCollider(collidingWith, new ContactPoint(contactPoint, contactNormal, pentrationDepth));
@@ -419,7 +431,7 @@ public abstract class BSPhysObject : PhysicsActor
bool ret = true;
// If the 'no collision' call, force it to happen right now so quick collision_end
- bool force = (CollisionCollection.Count == 0 && CollisionsLastTick.Count != 0);
+ bool force = (CollisionCollection.Count == 0 && CollisionsLastReported.Count != 0);
// throttle the collisions to the number of milliseconds specified in the subscription
if (force || (PhysicsScene.SimulationNowTime >= NextCollisionOkTime))
@@ -438,7 +450,7 @@ public abstract class BSPhysObject : PhysicsActor
base.SendCollisionUpdate(CollisionCollection);
// Remember the collisions from this tick for some collision specific processing.
- CollisionsLastTick = CollisionCollection;
+ CollisionsLastReported = CollisionCollection;
// The CollisionCollection instance is passed around in the simulator.
// Make sure we don't have a handle to that one and that a new one is used for next time.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 3423d2e..4bc266b 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -69,12 +69,17 @@ public class BSPrim : BSPhysObject
private int CrossingFailures { get; set; }
+ // Keep a handle to the vehicle actor so it is easy to set parameters on same.
public BSDynamics VehicleActor;
public const string VehicleActorName = "BasicVehicle";
+ // Parameters for the hover actor
public const string HoverActorName = "HoverActor";
+ // Parameters for the axis lock actor
public const String LockedAxisActorName = "BSPrim.LockedAxis";
+ // Parameters for the move to target actor
public const string MoveToTargetActorName = "MoveToTargetActor";
+ // Parameters for the setForce and setTorque actors
public const string SetForceActorName = "SetForceActor";
public const string SetTorqueActorName = "SetTorqueActor";
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
index a0131c7..1284ae7 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
@@ -42,6 +42,8 @@ One sided meshes? Should terrain be built into a closed shape?
VEHICLES TODO LIST:
=================================================
+UBit improvements to remove rubber-banding of avatars sitting on vehicle child prims:
+ https://github.com/UbitUmarov/Ubit-opensim
Border crossing with linked vehicle causes crash
20121129.1411: editting/moving phys object across region boundries causes crash
getPos-> btRigidBody::upcast -> getBodyType -> BOOM
@@ -167,6 +169,7 @@ Eliminate collisions between objects in a linkset. (LinksetConstraint)
MORE
======================================================
+Compute avatar size and scale correctly. Now it is a bit off from the capsule size.
Create tests for different interface components
Have test objects/scripts measure themselves and turn color if correct/bad
Test functions in SL and calibrate correctness there
--
cgit v1.1
From e324f6f3f0f8d894190cd7a9733687ac4308b2c1 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 24 Apr 2013 08:03:45 -0700
Subject: BulletSim: update DLLs and SOs to they have no dependencies on newer
glibc (2.14) since that is not yet in some Linux distributions. Add unmanaged
API calls and code for creating single convex hull shapes.
---
OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs | 27 ++++++++++++++++++++++
OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | 10 ++++++++
.../Region/Physics/BulletSPlugin/BSApiTemplate.cs | 7 ++++++
3 files changed, 44 insertions(+)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
index f5b84d4..fdf2cb9 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
@@ -268,6 +268,25 @@ public override BulletShape BuildHullShapeFromMesh(BulletWorld world, BulletShap
BSPhysicsShapeType.SHAPE_HULL);
}
+public override BulletShape BuildConvexHullShapeFromMesh(BulletWorld world, BulletShape meshShape)
+{
+ BulletWorldUnman worldu = world as BulletWorldUnman;
+ BulletShapeUnman shapeu = meshShape as BulletShapeUnman;
+ return new BulletShapeUnman(
+ BSAPICPP.BuildConvexHullShapeFromMesh2(worldu.ptr, shapeu.ptr),
+ BSPhysicsShapeType.SHAPE_CONVEXHULL);
+}
+
+public override BulletShape CreateConvexHullShape(BulletWorld world,
+ int indicesCount, int[] indices,
+ int verticesCount, float[] vertices)
+{
+ BulletWorldUnman worldu = world as BulletWorldUnman;
+ return new BulletShapeUnman(
+ BSAPICPP.CreateConvexHullShape2(worldu.ptr, indicesCount, indices, verticesCount, vertices),
+ BSPhysicsShapeType.SHAPE_CONVEXHULL);
+}
+
public override BulletShape BuildNativeShape(BulletWorld world, ShapeData shapeData)
{
BulletWorldUnman worldu = world as BulletWorldUnman;
@@ -1414,6 +1433,14 @@ public static extern IntPtr CreateHullShape2(IntPtr world,
public static extern IntPtr BuildHullShapeFromMesh2(IntPtr world, IntPtr meshShape, HACDParams parms);
[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern IntPtr BuildConvexHullShapeFromMesh2(IntPtr world, IntPtr meshShape);
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern IntPtr CreateConvexHullShape2(IntPtr world,
+ int indicesCount, [MarshalAs(UnmanagedType.LPArray)] int[] indices,
+ int verticesCount, [MarshalAs(UnmanagedType.LPArray)] float[] vertices );
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
public static extern IntPtr BuildNativeShape2(IntPtr world, ShapeData shapeData);
[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
index f6b4359..b37265a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
@@ -1778,6 +1778,16 @@ private sealed class BulletConstraintXNA : BulletConstraint
/* TODO */ return null;
}
+ public override BulletShape BuildConvexHullShapeFromMesh(BulletWorld world, BulletShape meshShape)
+ {
+ /* TODO */ return null;
+ }
+
+ public override BulletShape CreateConvexHullShape(BulletWorld pWorld, int pIndicesCount, int[] indices, int pVerticesCount, float[] verticesAsFloats)
+ {
+ /* TODO */ return null;
+ }
+
public override BulletShape CreateMeshShape(BulletWorld pWorld, int pIndicesCount, int[] indices, int pVerticesCount, float[] verticesAsFloats)
{
//DumpRaw(indices,verticesAsFloats,pIndicesCount,pVerticesCount);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index d0d9f34..bfeec24 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -70,6 +70,7 @@ public enum BSPhysicsShapeType
SHAPE_COMPOUND = 22,
SHAPE_HEIGHTMAP = 23,
SHAPE_AVATAR = 24,
+ SHAPE_CONVEXHULL= 25,
};
// The native shapes have predefined shape hash keys
@@ -325,6 +326,12 @@ public abstract BulletShape CreateHullShape(BulletWorld world,
public abstract BulletShape BuildHullShapeFromMesh(BulletWorld world, BulletShape meshShape, HACDParams parms);
+public abstract BulletShape BuildConvexHullShapeFromMesh(BulletWorld world, BulletShape meshShape);
+
+public abstract BulletShape CreateConvexHullShape(BulletWorld world,
+ int indicesCount, int[] indices,
+ int verticesCount, float[] vertices );
+
public abstract BulletShape BuildNativeShape(BulletWorld world, ShapeData shapeData);
public abstract bool IsNativeShape(BulletShape shape);
--
cgit v1.1
From c22a2ab7d21803050317527476c2e18aa2edb40f Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 24 Apr 2013 08:05:42 -0700
Subject: BulletSim: partial addition of BSShape class code preparing for
different physical mesh representations (simplified convex meshes) and avatar
mesh.
---
.../Physics/BulletSPlugin/BSShapeCollection.cs | 28 +--
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 215 +++++++++++++++++----
2 files changed, 191 insertions(+), 52 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 1976c42..bc26460 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -612,7 +612,7 @@ public sealed class BSShapeCollection : IDisposable
newShape = CreatePhysicalMesh(prim, newMeshKey, prim.BaseShape, prim.Size, lod);
// Take evasive action if the mesh was not constructed.
- newShape = VerifyMeshCreated(newShape, prim);
+ newShape = VerifyMeshCreated(PhysicsScene, newShape, prim);
ReferenceShape(newShape);
@@ -719,7 +719,7 @@ public sealed class BSShapeCollection : IDisposable
newShape = CreatePhysicalHull(prim, newHullKey, prim.BaseShape, prim.Size, lod);
// It might not have been created if we're waiting for an asset.
- newShape = VerifyMeshCreated(newShape, prim);
+ newShape = VerifyMeshCreated(PhysicsScene, newShape, prim);
ReferenceShape(newShape);
@@ -923,7 +923,7 @@ public sealed class BSShapeCollection : IDisposable
// Create a hash of all the shape parameters to be used as a key
// for this particular shape.
- private System.UInt64 ComputeShapeKey(OMV.Vector3 size, PrimitiveBaseShape pbs, out float retLod)
+ public static System.UInt64 ComputeShapeKey(OMV.Vector3 size, PrimitiveBaseShape pbs, out float retLod)
{
// level of detail based on size and type of the object
float lod = BSParam.MeshLOD;
@@ -944,7 +944,7 @@ public sealed class BSShapeCollection : IDisposable
return pbs.GetMeshKey(size, lod);
}
// For those who don't want the LOD
- private System.UInt64 ComputeShapeKey(OMV.Vector3 size, PrimitiveBaseShape pbs)
+ public static System.UInt64 ComputeShapeKey(OMV.Vector3 size, PrimitiveBaseShape pbs)
{
float lod;
return ComputeShapeKey(size, pbs, out lod);
@@ -957,7 +957,7 @@ public sealed class BSShapeCollection : IDisposable
// us to not loop forever.
// Called after creating a physical mesh or hull. If the physical shape was created,
// just return.
- private BulletShape VerifyMeshCreated(BulletShape newShape, BSPhysObject prim)
+ public static BulletShape VerifyMeshCreated(BSScene physicsScene, BulletShape newShape, BSPhysObject prim)
{
// If the shape was successfully created, nothing more to do
if (newShape.HasPhysicalShape)
@@ -969,7 +969,7 @@ public sealed class BSShapeCollection : IDisposable
if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
{
prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
- PhysicsScene.Logger.WarnFormat("{0} Fetched asset would not mesh. {1}, texture={2}",
+ physicsScene.Logger.WarnFormat("{0} Fetched asset would not mesh. {1}, texture={2}",
LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
}
else
@@ -981,14 +981,14 @@ public sealed class BSShapeCollection : IDisposable
&& prim.BaseShape.SculptTexture != OMV.UUID.Zero
)
{
- DetailLog("{0},BSShapeCollection.VerifyMeshCreated,fetchAsset", prim.LocalID);
+ physicsScene.DetailLog("{0},BSShapeCollection.VerifyMeshCreated,fetchAsset", prim.LocalID);
// Multiple requestors will know we're waiting for this asset
prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Waiting;
BSPhysObject xprim = prim;
Util.FireAndForget(delegate
{
- RequestAssetDelegate assetProvider = PhysicsScene.RequestAssetMethod;
+ RequestAssetDelegate assetProvider = physicsScene.RequestAssetMethod;
if (assetProvider != null)
{
BSPhysObject yprim = xprim; // probably not necessary, but, just in case.
@@ -1016,7 +1016,7 @@ public sealed class BSShapeCollection : IDisposable
yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Fetched;
else
yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
- DetailLog("{0},BSShapeCollection,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
+ physicsScene.DetailLog("{0},BSShapeCollection,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
yprim.LocalID, assetFound, yprim.BaseShape.SculptEntry, mismatchIDs );
});
@@ -1024,8 +1024,8 @@ public sealed class BSShapeCollection : IDisposable
else
{
xprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
- PhysicsScene.Logger.ErrorFormat("{0} Physical object requires asset but no asset provider. Name={1}",
- LogHeader, PhysicsScene.Name);
+ physicsScene.Logger.ErrorFormat("{0} Physical object requires asset but no asset provider. Name={1}",
+ LogHeader, physicsScene.Name);
}
});
}
@@ -1033,15 +1033,15 @@ public sealed class BSShapeCollection : IDisposable
{
if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Failed)
{
- PhysicsScene.Logger.WarnFormat("{0} Mesh failed to fetch asset. obj={1}, texture={2}",
+ physicsScene.Logger.WarnFormat("{0} Mesh failed to fetch asset. obj={1}, texture={2}",
LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
}
}
}
// While we wait for the mesh defining asset to be loaded, stick in a simple box for the object.
- BulletShape fillinShape = BuildPhysicalNativeShape(prim, BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX);
- DetailLog("{0},BSShapeCollection.VerifyMeshCreated,boxTempShape", prim.LocalID);
+ BulletShape fillinShape = physicsScene.Shapes.BuildPhysicalNativeShape(prim, BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX);
+ physicsScene.DetailLog("{0},BSShapeCollection.VerifyMeshCreated,boxTempShape", prim.LocalID);
return fillinShape;
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index ee18379..dd5ae1a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -29,6 +29,9 @@ using System;
using System.Collections.Generic;
using System.Text;
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+
using OMV = OpenMetaverse;
namespace OpenSim.Region.Physics.BulletSPlugin
@@ -37,11 +40,19 @@ public abstract class BSShape
{
public int referenceCount { get; set; }
public DateTime lastReferenced { get; set; }
+ public BulletShape physShapeInfo { get; set; }
public BSShape()
{
referenceCount = 0;
lastReferenced = DateTime.Now;
+ physShapeInfo = new BulletShape();
+ }
+ public BSShape(BulletShape pShape)
+ {
+ referenceCount = 0;
+ lastReferenced = DateTime.Now;
+ physShapeInfo = pShape;
}
// Get a reference to a physical shape. Create if it doesn't exist
@@ -79,21 +90,30 @@ public abstract class BSShape
return ret;
}
- public static BSShape GetShapeReferenceNonSpecial(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
+ private static BSShape GetShapeReferenceNonSpecial(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
{
+ BSShapeMesh.GetReference(physicsScene, forceRebuild, prim);
+ BSShapeHull.GetReference(physicsScene, forceRebuild, prim);
return null;
}
- public static BSShape GetShapeReferenceNonNative(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
+
+ // Called when this shape is being used again.
+ public virtual void IncrementReference()
{
- return null;
+ referenceCount++;
+ lastReferenced = DateTime.Now;
+ }
+
+ // Called when this shape is being used again.
+ public virtual void DecrementReference()
+ {
+ referenceCount--;
+ lastReferenced = DateTime.Now;
}
// Release the use of a physical shape.
public abstract void Dereference(BSScene physicsScene);
- // All shapes have a static call to get a reference to the physical shape
- // protected abstract static BSShape GetReference();
-
// Returns a string for debugging that uniquily identifies the memory used by this instance
public virtual string AddrString
{
@@ -112,6 +132,7 @@ public abstract class BSShape
}
}
+// ============================================================================================================
public class BSShapeNull : BSShape
{
public BSShapeNull() : base()
@@ -121,23 +142,39 @@ public class BSShapeNull : BSShape
public override void Dereference(BSScene physicsScene) { /* The magic of garbage collection will make this go away */ }
}
+// ============================================================================================================
public class BSShapeNative : BSShape
{
private static string LogHeader = "[BULLETSIM SHAPE NATIVE]";
- public BSShapeNative() : base()
+ public BSShapeNative(BulletShape pShape) : base(pShape)
{
}
+
public static BSShape GetReference(BSScene physicsScene, BSPhysObject prim,
- BSPhysicsShapeType shapeType, FixedShapeKey shapeKey)
+ BSPhysicsShapeType shapeType, FixedShapeKey shapeKey)
{
// Native shapes are not shared and are always built anew.
- //return new BSShapeNative(physicsScene, prim, shapeType, shapeKey);
- return null;
+ return new BSShapeNative(CreatePhysicalNativeShape(physicsScene, prim, shapeType, shapeKey));
}
- private BSShapeNative(BSScene physicsScene, BSPhysObject prim,
- BSPhysicsShapeType shapeType, FixedShapeKey shapeKey)
+ // Make this reference to the physical shape go away since native shapes are not shared.
+ public override void Dereference(BSScene physicsScene)
+ {
+ // Native shapes are not tracked and are released immediately
+ if (physShapeInfo.HasPhysicalShape)
+ {
+ physicsScene.DetailLog("{0},BSShapeNative.DereferenceShape,deleteNativeShape,shape={1}", BSScene.DetailLogZero, this);
+ physicsScene.PE.DeleteCollisionShape(physicsScene.World, physShapeInfo);
+ }
+ physShapeInfo.Clear();
+ // Garbage collection will free up this instance.
+ }
+
+ private static BulletShape CreatePhysicalNativeShape(BSScene physicsScene, BSPhysObject prim,
+ BSPhysicsShapeType shapeType, FixedShapeKey shapeKey)
{
+ BulletShape newShape;
+
ShapeData nativeShapeData = new ShapeData();
nativeShapeData.Type = shapeType;
nativeShapeData.ID = prim.LocalID;
@@ -146,63 +183,164 @@ public class BSShapeNative : BSShape
nativeShapeData.MeshKey = (ulong)shapeKey;
nativeShapeData.HullKey = (ulong)shapeKey;
-
- /*
if (shapeType == BSPhysicsShapeType.SHAPE_CAPSULE)
{
- ptr = PhysicsScene.PE.BuildCapsuleShape(physicsScene.World, 1f, 1f, prim.Scale);
- physicsScene.DetailLog("{0},BSShapeCollection.BuiletPhysicalNativeShape,capsule,scale={1}", prim.LocalID, prim.Scale);
+ newShape = physicsScene.PE.BuildCapsuleShape(physicsScene.World, 1f, 1f, prim.Scale);
+ physicsScene.DetailLog("{0},BSShapeNative,capsule,scale={1}", prim.LocalID, prim.Scale);
}
else
{
- ptr = PhysicsScene.PE.BuildNativeShape(physicsScene.World, nativeShapeData);
+ newShape = physicsScene.PE.BuildNativeShape(physicsScene.World, nativeShapeData);
}
- if (ptr == IntPtr.Zero)
+ if (!newShape.HasPhysicalShape)
{
physicsScene.Logger.ErrorFormat("{0} BuildPhysicalNativeShape failed. ID={1}, shape={2}",
LogHeader, prim.LocalID, shapeType);
}
- type = shapeType;
- key = (UInt64)shapeKey;
- */
- }
- // Make this reference to the physical shape go away since native shapes are not shared.
- public override void Dereference(BSScene physicsScene)
- {
- /*
- // Native shapes are not tracked and are released immediately
- physicsScene.DetailLog("{0},BSShapeCollection.DereferenceShape,deleteNativeShape,shape={1}", BSScene.DetailLogZero, this);
- PhysicsScene.PE.DeleteCollisionShape(physicsScene.World, this);
- ptr = IntPtr.Zero;
- // Garbage collection will free up this instance.
- */
+ newShape.type = shapeType;
+ newShape.isNativeShape = true;
+ newShape.shapeKey = (UInt64)shapeKey;
+ return newShape;
}
+
}
+// ============================================================================================================
public class BSShapeMesh : BSShape
{
private static string LogHeader = "[BULLETSIM SHAPE MESH]";
private static Dictionary Meshes = new Dictionary();
- public BSShapeMesh() : base()
+ public BSShapeMesh(BulletShape pShape) : base(pShape)
{
}
- public static BSShape GetReference() { return new BSShapeNull(); }
- public override void Dereference(BSScene physicsScene) { }
+ public static BSShape GetReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
+ {
+ float lod;
+ System.UInt64 newMeshKey = BSShapeCollection.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
+
+ physicsScene.DetailLog("{0},BSShapeMesh,create,oldKey={1},newKey={2},size={3},lod={4}",
+ prim.LocalID, prim.PhysShape.shapeKey.ToString("X"), newMeshKey.ToString("X"), prim.Size, lod);
+
+ BSShapeMesh retMesh;
+ lock (Meshes)
+ {
+ if (Meshes.TryGetValue(newMeshKey, out retMesh))
+ {
+ // The mesh has already been created. Return a new reference to same.
+ retMesh.IncrementReference();
+ }
+ else
+ {
+ // An instance of this mesh has not been created. Build and remember same.
+ BulletShape newShape = CreatePhysicalMesh(physicsScene, prim, newMeshKey, prim.BaseShape, prim.Size, lod);
+ // Take evasive action if the mesh was not constructed.
+ newShape = BSShapeCollection.VerifyMeshCreated(physicsScene, newShape, prim);
+
+ retMesh = new BSShapeMesh(newShape);
+
+ Meshes.Add(newMeshKey, retMesh);
+ }
+ }
+ return retMesh;
+ }
+ public override void Dereference(BSScene physicsScene)
+ {
+ lock (Meshes)
+ {
+ this.DecrementReference();
+ // TODO: schedule aging and destruction of unused meshes.
+ }
+ }
+
+ private static BulletShape CreatePhysicalMesh(BSScene physicsScene, BSPhysObject prim, System.UInt64 newMeshKey,
+ PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
+ {
+ BulletShape newShape = null;
+
+ IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod,
+ false, // say it is not physical so a bounding box is not built
+ false // do not cache the mesh and do not use previously built versions
+ );
+
+ if (meshData != null)
+ {
+
+ int[] indices = meshData.getIndexListAsInt();
+ int realIndicesIndex = indices.Length;
+ float[] verticesAsFloats = meshData.getVertexListAsFloat();
+
+ if (BSParam.ShouldRemoveZeroWidthTriangles)
+ {
+ // Remove degenerate triangles. These are triangles with two of the vertices
+ // are the same. This is complicated by the problem that vertices are not
+ // made unique in sculpties so we have to compare the values in the vertex.
+ realIndicesIndex = 0;
+ for (int tri = 0; tri < indices.Length; tri += 3)
+ {
+ // Compute displacements into vertex array for each vertex of the triangle
+ int v1 = indices[tri + 0] * 3;
+ int v2 = indices[tri + 1] * 3;
+ int v3 = indices[tri + 2] * 3;
+ // Check to see if any two of the vertices are the same
+ if (!( ( verticesAsFloats[v1 + 0] == verticesAsFloats[v2 + 0]
+ && verticesAsFloats[v1 + 1] == verticesAsFloats[v2 + 1]
+ && verticesAsFloats[v1 + 2] == verticesAsFloats[v2 + 2])
+ || ( verticesAsFloats[v2 + 0] == verticesAsFloats[v3 + 0]
+ && verticesAsFloats[v2 + 1] == verticesAsFloats[v3 + 1]
+ && verticesAsFloats[v2 + 2] == verticesAsFloats[v3 + 2])
+ || ( verticesAsFloats[v1 + 0] == verticesAsFloats[v3 + 0]
+ && verticesAsFloats[v1 + 1] == verticesAsFloats[v3 + 1]
+ && verticesAsFloats[v1 + 2] == verticesAsFloats[v3 + 2]) )
+ )
+ {
+ // None of the vertices of the triangles are the same. This is a good triangle;
+ indices[realIndicesIndex + 0] = indices[tri + 0];
+ indices[realIndicesIndex + 1] = indices[tri + 1];
+ indices[realIndicesIndex + 2] = indices[tri + 2];
+ realIndicesIndex += 3;
+ }
+ }
+ }
+ physicsScene.DetailLog("{0},BSShapeCollection.CreatePhysicalMesh,origTri={1},realTri={2},numVerts={3}",
+ BSScene.DetailLogZero, indices.Length / 3, realIndicesIndex / 3, verticesAsFloats.Length / 3);
+
+ if (realIndicesIndex != 0)
+ {
+ newShape = physicsScene.PE.CreateMeshShape(physicsScene.World,
+ realIndicesIndex, indices, verticesAsFloats.Length / 3, verticesAsFloats);
+ }
+ else
+ {
+ physicsScene.Logger.DebugFormat("{0} All mesh triangles degenerate. Prim {1} at {2} in {3}",
+ LogHeader, prim.PhysObjectName, prim.RawPosition, physicsScene.Name);
+ }
+ }
+ newShape.shapeKey = newMeshKey;
+
+ return newShape;
+ }
}
+// ============================================================================================================
public class BSShapeHull : BSShape
{
private static string LogHeader = "[BULLETSIM SHAPE HULL]";
private static Dictionary Hulls = new Dictionary();
- public BSShapeHull() : base()
+ public BSShapeHull(BulletShape pShape) : base(pShape)
+ {
+ }
+ public static BSShape GetReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
+ {
+ return new BSShapeNull();
+ }
+ public override void Dereference(BSScene physicsScene)
{
}
- public static BSShape GetReference() { return new BSShapeNull(); }
- public override void Dereference(BSScene physicsScene) { }
}
+// ============================================================================================================
public class BSShapeCompound : BSShape
{
private static string LogHeader = "[BULLETSIM SHAPE COMPOUND]";
@@ -216,6 +354,7 @@ public class BSShapeCompound : BSShape
public override void Dereference(BSScene physicsScene) { }
}
+// ============================================================================================================
public class BSShapeAvatar : BSShape
{
private static string LogHeader = "[BULLETSIM SHAPE AVATAR]";
--
cgit v1.1
From 70081a40a4892b5d3e58218a8cd15a689d875ad0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 24 Apr 2013 12:45:19 -0700
Subject: Bug fix: compare tolower. This should fix the issue where HG visitors
currently in the region were not being found by the avatar picker window.
---
.../Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 77e8b00..7b823ba 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
// search the local cache
foreach (UserData data in m_UserCache.Values)
if (users.Find(delegate(UserData d) { return d.Id == data.Id; }) == null &&
- (data.FirstName.StartsWith(query) || data.LastName.StartsWith(query)))
+ (data.FirstName.ToLower().StartsWith(query.ToLower()) || data.LastName.ToLower().StartsWith(query.ToLower())))
users.Add(data);
AddAdditionalUsers(avatarID, query, users);
--
cgit v1.1
From 6f3c905744e674f3cca555a4d36ede2139fcb9d7 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 25 Apr 2013 00:24:48 +0100
Subject: Add Avination's support for parcel eject and freeze
---
.../CoreModules/World/Land/LandManagementModule.cs | 85 ++++++++++++++++++++++
OpenSim/Region/Framework/Scenes/Scene.cs | 40 ++++++----
2 files changed, 110 insertions(+), 15 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index dbf5138..693de1d 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -210,6 +210,9 @@ namespace OpenSim.Region.CoreModules.World.Land
client.OnParcelInfoRequest += ClientOnParcelInfoRequest;
client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup;
client.OnPreAgentUpdate += ClientOnPreAgentUpdate;
+ client.OnParcelEjectUser += ClientOnParcelEjectUser;
+ client.OnParcelFreezeUser += ClientOnParcelFreezeUser;
+
EntityBase presenceEntity;
if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence)
@@ -1738,6 +1741,88 @@ namespace OpenSim.Region.CoreModules.World.Land
UpdateLandObject(localID, land.LandData);
}
+ Dictionary Timers = new Dictionary();
+
+ public void ClientOnParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
+ {
+ ScenePresence targetAvatar = null;
+ ((Scene)client.Scene).TryGetScenePresence(target, out targetAvatar);
+ ScenePresence parcelManager = null;
+ ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager);
+ System.Threading.Timer Timer;
+
+ if (targetAvatar.UserLevel == 0)
+ {
+ ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
+ if (!((Scene)client.Scene).Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze))
+ return;
+ if (flags == 0)
+ {
+ targetAvatar.AllowMovement = false;
+ targetAvatar.ControllingClient.SendAlertMessage(parcelManager.Firstname + " " + parcelManager.Lastname + " has frozen you for 30 seconds. You cannot move or interact with the world.");
+ parcelManager.ControllingClient.SendAlertMessage("Avatar Frozen.");
+ System.Threading.TimerCallback timeCB = new System.Threading.TimerCallback(OnEndParcelFrozen);
+ Timer = new System.Threading.Timer(timeCB, targetAvatar, 30000, 0);
+ Timers.Add(targetAvatar.UUID, Timer);
+ }
+ else
+ {
+ targetAvatar.AllowMovement = true;
+ targetAvatar.ControllingClient.SendAlertMessage(parcelManager.Firstname + " " + parcelManager.Lastname + " has unfrozen you.");
+ parcelManager.ControllingClient.SendAlertMessage("Avatar Unfrozen.");
+ Timers.TryGetValue(targetAvatar.UUID, out Timer);
+ Timers.Remove(targetAvatar.UUID);
+ Timer.Dispose();
+ }
+ }
+ }
+
+ private void OnEndParcelFrozen(object avatar)
+ {
+ ScenePresence targetAvatar = (ScenePresence)avatar;
+ targetAvatar.AllowMovement = true;
+ System.Threading.Timer Timer;
+ Timers.TryGetValue(targetAvatar.UUID, out Timer);
+ Timers.Remove(targetAvatar.UUID);
+ targetAvatar.ControllingClient.SendAgentAlertMessage("The freeze has worn off; you may go about your business.", false);
+ }
+
+ public void ClientOnParcelEjectUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
+ {
+ ScenePresence targetAvatar = null;
+ ScenePresence parcelManager = null;
+
+ // Must have presences
+ if (!m_scene.TryGetScenePresence(target, out targetAvatar) ||
+ !m_scene.TryGetScenePresence(client.AgentId, out parcelManager))
+ return;
+
+ // Cannot eject estate managers or gods
+ if (m_scene.Permissions.IsAdministrator(target))
+ return;
+
+ // Check if you even have permission to do this
+ ILandObject land = m_scene.LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
+ if (!m_scene.Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze) &&
+ !m_scene.Permissions.IsAdministrator(client.AgentId))
+ return;
+ Vector3 pos = m_scene.GetNearestAllowedPosition(targetAvatar, land);
+
+ targetAvatar.TeleportWithMomentum(pos, null);
+ targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
+ parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
+
+ if ((flags & 1) != 0) // Ban TODO: Remove magic number
+ {
+ LandAccessEntry entry = new LandAccessEntry();
+ entry.AgentID = targetAvatar.UUID;
+ entry.Flags = AccessList.Ban;
+ entry.Expires = 0; // Perm
+
+ land.LandData.ParcelAccessList.Add(entry);
+ }
+ }
+
protected void InstallInterfaces()
{
Command clearCommand
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f50d3cd..69fe137 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5138,9 +5138,14 @@ namespace OpenSim.Region.Framework.Scenes
get { return m_allowScriptCrossings; }
}
- public Vector3? GetNearestAllowedPosition(ScenePresence avatar)
+ public Vector3 GetNearestAllowedPosition(ScenePresence avatar)
{
- ILandObject nearestParcel = GetNearestAllowedParcel(avatar.UUID, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+ return GetNearestAllowedPosition(avatar, null);
+ }
+
+ public Vector3 GetNearestAllowedPosition(ScenePresence avatar, ILandObject excludeParcel)
+ {
+ ILandObject nearestParcel = GetNearestAllowedParcel(avatar.UUID, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, excludeParcel);
if (nearestParcel != null)
{
@@ -5149,10 +5154,7 @@ namespace OpenSim.Region.Framework.Scenes
Vector3? nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel);
if (nearestPoint != null)
{
-// m_log.DebugFormat(
-// "[SCENE]: Found a sane previous position based on velocity for {0}, sending them to {1} in {2}",
-// avatar.Name, nearestPoint, nearestParcel.LandData.Name);
-
+ Debug.WriteLine("Found a sane previous position based on velocity, sending them to: " + nearestPoint.ToString());
return nearestPoint.Value;
}
@@ -5162,24 +5164,27 @@ namespace OpenSim.Region.Framework.Scenes
nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel);
if (nearestPoint != null)
{
-// m_log.DebugFormat(
-// "[SCENE]: {0} had a zero velocity, sending them to {1}", avatar.Name, nearestPoint);
-
+ Debug.WriteLine("They had a zero velocity, sending them to: " + nearestPoint.ToString());
return nearestPoint.Value;
}
- //Ultimate backup if we have no idea where they are
-// m_log.DebugFormat(
-// "[SCENE]: No idea where {0} is, sending them to {1}", avatar.Name, avatar.lastKnownAllowedPosition);
+ ILandObject dest = LandChannel.GetLandObject(avatar.lastKnownAllowedPosition.X, avatar.lastKnownAllowedPosition.Y);
+ if (dest != excludeParcel)
+ {
+ // Ultimate backup if we have no idea where they are and
+ // the last allowed position was in another parcel
+ Debug.WriteLine("Have no idea where they are, sending them to: " + avatar.lastKnownAllowedPosition.ToString());
+ return avatar.lastKnownAllowedPosition;
+ }
- return avatar.lastKnownAllowedPosition;
+ // else fall through to region edge
}
//Go to the edge, this happens in teleporting to a region with no available parcels
Vector3 nearestRegionEdgePoint = GetNearestRegionEdgePosition(avatar);
//Debug.WriteLine("They are really in a place they don't belong, sending them to: " + nearestRegionEdgePoint.ToString());
-
+
return nearestRegionEdgePoint;
}
@@ -5206,13 +5211,18 @@ namespace OpenSim.Region.Framework.Scenes
public ILandObject GetNearestAllowedParcel(UUID avatarId, float x, float y)
{
+ return GetNearestAllowedParcel(avatarId, x, y, null);
+ }
+
+ public ILandObject GetNearestAllowedParcel(UUID avatarId, float x, float y, ILandObject excludeParcel)
+ {
List all = AllParcels();
float minParcelDistance = float.MaxValue;
ILandObject nearestParcel = null;
foreach (var parcel in all)
{
- if (!parcel.IsEitherBannedOrRestricted(avatarId))
+ if (!parcel.IsEitherBannedOrRestricted(avatarId) && parcel != excludeParcel)
{
float parcelDistance = GetParcelDistancefromPoint(parcel, x, y);
if (parcelDistance < minParcelDistance)
--
cgit v1.1
From 5cd77a460ca434f50c231ba261647e82e9f033dc Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 25 Apr 2013 00:51:57 +0100
Subject: Commit Avination's God Kick feature.
---
.../Region/CoreModules/Avatar/Gods/GodsModule.cs | 199 ++++++++++++++-------
1 file changed, 137 insertions(+), 62 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 5a7446f..d9badcd 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -32,14 +32,35 @@ using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces;
+using System;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Reflection;
+using System.IO;
+using System.Web;
+using System.Xml;
+using log4net;
using Mono.Addins;
+using OpenMetaverse.Messages.Linden;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OSDArray = OpenMetaverse.StructuredData.OSDArray;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+
namespace OpenSim.Region.CoreModules.Avatar.Gods
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GodsModule")]
public class GodsModule : INonSharedRegionModule, IGodsModule
{
+ private static readonly ILog m_log =
+ LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
/// Special UUID for actions that apply to all agents
private static readonly UUID ALL_AGENTS = new UUID("44e87126-e794-4ded-05b3-7c42da3d5cdb");
@@ -65,6 +86,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
m_scene = scene;
m_scene.RegisterModuleInterface(this);
m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
+ m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
+ scene.EventManager.OnIncomingInstantMessage +=
+ OnIncomingInstantMessage;
}
public void RemoveRegion(Scene scene)
@@ -98,6 +122,47 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
client.OnRequestGodlikePowers -= RequestGodlikePowers;
}
+ private void OnRegisterCaps(UUID agentID, Caps caps)
+ {
+ string uri = "/CAPS/" + UUID.Random();
+
+ caps.RegisterHandler("UntrustedSimulatorMessage",
+ new RestStreamHandler("POST", uri,
+ HandleUntrustedSimulatorMessage));
+ }
+
+ private string HandleUntrustedSimulatorMessage(string request,
+ string path, string param, IOSHttpRequest httpRequest,
+ IOSHttpResponse httpResponse)
+ {
+ OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request);
+
+ string message = osd["message"].AsString();
+
+ if (message == "GodKickUser")
+ {
+ OSDMap body = (OSDMap)osd["body"];
+ OSDArray userInfo = (OSDArray)body["UserInfo"];
+ OSDMap userData = (OSDMap)userInfo[0];
+
+ UUID agentID = userData["AgentID"].AsUUID();
+ UUID godID = userData["GodID"].AsUUID();
+ UUID godSessionID = userData["GodSessionID"].AsUUID();
+ uint kickFlags = userData["KickFlags"].AsUInteger();
+ string reason = userData["Reason"].AsString();
+ ScenePresence god = m_scene.GetScenePresence(godID);
+ if (god == null || god.ControllingClient.SessionId != godSessionID)
+ return String.Empty;
+
+ KickUser(godID, godSessionID, agentID, kickFlags, Util.StringToBytes1024(reason));
+ }
+ else
+ {
+ m_log.ErrorFormat("[GOD]: Unhandled UntrustedSimulatorMessage: {0}", message);
+ }
+ return String.Empty;
+ }
+
public void RequestGodlikePowers(
UUID agentID, UUID sessionID, UUID token, bool godLike, IClientAPI controllingClient)
{
@@ -146,76 +211,86 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
/// The message to send to the user after it's been turned into a field
public void KickUser(UUID godID, UUID sessionID, UUID agentID, uint kickflags, byte[] reason)
{
- UUID kickUserID = ALL_AGENTS;
-
+ if (!m_scene.Permissions.IsGod(godID))
+ return;
+
ScenePresence sp = m_scene.GetScenePresence(agentID);
- if (sp != null || agentID == kickUserID)
+ if (sp == null && agentID != ALL_AGENTS)
{
- if (m_scene.Permissions.IsGod(godID))
+ IMessageTransferModule transferModule =
+ m_scene.RequestModuleInterface();
+ if (transferModule != null)
{
- if (kickflags == 0)
- {
- if (agentID == kickUserID)
- {
- string reasonStr = Utils.BytesToString(reason);
-
- m_scene.ForEachClient(
- delegate(IClientAPI controller)
- {
- if (controller.AgentId != godID)
- controller.Kick(reasonStr);
- }
- );
-
- // This is a bit crude. It seems the client will be null before it actually stops the thread
- // The thread will kill itself eventually :/
- // Is there another way to make sure *all* clients get this 'inter region' message?
- m_scene.ForEachRootClient(
- delegate(IClientAPI client)
- {
- if (client.AgentId != godID)
- {
- client.Close();
- }
- }
- );
- }
- else
- {
- m_scene.SceneGraph.removeUserCount(!sp.IsChildAgent);
+ m_log.DebugFormat("[GODS]: Sending nonlocal kill for agent {0}", agentID);
+ transferModule.SendInstantMessage(new GridInstantMessage(
+ m_scene, godID, "God", agentID, (byte)250, false,
+ Utils.BytesToString(reason), UUID.Zero, true,
+ new Vector3(), new byte[] {(byte)kickflags}, true),
+ delegate(bool success) {} );
+ }
+ return;
+ }
- sp.ControllingClient.Kick(Utils.BytesToString(reason));
- sp.ControllingClient.Close();
- }
- }
-
- if (kickflags == 1)
- {
- sp.AllowMovement = false;
- if (DialogModule != null)
- {
- DialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
- DialogModule.SendAlertToUser(godID, "User Frozen");
- }
- }
-
- if (kickflags == 2)
- {
- sp.AllowMovement = true;
- if (DialogModule != null)
- {
- DialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
- DialogModule.SendAlertToUser(godID, "User Unfrozen");
- }
- }
+ switch (kickflags)
+ {
+ case 0:
+ if (sp != null)
+ {
+ KickPresence(sp, Utils.BytesToString(reason));
}
- else
+ else if (agentID == ALL_AGENTS)
{
- if (DialogModule != null)
- DialogModule.SendAlertToUser(godID, "Kick request denied");
+ m_scene.ForEachRootScenePresence(
+ delegate(ScenePresence p)
+ {
+ if (p.UUID != godID && (!m_scene.Permissions.IsGod(p.UUID)))
+ KickPresence(p, Utils.BytesToString(reason));
+ }
+ );
}
+ break;
+ case 1:
+ if (sp != null)
+ {
+ sp.AllowMovement = false;
+ m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
+ m_dialogModule.SendAlertToUser(godID, "User Frozen");
+ }
+ break;
+ case 2:
+ if (sp != null)
+ {
+ sp.AllowMovement = true;
+ m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
+ m_dialogModule.SendAlertToUser(godID, "User Unfrozen");
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ private void KickPresence(ScenePresence sp, string reason)
+ {
+ if (sp.IsChildAgent)
+ return;
+ sp.ControllingClient.Kick(reason);
+ sp.MakeChildAgent();
+ sp.ControllingClient.Close();
+ }
+
+ private void OnIncomingInstantMessage(GridInstantMessage msg)
+ {
+ if (msg.dialog == (uint)250) // Nonlocal kick
+ {
+ UUID agentID = new UUID(msg.toAgentID);
+ string reason = msg.message;
+ UUID godID = new UUID(msg.fromAgentID);
+ uint kickMode = (uint)msg.binaryBucket[0];
+
+ KickUser(godID, UUID.Zero, agentID, kickMode, Util.StringToBytes1024(reason));
}
}
}
-}
\ No newline at end of file
+}
--
cgit v1.1
From ec4f981f1d371b329d227e17cb2f5aaaba364fad Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 25 Apr 2013 01:39:22 +0200
Subject: Adding the dynamic menu module which allows registering new menu
options in compliant viewers
---
.../Framework/Interfaces/IDynamicMenuModule.cs | 57 +++++
.../ViewerSupport/DynamicMenuModule.cs | 282 +++++++++++++++++++++
2 files changed, 339 insertions(+)
create mode 100644 OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
create mode 100644 OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs b/OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
new file mode 100644
index 0000000..08b71e4
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenSim.Framework;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+ public enum InsertLocation : int
+ {
+ Agent = 1,
+ World = 2,
+ Tools = 3,
+ Advanced = 4,
+ Admin = 5
+ }
+
+ public enum UserMode : int
+ {
+ Normal = 0,
+ God = 3
+ }
+
+ public delegate void CustomMenuHandler(string action, UUID agentID, List selection);
+
+ public interface IDynamicMenuModule
+ {
+ void AddMenuItem(UUID agentID, string title, InsertLocation location, UserMode mode, CustomMenuHandler handler);
+ void AddMenuItem(string title, InsertLocation location, UserMode mode, CustomMenuHandler handler);
+ void RemoveMenuItem(string action);
+ }
+}
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
new file mode 100644
index 0000000..917911f
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
@@ -0,0 +1,282 @@
+// ******************************************************************
+// Copyright (c) 2008, 2009 Melanie Thielker
+//
+// All rights reserved
+//
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim;
+using OpenSim.Region;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework;
+//using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using Nini.Config;
+using log4net;
+using Mono.Addins;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+
+namespace OpenSim.Region.OptionalModules.ViewerSupport
+{
+ [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DynamicMenu")]
+ public class DynamicMenuModule : INonSharedRegionModule, IDynamicMenuModule
+ {
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ private class MenuItemData
+ {
+ public string Title;
+ public UUID AgentID;
+ public InsertLocation Location;
+ public UserMode Mode;
+ public CustomMenuHandler Handler;
+ }
+
+ private Dictionary> m_menuItems =
+ new Dictionary>();
+
+ private Scene m_scene;
+
+ public string Name
+ {
+ get { return "DynamicMenuModule"; }
+ }
+
+ public Type ReplaceableInterface
+ {
+ get { return null; }
+ }
+
+ public void Initialise(IConfigSource config)
+ {
+ }
+
+ public void Close()
+ {
+ }
+
+ public void AddRegion(Scene scene)
+ {
+ m_scene = scene;
+ scene.EventManager.OnRegisterCaps += OnRegisterCaps;
+ m_scene.RegisterModuleInterface(this);
+ }
+
+ public void RegionLoaded(Scene scene)
+ {
+ ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface();
+
+ if (featuresModule != null)
+ featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
+ }
+
+ public void RemoveRegion(Scene scene)
+ {
+ }
+
+ private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+ {
+ OSD menus = new OSDMap();
+ if (features.ContainsKey("menus"))
+ menus = features["menus"];
+
+ OSDMap agent = new OSDMap();
+ OSDMap world = new OSDMap();
+ OSDMap tools = new OSDMap();
+ OSDMap advanced = new OSDMap();
+ OSDMap admin = new OSDMap();
+ if (((OSDMap)menus).ContainsKey("agent"))
+ agent = (OSDMap)((OSDMap)menus)["agent"];
+ if (((OSDMap)menus).ContainsKey("world"))
+ world = (OSDMap)((OSDMap)menus)["world"];
+ if (((OSDMap)menus).ContainsKey("tools"))
+ tools = (OSDMap)((OSDMap)menus)["tools"];
+ if (((OSDMap)menus).ContainsKey("advanced"))
+ advanced = (OSDMap)((OSDMap)menus)["advanced"];
+ if (((OSDMap)menus).ContainsKey("admin"))
+ admin = (OSDMap)((OSDMap)menus)["admin"];
+
+ if (m_menuItems.ContainsKey(UUID.Zero))
+ {
+ foreach (MenuItemData d in m_menuItems[UUID.Zero])
+ {
+ if (d.Mode == UserMode.God && (!m_scene.Permissions.IsGod(agentID)))
+ continue;
+
+ OSDMap loc = null;
+ switch (d.Location)
+ {
+ case InsertLocation.Agent:
+ loc = agent;
+ break;
+ case InsertLocation.World:
+ loc = world;
+ break;
+ case InsertLocation.Tools:
+ loc = tools;
+ break;
+ case InsertLocation.Advanced:
+ loc = advanced;
+ break;
+ case InsertLocation.Admin:
+ loc = admin;
+ break;
+ }
+
+ if (loc == null)
+ continue;
+
+ loc[d.Title] = OSD.FromString(d.Title);
+ }
+ }
+
+ if (m_menuItems.ContainsKey(agentID))
+ {
+ foreach (MenuItemData d in m_menuItems[agentID])
+ {
+ if (d.Mode == UserMode.God && (!m_scene.Permissions.IsGod(agentID)))
+ continue;
+
+ OSDMap loc = null;
+ switch (d.Location)
+ {
+ case InsertLocation.Agent:
+ loc = agent;
+ break;
+ case InsertLocation.World:
+ loc = world;
+ break;
+ case InsertLocation.Tools:
+ loc = tools;
+ break;
+ case InsertLocation.Advanced:
+ loc = advanced;
+ break;
+ case InsertLocation.Admin:
+ loc = admin;
+ break;
+ }
+
+ if (loc == null)
+ continue;
+
+ loc[d.Title] = OSD.FromString(d.Title);
+ }
+ }
+
+
+ ((OSDMap)menus)["agent"] = agent;
+ ((OSDMap)menus)["world"] = world;
+ ((OSDMap)menus)["tools"] = tools;
+ ((OSDMap)menus)["advanced"] = advanced;
+ ((OSDMap)menus)["admin"] = admin;
+
+ features["menus"] = menus;
+ }
+
+ private void OnRegisterCaps(UUID agentID, Caps caps)
+ {
+ string capUrl = "/CAPS/" + UUID.Random() + "/";
+
+ capUrl = "/CAPS/" + UUID.Random() + "/";
+ caps.RegisterHandler("CustomMenuAction", new MenuActionHandler(capUrl, "CustomMenuAction", agentID, this, m_scene));
+ }
+
+ internal void HandleMenuSelection(string action, UUID agentID, List selection)
+ {
+ if (m_menuItems.ContainsKey(agentID))
+ {
+ foreach (MenuItemData d in m_menuItems[agentID])
+ {
+ if (d.Title == action)
+ d.Handler(action, agentID, selection);
+ }
+ }
+
+ if (m_menuItems.ContainsKey(UUID.Zero))
+ {
+ foreach (MenuItemData d in m_menuItems[UUID.Zero])
+ {
+ if (d.Title == action)
+ d.Handler(action, agentID, selection);
+ }
+ }
+ }
+
+ public void AddMenuItem(string title, InsertLocation location, UserMode mode, CustomMenuHandler handler)
+ {
+ AddMenuItem(UUID.Zero, title, location, mode, handler);
+ }
+
+ public void AddMenuItem(UUID agentID, string title, InsertLocation location, UserMode mode, CustomMenuHandler handler)
+ {
+ if (!m_menuItems.ContainsKey(agentID))
+ m_menuItems[agentID] = new List();
+
+ m_menuItems[agentID].Add(new MenuItemData() { Title = title, AgentID = agentID, Location = location, Mode = mode, Handler = handler });
+ }
+
+ public void RemoveMenuItem(string action)
+ {
+ foreach (KeyValuePair> kvp in m_menuItems)
+ {
+ List pendingDeletes = new List();
+ foreach (MenuItemData d in kvp.Value)
+ {
+ if (d.Title == action)
+ pendingDeletes.Add(d);
+ }
+
+ foreach (MenuItemData d in pendingDeletes)
+ kvp.Value.Remove(d);
+ }
+ }
+ }
+
+ public class MenuActionHandler : BaseStreamHandler
+ {
+ private static readonly ILog m_log =
+ LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ private UUID m_agentID;
+ private Scene m_scene;
+ private DynamicMenuModule m_module;
+
+ public MenuActionHandler(string path, string name, UUID agentID, DynamicMenuModule module, Scene scene)
+ :base("POST", path, name, agentID.ToString())
+ {
+ m_agentID = agentID;
+ m_scene = scene;
+ m_module = module;
+ }
+
+ public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+ {
+ StreamReader reader = new StreamReader(request);
+ string requestBody = reader.ReadToEnd();
+
+ OSD osd = OSDParser.DeserializeLLSDXml(requestBody);
+
+ string action = ((OSDMap)osd)["action"].AsString();
+ OSDArray selection = (OSDArray)((OSDMap)osd)["selection"];
+ List sel = new List();
+ for (int i = 0 ; i < selection.Count ; i++)
+ sel.Add(selection[i].AsUInteger());
+
+ Util.FireAndForget(x => { m_module.HandleMenuSelection(action, m_agentID, sel); });
+
+ Encoding encoding = Encoding.UTF8;
+ return encoding.GetBytes(OSDParser.SerializeLLSDXmlString(new OSD()));
+ }
+ }
+}
--
cgit v1.1
From 0e22021c650a84ae1b9ed86d7c8df3beeb6e54ed Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 24 Apr 2013 19:00:41 -0700
Subject: Make the kicked user's avie truly disappear when it's god-kicked.
---
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index d9badcd..16673ec 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -276,8 +276,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
if (sp.IsChildAgent)
return;
sp.ControllingClient.Kick(reason);
- sp.MakeChildAgent();
- sp.ControllingClient.Close();
+ sp.Scene.IncomingCloseAgent(sp.UUID, true);
}
private void OnIncomingInstantMessage(GridInstantMessage msg)
--
cgit v1.1
From c10405330d0fa5855c3f8180fdc8347cb87fed4f Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 24 Apr 2013 20:43:15 -0700
Subject: UUIDGatherer now includes UUIDs which reference texture assets used
as materials
---
OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 66 +++++++++++++++++++++++++
1 file changed, 66 insertions(+)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index ad33607..0e83781 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -34,6 +34,7 @@ using System.Threading;
using log4net;
using OpenMetaverse;
using OpenMetaverse.Assets;
+using OpenMetaverse.StructuredData;
using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes.Serialization;
using OpenSim.Services.Interfaces;
@@ -184,6 +185,9 @@ namespace OpenSim.Region.Framework.Scenes
if (!assetUuids.ContainsKey(tii.AssetID))
GatherAssetUuids(tii.AssetID, (AssetType)tii.Type, assetUuids);
}
+
+ // get any texture UUIDs used for materials such as normal and specular maps
+ GatherMaterialsUuids(part, assetUuids);
}
catch (Exception e)
{
@@ -208,6 +212,68 @@ namespace OpenSim.Region.Framework.Scenes
// }
// }
+
+ ///
+ /// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps
+ ///
+ ///
+ ///
+ public void GatherMaterialsUuids(SceneObjectPart part, IDictionary assetUuids)
+ {
+ // scan thru the dynAttrs map of this part for any textures used as materials
+ OSDMap OSMaterials = null;
+
+ lock (part.DynAttrs)
+ {
+ if (part.DynAttrs.ContainsKey("OS:Materials"))
+ OSMaterials = part.DynAttrs["OS:Materials"];
+ if (OSMaterials != null && OSMaterials.ContainsKey("Materials"))
+ {
+ OSD osd = OSMaterials["Materials"];
+ //m_log.Info("[UUID Gatherer]: found Materials: " + OSDParser.SerializeJsonString(osd));
+
+ if (osd is OSDArray)
+ {
+ OSDArray matsArr = osd as OSDArray;
+ foreach (OSDMap matMap in matsArr)
+ {
+ try
+ {
+ if (matMap.ContainsKey("Material"))
+ {
+ OSDMap mat = matMap["Material"] as OSDMap;
+ if (mat.ContainsKey("NormMap"))
+ {
+ UUID normalMapId = mat["NormMap"].AsUUID();
+ if (normalMapId != UUID.Zero)
+ {
+ assetUuids[normalMapId] = AssetType.Texture;
+ //m_log.Info("[UUID Gatherer]: found normal map ID: " + normalMapId.ToString());
+ }
+ }
+ if (mat.ContainsKey("SpecMap"))
+ {
+ UUID specularMapId = mat["SpecMap"].AsUUID();
+ if (specularMapId != UUID.Zero)
+ {
+ assetUuids[specularMapId] = AssetType.Texture;
+ //m_log.Info("[UUID Gatherer]: found specular map ID: " + specularMapId.ToString());
+ }
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ m_log.Warn("[UUID Gatherer]: exception getting materials: " + e.Message);
+ }
+ }
+ }
+ }
+ }
+ }
+
+
///
/// Get an asset synchronously, potentially using an asynchronous callback. If the
/// asynchronous callback is used, we will wait for it to complete.
--
cgit v1.1
From 3bc801746466cbd401f481295876b357fa27125b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 25 Apr 2013 09:23:15 -0700
Subject: Recover a lost "virtual". Downstream projects need this.
---
OpenSim/Data/MySQL/MySQLSimulationData.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 9cc6f40..2d20eaf 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Data.MySQL
private string m_connectionString;
private object m_dbLock = new object();
- protected Assembly Assembly
+ protected virtual Assembly Assembly
{
get { return GetType().Assembly; }
}
--
cgit v1.1
From 5d0a8ff39149a41d332dc40ae0bb1dc0972d0512 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 25 Apr 2013 20:48:12 +0100
Subject: Change copyright notice on DynamicMenuModule to proper BSD
---
.../ViewerSupport/DynamicMenuModule.cs | 31 ++++++++++++++++++----
1 file changed, 26 insertions(+), 5 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
index 917911f..1ea1c20 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
@@ -1,8 +1,29 @@
-// ******************************************************************
-// Copyright (c) 2008, 2009 Melanie Thielker
-//
-// All rights reserved
-//
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
using System;
using System.IO;
--
cgit v1.1
From 03c9d8ae4fa9a47cda66814177071c258f5b4437 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 25 Apr 2013 21:35:18 +0100
Subject: Change EconomyDataRequest signature to use an IClientAPI rather than
UUID. This is needed because recent LL viewer codebases call this earlier in
login when the client is not yet established in the sim and can't be found by
UUID. Sending the reply requires having the IClientAPI.
---
OpenSim/Framework/IClientAPI.cs | 2 +-
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +-
.../World/MoneyModule/SampleMoneyModule.cs | 17 ++++++-----------
3 files changed, 8 insertions(+), 13 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 10ead39..4d5ec3a 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -313,7 +313,7 @@ namespace OpenSim.Framework
public delegate void ObjectPermissions(
IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set);
- public delegate void EconomyDataRequest(UUID agentID);
+ public delegate void EconomyDataRequest(IClientAPI client);
public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1eb953c..bede379 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -9682,7 +9682,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
EconomyDataRequest handlerEconomoyDataRequest = OnEconomyDataRequest;
if (handlerEconomoyDataRequest != null)
{
- handlerEconomoyDataRequest(AgentId);
+ handlerEconomoyDataRequest(this);
}
return true;
}
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 7bbf500..37af8c7 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -688,19 +688,14 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
/// Event called Economy Data Request handler.
///
///
- public void EconomyDataRequestHandler(UUID agentId)
+ public void EconomyDataRequestHandler(IClientAPI user)
{
- IClientAPI user = LocateClientObject(agentId);
+ Scene s = LocateSceneClientIn(user.AgentId);
- if (user != null)
- {
- Scene s = LocateSceneClientIn(user.AgentId);
-
- user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
- PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
- PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
- TeleportMinPrice, TeleportPriceExponent);
- }
+ user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
+ PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
+ PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
+ TeleportMinPrice, TeleportPriceExponent);
}
private void ValidateLandBuy(Object osender, EventManager.LandBuyArgs e)
--
cgit v1.1
From 0e162511cf0e2b507a94ad91a5e36be76eda18ef Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 25 Apr 2013 17:01:57 -0700
Subject: Groups: make some methods protected.
---
OpenSim/Addons/Groups/Service/GroupsService.cs | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs
index 0668870..6a4348b 100644
--- a/OpenSim/Addons/Groups/Service/GroupsService.cs
+++ b/OpenSim/Addons/Groups/Service/GroupsService.cs
@@ -723,12 +723,12 @@ namespace OpenSim.Groups
#region Actions without permission checks
- private void _AddAgentToGroup(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID)
+ protected void _AddAgentToGroup(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID)
{
_AddAgentToGroup(RequestingAgentID, AgentID, GroupID, RoleID, string.Empty);
}
- public void _RemoveAgentFromGroup(string RequestingAgentID, string AgentID, UUID GroupID)
+ protected void _RemoveAgentFromGroup(string RequestingAgentID, string AgentID, UUID GroupID)
{
// 1. Delete membership
m_Database.DeleteMember(GroupID, AgentID);
@@ -780,7 +780,7 @@ namespace OpenSim.Groups
}
- private bool _AddOrUpdateGroupRole(string RequestingAgentID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers, bool add)
+ protected bool _AddOrUpdateGroupRole(string RequestingAgentID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers, bool add)
{
RoleData data = m_Database.RetrieveRole(groupID, roleID);
@@ -810,12 +810,12 @@ namespace OpenSim.Groups
return m_Database.StoreRole(data);
}
- private void _RemoveGroupRole(UUID groupID, UUID roleID)
+ protected void _RemoveGroupRole(UUID groupID, UUID roleID)
{
m_Database.DeleteRole(groupID, roleID);
}
- private void _AddAgentToGroupRole(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID)
+ protected void _AddAgentToGroupRole(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID)
{
RoleMembershipData data = m_Database.RetrieveRoleMember(GroupID, RoleID, AgentID);
if (data != null)
@@ -840,7 +840,7 @@ namespace OpenSim.Groups
}
- private List _GetGroupRoles(UUID groupID)
+ protected List _GetGroupRoles(UUID groupID)
{
List roles = new List();
@@ -865,7 +865,7 @@ namespace OpenSim.Groups
return roles;
}
- private List _GetGroupRoleMembers(UUID GroupID, bool isInGroup)
+ protected List _GetGroupRoleMembers(UUID GroupID, bool isInGroup)
{
List rmembers = new List();
--
cgit v1.1
From ef08ab68a7a8870e4ec300a0da5533ea097a9577 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 27 Apr 2013 17:42:54 +0100
Subject: Small oversight in EconomyDataRequest - this would have affected
everyone NOT using a money module.
---
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 2 --
1 file changed, 2 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 37af8c7..5863379 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -690,8 +690,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
///
public void EconomyDataRequestHandler(IClientAPI user)
{
- Scene s = LocateSceneClientIn(user.AgentId);
-
user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
--
cgit v1.1
From cbb3bb62dae548917a899171bd69972e85a1642d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 27 Apr 2013 17:56:39 +0100
Subject: Unbreak the sample money module
---
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 2 ++
1 file changed, 2 insertions(+)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 5863379..35f44d0 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -690,6 +690,8 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
///
public void EconomyDataRequestHandler(IClientAPI user)
{
+ Scene s = (Scene)user.Scene;
+
user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
--
cgit v1.1
From f675d465b27bfecab59213bd19c6e070a6482f88 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 27 Apr 2013 10:34:13 -0700
Subject: Make method virtual
---
OpenSim/Services/UserAccountService/GridUserService.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index 43fa04b..8388180 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Services.UserAccountService
return info;
}
- public GridUserInfo[] GetGridUserInfo(string[] userIDs)
+ public virtual GridUserInfo[] GetGridUserInfo(string[] userIDs)
{
List ret = new List();
--
cgit v1.1
From 90a6891a7d5af39013efc49f12dc69a8d7b240de Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 27 Apr 2013 10:34:23 -0700
Subject: Better error reporting
---
OpenSim/Server/Base/ServerUtils.cs | 1 +
1 file changed, 1 insertion(+)
(limited to 'OpenSim')
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 210a314..25957d3 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -286,6 +286,7 @@ namespace OpenSim.Server.Base
e.InnerException == null ? e.Message : e.InnerException.Message,
e.StackTrace);
}
+ m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0}: {1}", dllName, e.Message);
return null;
}
--
cgit v1.1
From 222f530411eccf43279ff0d789c1f5c3bc4530eb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 27 Apr 2013 21:23:29 -0700
Subject: Added an interface to an external ban service. With this commit, the
interface is used only in Hypergrided worlds (Gatekeeper), although in those,
it applies to both local and foreign users. The Ban service itself is not in
core; it is to be provided externally.
---
.../Services/HypergridService/GatekeeperService.cs | 25 +++++++++--
OpenSim/Services/Interfaces/IBansService.cs | 48 ++++++++++++++++++++++
2 files changed, 69 insertions(+), 4 deletions(-)
create mode 100644 OpenSim/Services/Interfaces/IBansService.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 97a0afc..0cf1c14 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -58,6 +58,7 @@ namespace OpenSim.Services.HypergridService
private static IUserAgentService m_UserAgentService;
private static ISimulationService m_SimulationService;
private static IGridUserService m_GridUserService;
+ private static IBansService m_BansService;
private static string m_AllowedClients = string.Empty;
private static string m_DeniedClients = string.Empty;
@@ -87,6 +88,7 @@ namespace OpenSim.Services.HypergridService
string presenceService = serverConfig.GetString("PresenceService", String.Empty);
string simulationService = serverConfig.GetString("SimulationService", String.Empty);
string gridUserService = serverConfig.GetString("GridUserService", String.Empty);
+ string bansService = serverConfig.GetString("BansService", String.Empty);
// These are mandatory, the others aren't
if (gridService == string.Empty || presenceService == string.Empty)
@@ -121,6 +123,8 @@ namespace OpenSim.Services.HypergridService
m_UserAgentService = ServerUtils.LoadPlugin(homeUsersService, args);
if (gridUserService != string.Empty)
m_GridUserService = ServerUtils.LoadPlugin(gridUserService, args);
+ if (bansService != string.Empty)
+ m_BansService = ServerUtils.LoadPlugin(bansService, args);
if (simService != null)
m_SimulationService = simService;
@@ -223,7 +227,7 @@ namespace OpenSim.Services.HypergridService
m_log.InfoFormat("[GATEKEEPER SERVICE]: Login request for {0} {1} @ {2} ({3}) at {4} using viewer {5}, channel {6}, IP {7}, Mac {8}, Id0 {9} Teleport Flags {10}",
aCircuit.firstname, aCircuit.lastname, authURL, aCircuit.AgentID, destination.RegionName,
aCircuit.Viewer, aCircuit.Channel, aCircuit.IPAddress, aCircuit.Mac, aCircuit.Id0, aCircuit.teleportFlags.ToString());
-
+
//
// Check client
//
@@ -287,17 +291,16 @@ namespace OpenSim.Services.HypergridService
}
}
}
- m_log.DebugFormat("[GATEKEEPER SERVICE]: User is ok");
//
// Foreign agents allowed? Exceptions?
//
- if (account == null)
+ if (account == null)
{
bool allowed = m_ForeignAgentsAllowed;
if (m_ForeignAgentsAllowed && IsException(aCircuit, m_ForeignsAllowedExceptions))
- allowed = false;
+ allowed = false;
if (!m_ForeignAgentsAllowed && IsException(aCircuit, m_ForeignsDisallowedExceptions))
allowed = true;
@@ -311,6 +314,20 @@ namespace OpenSim.Services.HypergridService
}
}
+ //
+ // Is the user banned?
+ // This uses a Ban service that's more powerful than the configs
+ //
+ string uui = (account != null ? aCircuit.AgentID.ToString() : Util.ProduceUserUniversalIdentifier(aCircuit));
+ if (m_BansService != null && m_BansService.IsBanned(uui, aCircuit.IPAddress, aCircuit.Id0, authURL))
+ {
+ reason = "You are banned from this world";
+ m_log.InfoFormat("[GATEKEEPER SERVICE]: Login failed, reason: user {0} is banned", uui);
+ return false;
+ }
+
+ m_log.DebugFormat("[GATEKEEPER SERVICE]: User is OK");
+
bool isFirstLogin = false;
//
// Login the presence, if it's not there yet (by the login service)
diff --git a/OpenSim/Services/Interfaces/IBansService.cs b/OpenSim/Services/Interfaces/IBansService.cs
new file mode 100644
index 0000000..8fd3521
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IBansService.cs
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using System.Collections.Generic;
+
+using OpenSim.Framework;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Interfaces
+{
+ public interface IBansService
+ {
+ ///
+ /// Are any of the given arguments banned from the grid?
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ bool IsBanned(string userID, string ip, string id0, string origin);
+ }
+
+}
--
cgit v1.1
From a517e597f5960e5ce5eeea89e9087ac32a42bf06 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Apr 2013 09:03:09 -0700
Subject: Fix wrong sql statement in offline im.
---
OpenSim/Data/MySQL/MySQLOfflineIMData.cs | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Data/MySQL/MySQLOfflineIMData.cs b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
index 252f358..bafd204 100644
--- a/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
+++ b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
@@ -47,13 +47,10 @@ namespace OpenSim.Data.MySQL
public void DeleteOld()
{
- uint now = (uint)Util.UnixTimeSinceEpoch();
-
using (MySqlCommand cmd = new MySqlCommand())
{
- cmd.CommandText = String.Format("delete from {0} where TMStamp < ?tstamp", m_Realm);
- cmd.Parameters.AddWithValue("?tstamp", now - 14 * 24 * 60 * 60); // > 2 weeks old
-
+ cmd.CommandText = String.Format("delete from {0} where TMStamp < NOW() - INTERVAL 2 WEEK", m_Realm);
+
ExecuteNonQuery(cmd);
}
--
cgit v1.1
From 3ff7391495271fed152aadc7a588ae976e09bafc Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 29 Apr 2013 00:55:34 +0100
Subject: Some more pieces of Avination's ban system - if an avatar isn't
allowed on any parcel in the sim, keep them out entirely.
---
OpenSim/Region/Framework/Scenes/Scene.cs | 95 +++++++++++++++++++++++++++++---
1 file changed, 88 insertions(+), 7 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 69fe137..829a7e9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3693,7 +3693,7 @@ namespace OpenSim.Region.Framework.Scenes
//On login test land permisions
if (vialogin)
{
- if (land != null && !TestLandRestrictions(agent, land, out reason))
+ if (land != null && !TestLandRestrictions(agent.AgentID, out reason, ref agent.startpos.X, ref agent.startpos.Y))
{
return false;
}
@@ -3868,20 +3868,37 @@ namespace OpenSim.Region.Framework.Scenes
return true;
}
- private bool TestLandRestrictions(AgentCircuitData agent, ILandObject land, out string reason)
+ public bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY)
{
- bool banned = land.IsBannedFromLand(agent.AgentID);
- bool restricted = land.IsRestrictedFromLand(agent.AgentID);
+ if (posX < 0)
+ posX = 0;
+ else if (posX >= 256)
+ posX = 255.999f;
+ if (posY < 0)
+ posY = 0;
+ else if (posY >= 256)
+ posY = 255.999f;
+
+ reason = String.Empty;
+ if (Permissions.IsGod(agentID))
+ return true;
+
+ ILandObject land = LandChannel.GetLandObject(posX, posY);
+ if (land == null)
+ return false;
+
+ bool banned = land.IsBannedFromLand(agentID);
+ bool restricted = land.IsRestrictedFromLand(agentID);
if (banned || restricted)
{
- ILandObject nearestParcel = GetNearestAllowedParcel(agent.AgentID, agent.startpos.X, agent.startpos.Y);
+ ILandObject nearestParcel = GetNearestAllowedParcel(agentID, posX, posY);
if (nearestParcel != null)
{
//Move agent to nearest allowed
Vector3 newPosition = GetParcelCenterAtGround(nearestParcel);
- agent.startpos.X = newPosition.X;
- agent.startpos.Y = newPosition.Y;
+ posX = newPosition.X;
+ posY = newPosition.Y;
}
else
{
@@ -5466,6 +5483,8 @@ namespace OpenSim.Region.Framework.Scenes
///
public bool QueryAccess(UUID agentID, Vector3 position, out string reason)
{
+ reason = "You are banned from the region";
+
if (EntityTransferModule.IsInTransit(agentID))
{
reason = "Agent is still in transit from this region";
@@ -5477,6 +5496,12 @@ namespace OpenSim.Region.Framework.Scenes
return false;
}
+ if (Permissions.IsGod(agentID))
+ {
+ reason = String.Empty;
+ return true;
+ }
+
// FIXME: Root agent count is currently known to be inaccurate. This forces a recount before we check.
// However, the long term fix is to make sure root agent count is always accurate.
m_sceneGraph.RecalculateStats();
@@ -5497,6 +5522,41 @@ namespace OpenSim.Region.Framework.Scenes
}
}
+ ScenePresence presence = GetScenePresence(agentID);
+ IClientAPI client = null;
+ AgentCircuitData aCircuit = null;
+
+ if (presence != null)
+ {
+ client = presence.ControllingClient;
+ if (client != null)
+ aCircuit = client.RequestClientInfo();
+ }
+
+ // We may be called before there is a presence or a client.
+ // Fake AgentCircuitData to keep IAuthorizationModule smiling
+ if (client == null)
+ {
+ aCircuit = new AgentCircuitData();
+ aCircuit.AgentID = agentID;
+ aCircuit.firstname = String.Empty;
+ aCircuit.lastname = String.Empty;
+ }
+
+ try
+ {
+ if (!AuthorizeUser(aCircuit, out reason))
+ {
+ // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
+ return false;
+ }
+ }
+ catch (Exception e)
+ {
+ m_log.DebugFormat("[SCENE]: Exception authorizing agent: {0} "+ e.StackTrace, e.Message);
+ return false;
+ }
+
if (position == Vector3.Zero) // Teleport
{
if (!RegionInfo.EstateSettings.AllowDirectTeleport)
@@ -5530,6 +5590,27 @@ namespace OpenSim.Region.Framework.Scenes
}
}
}
+
+ float posX = 128.0f;
+ float posY = 128.0f;
+
+ if (!TestLandRestrictions(agentID, out reason, ref posX, ref posY))
+ {
+ // m_log.DebugFormat("[SCENE]: Denying {0} because they are banned on all parcels", agentID);
+ return false;
+ }
+ }
+ else // Walking
+ {
+ ILandObject land = LandChannel.GetLandObject(position.X, position.Y);
+ if (land == null)
+ return false;
+
+ bool banned = land.IsBannedFromLand(agentID);
+ bool restricted = land.IsRestrictedFromLand(agentID);
+
+ if (banned || restricted)
+ return false;
}
reason = String.Empty;
--
cgit v1.1
From 890cb6a29373a54dde2d06b13e42d07676710dc2 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 27 Apr 2013 14:00:58 -0700
Subject: BulletSim: complete BSShape classes.
---
.../Physics/BulletSPlugin/BSShapeCollection.cs | 2 +-
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 327 ++++++++++++++++++++-
.../Region/Physics/BulletSPlugin/BulletSimTODO.txt | 6 +-
3 files changed, 316 insertions(+), 19 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index bc26460..0f9b3c3 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -499,7 +499,7 @@ public sealed class BSShapeCollection : IDisposable
}
// return 'true' if this shape description does not include any cutting or twisting.
- private bool PrimHasNoCuts(PrimitiveBaseShape pbs)
+ public static bool PrimHasNoCuts(PrimitiveBaseShape pbs)
{
return pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0
&& pbs.ProfileHollow == 0
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index dd5ae1a..e427dbc 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -31,6 +31,7 @@ using System.Text;
using OpenSim.Framework;
using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Physics.ConvexDecompositionDotNet;
using OMV = OpenMetaverse;
@@ -73,7 +74,7 @@ public abstract class BSShape
if (ret == null && prim.PreferredPhysicalShape == BSPhysicsShapeType.SHAPE_COMPOUND)
{
// Getting a reference to a compound shape gets you the compound shape with the root prim shape added
- ret = BSShapeCompound.GetReference(prim);
+ ret = BSShapeCompound.GetReference(physicsScene, prim);
physicsScene.DetailLog("{0},BSShapeCollection.CreateGeom,compoundShape,shape={1}", prim.LocalID, ret);
}
@@ -92,6 +93,7 @@ public abstract class BSShape
}
private static BSShape GetShapeReferenceNonSpecial(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
{
+ // TODO: work needed here!!
BSShapeMesh.GetReference(physicsScene, forceRebuild, prim);
BSShapeHull.GetReference(physicsScene, forceRebuild, prim);
return null;
@@ -209,7 +211,7 @@ public class BSShapeNative : BSShape
public class BSShapeMesh : BSShape
{
private static string LogHeader = "[BULLETSIM SHAPE MESH]";
- private static Dictionary Meshes = new Dictionary();
+ public static Dictionary Meshes = new Dictionary();
public BSShapeMesh(BulletShape pShape) : base(pShape)
{
@@ -219,10 +221,10 @@ public class BSShapeMesh : BSShape
float lod;
System.UInt64 newMeshKey = BSShapeCollection.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
- physicsScene.DetailLog("{0},BSShapeMesh,create,oldKey={1},newKey={2},size={3},lod={4}",
+ physicsScene.DetailLog("{0},BSShapeMesh,getReference,oldKey={1},newKey={2},size={3},lod={4}",
prim.LocalID, prim.PhysShape.shapeKey.ToString("X"), newMeshKey.ToString("X"), prim.Size, lod);
- BSShapeMesh retMesh;
+ BSShapeMesh retMesh = new BSShapeMesh(new BulletShape());
lock (Meshes)
{
if (Meshes.TryGetValue(newMeshKey, out retMesh))
@@ -233,13 +235,17 @@ public class BSShapeMesh : BSShape
else
{
// An instance of this mesh has not been created. Build and remember same.
- BulletShape newShape = CreatePhysicalMesh(physicsScene, prim, newMeshKey, prim.BaseShape, prim.Size, lod);
- // Take evasive action if the mesh was not constructed.
- newShape = BSShapeCollection.VerifyMeshCreated(physicsScene, newShape, prim);
+ BulletShape newShape = retMesh.CreatePhysicalMesh(physicsScene, prim, newMeshKey, prim.BaseShape, prim.Size, lod);
- retMesh = new BSShapeMesh(newShape);
+ // Check to see if mesh was created (might require an asset).
+ newShape = BSShapeCollection.VerifyMeshCreated(physicsScene, newShape, prim);
+ if (newShape.type == BSPhysicsShapeType.SHAPE_MESH)
+ {
+ // If a mesh was what was created, remember the built shape for later sharing.
+ Meshes.Add(newMeshKey, retMesh);
+ }
- Meshes.Add(newMeshKey, retMesh);
+ retMesh.physShapeInfo = newShape;
}
}
return retMesh;
@@ -252,8 +258,28 @@ public class BSShapeMesh : BSShape
// TODO: schedule aging and destruction of unused meshes.
}
}
+ // Loop through all the known meshes and return the description based on the physical address.
+ public static bool TryGetMeshByPtr(BulletShape pShape, out BSShapeMesh outMesh)
+ {
+ bool ret = false;
+ BSShapeMesh foundDesc = null;
+ lock (Meshes)
+ {
+ foreach (BSShapeMesh sm in Meshes.Values)
+ {
+ if (sm.physShapeInfo.ReferenceSame(pShape))
+ {
+ foundDesc = sm;
+ ret = true;
+ break;
+ }
- private static BulletShape CreatePhysicalMesh(BSScene physicsScene, BSPhysObject prim, System.UInt64 newMeshKey,
+ }
+ }
+ outMesh = foundDesc;
+ return ret;
+ }
+ private BulletShape CreatePhysicalMesh(BSScene physicsScene, BSPhysObject prim, System.UInt64 newMeshKey,
PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
{
BulletShape newShape = null;
@@ -326,32 +352,301 @@ public class BSShapeMesh : BSShape
public class BSShapeHull : BSShape
{
private static string LogHeader = "[BULLETSIM SHAPE HULL]";
- private static Dictionary Hulls = new Dictionary();
+ public static Dictionary Hulls = new Dictionary();
public BSShapeHull(BulletShape pShape) : base(pShape)
{
}
public static BSShape GetReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
{
- return new BSShapeNull();
+ float lod;
+ System.UInt64 newHullKey = BSShapeCollection.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
+
+ physicsScene.DetailLog("{0},BSShapeHull,getReference,oldKey={1},newKey={2},size={3},lod={4}",
+ prim.LocalID, prim.PhysShape.shapeKey.ToString("X"), newHullKey.ToString("X"), prim.Size, lod);
+
+ BSShapeHull retHull = new BSShapeHull(new BulletShape());
+ lock (Hulls)
+ {
+ if (Hulls.TryGetValue(newHullKey, out retHull))
+ {
+ // The mesh has already been created. Return a new reference to same.
+ retHull.IncrementReference();
+ }
+ else
+ {
+ // An instance of this mesh has not been created. Build and remember same.
+ BulletShape newShape = retHull.CreatePhysicalHull(physicsScene, prim, newHullKey, prim.BaseShape, prim.Size, lod);
+
+ // Check to see if mesh was created (might require an asset).
+ newShape = BSShapeCollection.VerifyMeshCreated(physicsScene, newShape, prim);
+ if (newShape.type == BSPhysicsShapeType.SHAPE_MESH)
+ {
+ // If a mesh was what was created, remember the built shape for later sharing.
+ Hulls.Add(newHullKey, retHull);
+ }
+
+ retHull = new BSShapeHull(newShape);
+ retHull.physShapeInfo = newShape;
+ }
+ }
+ return retHull;
}
public override void Dereference(BSScene physicsScene)
{
}
+ List m_hulls;
+ private BulletShape CreatePhysicalHull(BSScene physicsScene, BSPhysObject prim, System.UInt64 newHullKey,
+ PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
+ {
+ BulletShape newShape = new BulletShape();
+ IntPtr hullPtr = IntPtr.Zero;
+
+ if (BSParam.ShouldUseBulletHACD)
+ {
+ physicsScene.DetailLog("{0},BSShapeCollection.CreatePhysicalHull,shouldUseBulletHACD,entry", prim.LocalID);
+ BSShape meshShape = BSShapeMesh.GetReference(physicsScene, true, prim);
+
+ if (meshShape.physShapeInfo.HasPhysicalShape)
+ {
+ HACDParams parms;
+ parms.maxVerticesPerHull = BSParam.BHullMaxVerticesPerHull;
+ parms.minClusters = BSParam.BHullMinClusters;
+ parms.compacityWeight = BSParam.BHullCompacityWeight;
+ parms.volumeWeight = BSParam.BHullVolumeWeight;
+ parms.concavity = BSParam.BHullConcavity;
+ parms.addExtraDistPoints = BSParam.NumericBool(BSParam.BHullAddExtraDistPoints);
+ parms.addNeighboursDistPoints = BSParam.NumericBool(BSParam.BHullAddNeighboursDistPoints);
+ parms.addFacesPoints = BSParam.NumericBool(BSParam.BHullAddFacesPoints);
+ parms.shouldAdjustCollisionMargin = BSParam.NumericBool(BSParam.BHullShouldAdjustCollisionMargin);
+
+ physicsScene.DetailLog("{0},BSShapeCollection.CreatePhysicalHull,hullFromMesh,beforeCall", prim.LocalID, newShape.HasPhysicalShape);
+ newShape = physicsScene.PE.BuildHullShapeFromMesh(physicsScene.World, meshShape.physShapeInfo, parms);
+ physicsScene.DetailLog("{0},BSShapeCollection.CreatePhysicalHull,hullFromMesh,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
+ }
+ // Now done with the mesh shape.
+ meshShape.DecrementReference();
+ physicsScene.DetailLog("{0},BSShapeCollection.CreatePhysicalHull,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
+ }
+ if (!newShape.HasPhysicalShape)
+ {
+ // Build a new hull in the physical world.
+ // Pass true for physicalness as this prevents the creation of bounding box which is not needed
+ IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
+ if (meshData != null)
+ {
+ int[] indices = meshData.getIndexListAsInt();
+ List vertices = meshData.getVertexList();
+
+ //format conversion from IMesh format to DecompDesc format
+ List convIndices = new List();
+ List convVertices = new List();
+ for (int ii = 0; ii < indices.GetLength(0); ii++)
+ {
+ convIndices.Add(indices[ii]);
+ }
+ foreach (OMV.Vector3 vv in vertices)
+ {
+ convVertices.Add(new float3(vv.X, vv.Y, vv.Z));
+ }
+
+ uint maxDepthSplit = (uint)BSParam.CSHullMaxDepthSplit;
+ if (BSParam.CSHullMaxDepthSplit != BSParam.CSHullMaxDepthSplitForSimpleShapes)
+ {
+ // Simple primitive shapes we know are convex so they are better implemented with
+ // fewer hulls.
+ // Check for simple shape (prim without cuts) and reduce split parameter if so.
+ if (BSShapeCollection.PrimHasNoCuts(pbs))
+ {
+ maxDepthSplit = (uint)BSParam.CSHullMaxDepthSplitForSimpleShapes;
+ }
+ }
+
+ // setup and do convex hull conversion
+ m_hulls = new List();
+ DecompDesc dcomp = new DecompDesc();
+ dcomp.mIndices = convIndices;
+ dcomp.mVertices = convVertices;
+ dcomp.mDepth = maxDepthSplit;
+ dcomp.mCpercent = BSParam.CSHullConcavityThresholdPercent;
+ dcomp.mPpercent = BSParam.CSHullVolumeConservationThresholdPercent;
+ dcomp.mMaxVertices = (uint)BSParam.CSHullMaxVertices;
+ dcomp.mSkinWidth = BSParam.CSHullMaxSkinWidth;
+ ConvexBuilder convexBuilder = new ConvexBuilder(HullReturn);
+ // create the hull into the _hulls variable
+ convexBuilder.process(dcomp);
+
+ physicsScene.DetailLog("{0},BSShapeCollection.CreatePhysicalHull,key={1},inVert={2},inInd={3},split={4},hulls={5}",
+ BSScene.DetailLogZero, newHullKey, indices.GetLength(0), vertices.Count, maxDepthSplit, m_hulls.Count);
+
+ // Convert the vertices and indices for passing to unmanaged.
+ // The hull information is passed as a large floating point array.
+ // The format is:
+ // convHulls[0] = number of hulls
+ // convHulls[1] = number of vertices in first hull
+ // convHulls[2] = hull centroid X coordinate
+ // convHulls[3] = hull centroid Y coordinate
+ // convHulls[4] = hull centroid Z coordinate
+ // convHulls[5] = first hull vertex X
+ // convHulls[6] = first hull vertex Y
+ // convHulls[7] = first hull vertex Z
+ // convHulls[8] = second hull vertex X
+ // ...
+ // convHulls[n] = number of vertices in second hull
+ // convHulls[n+1] = second hull centroid X coordinate
+ // ...
+ //
+ // TODO: is is very inefficient. Someday change the convex hull generator to return
+ // data structures that do not need to be converted in order to pass to Bullet.
+ // And maybe put the values directly into pinned memory rather than marshaling.
+ int hullCount = m_hulls.Count;
+ int totalVertices = 1; // include one for the count of the hulls
+ foreach (ConvexResult cr in m_hulls)
+ {
+ totalVertices += 4; // add four for the vertex count and centroid
+ totalVertices += cr.HullIndices.Count * 3; // we pass just triangles
+ }
+ float[] convHulls = new float[totalVertices];
+
+ convHulls[0] = (float)hullCount;
+ int jj = 1;
+ foreach (ConvexResult cr in m_hulls)
+ {
+ // copy vertices for index access
+ float3[] verts = new float3[cr.HullVertices.Count];
+ int kk = 0;
+ foreach (float3 ff in cr.HullVertices)
+ {
+ verts[kk++] = ff;
+ }
+
+ // add to the array one hull's worth of data
+ convHulls[jj++] = cr.HullIndices.Count;
+ convHulls[jj++] = 0f; // centroid x,y,z
+ convHulls[jj++] = 0f;
+ convHulls[jj++] = 0f;
+ foreach (int ind in cr.HullIndices)
+ {
+ convHulls[jj++] = verts[ind].x;
+ convHulls[jj++] = verts[ind].y;
+ convHulls[jj++] = verts[ind].z;
+ }
+ }
+ // create the hull data structure in Bullet
+ newShape = physicsScene.PE.CreateHullShape(physicsScene.World, hullCount, convHulls);
+ }
+ newShape.shapeKey = newHullKey;
+ }
+ return newShape;
+ }
+ // Callback from convex hull creater with a newly created hull.
+ // Just add it to our collection of hulls for this shape.
+ private void HullReturn(ConvexResult result)
+ {
+ m_hulls.Add(result);
+ return;
+ }
+ // Loop through all the known hulls and return the description based on the physical address.
+ public static bool TryGetHullByPtr(BulletShape pShape, out BSShapeHull outHull)
+ {
+ bool ret = false;
+ BSShapeHull foundDesc = null;
+ lock (Hulls)
+ {
+ foreach (BSShapeHull sh in Hulls.Values)
+ {
+ if (sh.physShapeInfo.ReferenceSame(pShape))
+ {
+ foundDesc = sh;
+ ret = true;
+ break;
+ }
+
+ }
+ }
+ outHull = foundDesc;
+ return ret;
+ }
}
+
// ============================================================================================================
public class BSShapeCompound : BSShape
{
private static string LogHeader = "[BULLETSIM SHAPE COMPOUND]";
- public BSShapeCompound() : base()
+ public BSShapeCompound(BulletShape pShape) : base(pShape)
{
}
- public static BSShape GetReference(BSPhysObject prim)
+ public static BSShape GetReference(BSScene physicsScene, BSPhysObject prim)
{
- return new BSShapeNull();
+ // Compound shapes are not shared so a new one is created every time.
+ return new BSShapeCompound(CreatePhysicalCompoundShape(physicsScene, prim));
+ }
+ // Dereferencing a compound shape releases the hold on all the child shapes.
+ public override void Dereference(BSScene physicsScene)
+ {
+ if (!physicsScene.PE.IsCompound(physShapeInfo))
+ {
+ // Failed the sanity check!!
+ physicsScene.Logger.ErrorFormat("{0} Attempt to free a compound shape that is not compound!! type={1}, ptr={2}",
+ LogHeader, physShapeInfo.type, physShapeInfo.AddrString);
+ physicsScene.DetailLog("{0},BSShapeCollection.DereferenceCompound,notACompoundShape,type={1},ptr={2}",
+ BSScene.DetailLogZero, physShapeInfo.type, physShapeInfo.AddrString);
+ return;
+ }
+
+ int numChildren = physicsScene.PE.GetNumberOfCompoundChildren(physShapeInfo);
+ physicsScene.DetailLog("{0},BSShapeCollection.DereferenceCompound,shape={1},children={2}",
+ BSScene.DetailLogZero, physShapeInfo, numChildren);
+
+ // Loop through all the children dereferencing each.
+ for (int ii = numChildren - 1; ii >= 0; ii--)
+ {
+ BulletShape childShape = physicsScene.PE.RemoveChildShapeFromCompoundShapeIndex(physShapeInfo, ii);
+ DereferenceAnonCollisionShape(physicsScene, childShape);
+ }
+ physicsScene.PE.DeleteCollisionShape(physicsScene.World, physShapeInfo);
+ }
+ private static BulletShape CreatePhysicalCompoundShape(BSScene physicsScene, BSPhysObject prim)
+ {
+ BulletShape cShape = physicsScene.PE.CreateCompoundShape(physicsScene.World, false);
+ return cShape;
+ }
+ // Sometimes we have a pointer to a collision shape but don't know what type it is.
+ // Figure out type and call the correct dereference routine.
+ // Called at taint-time.
+ private void DereferenceAnonCollisionShape(BSScene physicsScene, BulletShape pShape)
+ {
+ BSShapeMesh meshDesc;
+ if (BSShapeMesh.TryGetMeshByPtr(pShape, out meshDesc))
+ {
+ meshDesc.Dereference(physicsScene);
+ }
+ else
+ {
+ BSShapeHull hullDesc;
+ if (BSShapeHull.TryGetHullByPtr(pShape, out hullDesc))
+ {
+ hullDesc.Dereference(physicsScene);
+ }
+ else
+ {
+ if (physicsScene.PE.IsCompound(pShape))
+ {
+ BSShapeCompound recursiveCompound = new BSShapeCompound(pShape);
+ recursiveCompound.Dereference(physicsScene);
+ }
+ else
+ {
+ if (physicsScene.PE.IsNativeShape(pShape))
+ {
+ BSShapeNative nativeShape = new BSShapeNative(pShape);
+ nativeShape.Dereference(physicsScene);
+ }
+ }
+ }
+ }
}
- public override void Dereference(BSScene physicsScene) { }
}
// ============================================================================================================
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
index 1284ae7..c67081a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
@@ -11,6 +11,8 @@ Deleting a linkset while standing on the root will leave the physical shape of t
Linkset child rotations.
Nebadon spiral tube has middle sections which are rotated wrong.
Select linked spiral tube. Delink and note where the middle section ends up.
+Refarb compound linkset creation to create a pseudo-root for center-of-mass
+ Let children change their shape to physical indendently and just add shapes to compound
Vehicle angular vertical attraction
vehicle angular banking
Center-of-gravity
@@ -27,14 +29,13 @@ llLookAt
Avatars walking up stairs (HALF DONE)
Avatar movement
flying into a wall doesn't stop avatar who keeps appearing to move through the obstacle (DONE)
- walking up stairs is not calibrated correctly (stairs out of Kepler cabin)
+ walking up stairs is not calibrated correctly (stairs out of Kepler cabin) (DONE)
avatar capsule rotation completed (NOT DONE - Bullet's capsule shape is not the solution)
Vehicle script tuning/debugging
Avanti speed script
Weapon shooter script
Move material definitions (friction, ...) into simulator.
Add material densities to the material types.
-Terrain detail: double terrain mesh detail
One sided meshes? Should terrain be built into a closed shape?
When meshes get partially wedged into the terrain, they cannot push themselves out.
It is possible that Bullet processes collisions whether entering or leaving a mesh.
@@ -347,4 +348,5 @@ Angular motion around Z moves the vehicle in world Z and not vehicle Z in ODE.
DONE 20130120: BulletSim properly applies force in vehicle relative coordinates.
Nebadon vehicles turning funny in arena (DONE)
Lock axis (DONE 20130401)
+Terrain detail: double terrain mesh detail (DONE)
--
cgit v1.1
From e5582939fd8d78b61c6f1eeda6de45d94f4b4926 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 28 Apr 2013 14:44:21 -0700
Subject: BulletSim: massive refactor of shape classes. Removed shape specific
code from BSShapeCollection. Using BSShape* classes to hold references to
shape. Simplified shape dependency callbacks. Remove 'PreferredShape' methods
and have each class specify shape type. Disable compound shape linkset for a
later commit that will simplify linkset implementation.
---
OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs | 6 +-
OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | 4 +-
.../Physics/BulletSPlugin/BSActorAvatarMove.cs | 4 +-
.../Region/Physics/BulletSPlugin/BSActorHover.cs | 4 +-
.../Physics/BulletSPlugin/BSActorLockAxis.cs | 4 +-
.../Physics/BulletSPlugin/BSActorMoveToTarget.cs | 4 +-
.../Physics/BulletSPlugin/BSActorSetForce.cs | 4 +-
.../Physics/BulletSPlugin/BSActorSetTorque.cs | 4 +-
OpenSim/Region/Physics/BulletSPlugin/BSActors.cs | 6 +-
.../Region/Physics/BulletSPlugin/BSCharacter.cs | 19 +-
OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 4 +-
OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 9 +-
.../Physics/BulletSPlugin/BSLinksetCompound.cs | 35 +-
.../Physics/BulletSPlugin/BSLinksetConstraints.cs | 4 +-
.../Region/Physics/BulletSPlugin/BSPhysObject.cs | 11 +-
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 34 +-
.../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 9 +-
.../Physics/BulletSPlugin/BSShapeCollection.cs | 966 ++-------------------
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 203 +++--
.../Region/Physics/BulletSPlugin/BulletSimData.cs | 6 +-
20 files changed, 290 insertions(+), 1050 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
index fdf2cb9..8a22bc7 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
@@ -79,7 +79,7 @@ private sealed class BulletShapeUnman : BulletShape
: base()
{
ptr = xx;
- type = typ;
+ shapeType = typ;
}
public override bool HasPhysicalShape
{
@@ -91,7 +91,7 @@ private sealed class BulletShapeUnman : BulletShape
}
public override BulletShape Clone()
{
- return new BulletShapeUnman(ptr, type);
+ return new BulletShapeUnman(ptr, shapeType);
}
public override bool ReferenceSame(BulletShape other)
{
@@ -375,7 +375,7 @@ public override BulletShape DuplicateCollisionShape(BulletWorld world, BulletSha
{
BulletWorldUnman worldu = world as BulletWorldUnman;
BulletShapeUnman srcShapeu = srcShape as BulletShapeUnman;
- return new BulletShapeUnman(BSAPICPP.DuplicateCollisionShape2(worldu.ptr, srcShapeu.ptr, id), srcShape.type);
+ return new BulletShapeUnman(BSAPICPP.DuplicateCollisionShape2(worldu.ptr, srcShapeu.ptr, id), srcShape.shapeType);
}
public override bool DeleteCollisionShape(BulletWorld world, BulletShape shape)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
index b37265a..1ef8b17 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
@@ -85,7 +85,7 @@ private sealed class BulletShapeXNA : BulletShape
: base()
{
shape = xx;
- type = typ;
+ shapeType = typ;
}
public override bool HasPhysicalShape
{
@@ -97,7 +97,7 @@ private sealed class BulletShapeXNA : BulletShape
}
public override BulletShape Clone()
{
- return new BulletShapeXNA(shape, type);
+ return new BulletShapeXNA(shape, shapeType);
}
public override bool ReferenceSame(BulletShape other)
{
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index bd5ee0b1..ac05979 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -87,8 +87,8 @@ public class BSActorAvatarMove : BSActor
// The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
// Register a prestep action to restore physical requirements before the next simulation step.
// Called at taint-time.
- // BSActor.RemoveBodyDependencies()
- public override void RemoveBodyDependencies()
+ // BSActor.RemoveDependencies()
+ public override void RemoveDependencies()
{
// Nothing to do for the hoverer since it is all software at pre-step action time.
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
index 92ace66..3630ca8 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
@@ -87,8 +87,8 @@ public class BSActorHover : BSActor
// The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
// Register a prestep action to restore physical requirements before the next simulation step.
// Called at taint-time.
- // BSActor.RemoveBodyDependencies()
- public override void RemoveBodyDependencies()
+ // BSActor.RemoveDependencies()
+ public override void RemoveDependencies()
{
// Nothing to do for the hoverer since it is all software at pre-step action time.
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
index 09ee32b..6059af5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
@@ -85,8 +85,8 @@ public class BSActorLockAxis : BSActor
// The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
// Register a prestep action to restore physical requirements before the next simulation step.
// Called at taint-time.
- // BSActor.RemoveBodyDependencies()
- public override void RemoveBodyDependencies()
+ // BSActor.RemoveDependencies()
+ public override void RemoveDependencies()
{
if (LockAxisConstraint != null)
{
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
index 56aacc5..1b598fd 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
@@ -88,8 +88,8 @@ public class BSActorMoveToTarget : BSActor
// The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
// Register a prestep action to restore physical requirements before the next simulation step.
// Called at taint-time.
- // BSActor.RemoveBodyDependencies()
- public override void RemoveBodyDependencies()
+ // BSActor.RemoveDependencies()
+ public override void RemoveDependencies()
{
// Nothing to do for the moveToTarget since it is all software at pre-step action time.
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
index 3ad138d..c0f40fd 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
@@ -89,8 +89,8 @@ public class BSActorSetForce : BSActor
// The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
// Register a prestep action to restore physical requirements before the next simulation step.
// Called at taint-time.
- // BSActor.RemoveBodyDependencies()
- public override void RemoveBodyDependencies()
+ // BSActor.RemoveDependencies()
+ public override void RemoveDependencies()
{
// Nothing to do for the hoverer since it is all software at pre-step action time.
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
index 7a791ec..b3806e1 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
@@ -89,8 +89,8 @@ public class BSActorSetTorque : BSActor
// The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
// Register a prestep action to restore physical requirements before the next simulation step.
// Called at taint-time.
- // BSActor.RemoveBodyDependencies()
- public override void RemoveBodyDependencies()
+ // BSActor.RemoveDependencies()
+ public override void RemoveDependencies()
{
// Nothing to do for the hoverer since it is all software at pre-step action time.
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
index 12a8817..5e3f1c4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
@@ -106,9 +106,9 @@ public class BSActorCollection
{
ForEachActor(a => a.Refresh());
}
- public void RemoveBodyDependencies()
+ public void RemoveDependencies()
{
- ForEachActor(a => a.RemoveBodyDependencies());
+ ForEachActor(a => a.RemoveDependencies());
}
}
@@ -154,7 +154,7 @@ public abstract class BSActor
public abstract void Refresh();
// The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
// Register a prestep action to restore physical requirements before the next simulation step.
- public abstract void RemoveBodyDependencies();
+ public abstract void RemoveDependencies();
}
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index a0d58d3..da23a262 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -123,8 +123,8 @@ public sealed class BSCharacter : BSPhysObject
{
PhysicsScene.Shapes.DereferenceBody(PhysBody, null /* bodyCallback */);
PhysBody.Clear();
- PhysicsScene.Shapes.DereferenceShape(PhysShape, null /* bodyCallback */);
- PhysShape.Clear();
+ PhysShape.Dereference(PhysicsScene);
+ PhysShape = new BSShapeNull();
});
}
@@ -146,8 +146,8 @@ public sealed class BSCharacter : BSPhysObject
Flying = _flying;
PhysicsScene.PE.SetRestitution(PhysBody, BSParam.AvatarRestitution);
- PhysicsScene.PE.SetMargin(PhysShape, PhysicsScene.Params.collisionMargin);
- PhysicsScene.PE.SetLocalScaling(PhysShape, Scale);
+ PhysicsScene.PE.SetMargin(PhysShape.physShapeInfo, PhysicsScene.Params.collisionMargin);
+ PhysicsScene.PE.SetLocalScaling(PhysShape.physShapeInfo, Scale);
PhysicsScene.PE.SetContactProcessingThreshold(PhysBody, BSParam.ContactProcessingThreshold);
if (BSParam.CcdMotionThreshold > 0f)
{
@@ -205,9 +205,9 @@ public sealed class BSCharacter : BSPhysObject
PhysicsScene.TaintedObject("BSCharacter.setSize", delegate()
{
- if (PhysBody.HasPhysicalBody && PhysShape.HasPhysicalShape)
+ if (PhysBody.HasPhysicalBody && PhysShape.physShapeInfo.HasPhysicalShape)
{
- PhysicsScene.PE.SetLocalScaling(PhysShape, Scale);
+ PhysicsScene.PE.SetLocalScaling(PhysShape.physShapeInfo, Scale);
UpdatePhysicalMassProperties(RawMass, true);
// Make sure this change appears as a property update event
PhysicsScene.PE.PushUpdate(PhysBody);
@@ -221,11 +221,6 @@ public sealed class BSCharacter : BSPhysObject
{
set { BaseShape = value; }
}
- // I want the physics engine to make an avatar capsule
- public override BSPhysicsShapeType PreferredPhysicalShape
- {
- get {return BSPhysicsShapeType.SHAPE_CAPSULE; }
- }
public override bool Grabbed {
set { _grabbed = value; }
@@ -381,7 +376,7 @@ public sealed class BSCharacter : BSPhysObject
}
public override void UpdatePhysicalMassProperties(float physMass, bool inWorld)
{
- OMV.Vector3 localInertia = PhysicsScene.PE.CalculateLocalInertia(PhysShape, physMass);
+ OMV.Vector3 localInertia = PhysicsScene.PE.CalculateLocalInertia(PhysShape.physShapeInfo, physMass);
PhysicsScene.PE.SetMassProps(PhysBody, physMass, localInertia);
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 612c68b..e2e807e 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -625,7 +625,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
// Vehicles report collision events so we know when it's on the ground
m_physicsScene.PE.AddToCollisionFlags(ControllingPrim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
- ControllingPrim.Inertia = m_physicsScene.PE.CalculateLocalInertia(ControllingPrim.PhysShape, m_vehicleMass);
+ ControllingPrim.Inertia = m_physicsScene.PE.CalculateLocalInertia(ControllingPrim.PhysShape.physShapeInfo, m_vehicleMass);
m_physicsScene.PE.SetMassProps(ControllingPrim.PhysBody, m_vehicleMass, ControllingPrim.Inertia);
m_physicsScene.PE.UpdateInertiaTensor(ControllingPrim.PhysBody);
@@ -649,7 +649,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
}
// BSActor.RemoveBodyDependencies
- public override void RemoveBodyDependencies()
+ public override void RemoveDependencies()
{
Refresh();
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 4ece1eb..df1dd34 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -93,13 +93,6 @@ public abstract class BSLinkset
// to the physical representation is done via the tainting mechenism.
protected object m_linksetActivityLock = new Object();
- // Some linksets have a preferred physical shape.
- // Returns SHAPE_UNKNOWN if there is no preference. Causes the correct shape to be selected.
- public virtual BSPhysicsShapeType PreferredPhysicalShape(BSPrimLinkable requestor)
- {
- return BSPhysicsShapeType.SHAPE_UNKNOWN;
- }
-
// We keep the prim's mass in the linkset structure since it could be dependent on other prims
public float LinksetMass { get; protected set; }
@@ -263,7 +256,7 @@ public abstract class BSLinkset
// This is called when the root body is changing.
// Returns 'true' of something was actually removed and would need restoring
// Called at taint-time!!
- public abstract bool RemoveBodyDependencies(BSPrimLinkable child);
+ public abstract bool RemoveDependencies(BSPrimLinkable child);
// ================================================================
protected virtual float ComputeLinksetMass()
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index e05562a..a20bbc3 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -98,19 +98,6 @@ public sealed class BSLinksetCompound : BSLinkset
{
}
- // For compound implimented linksets, if there are children, use compound shape for the root.
- public override BSPhysicsShapeType PreferredPhysicalShape(BSPrimLinkable requestor)
- {
- // Returning 'unknown' means we don't have a preference.
- BSPhysicsShapeType ret = BSPhysicsShapeType.SHAPE_UNKNOWN;
- if (IsRoot(requestor) && HasAnyChildren)
- {
- ret = BSPhysicsShapeType.SHAPE_COMPOUND;
- }
- // DetailLog("{0},BSLinksetCompound.PreferredPhysicalShape,call,shape={1}", LinksetRoot.LocalID, ret);
- return ret;
- }
-
// When physical properties are changed the linkset needs to recalculate
// its internal properties.
public override void Refresh(BSPrimLinkable requestor)
@@ -218,22 +205,22 @@ public sealed class BSLinksetCompound : BSLinkset
// and that is caused by us updating the object.
if ((whichUpdated & ~(UpdatedProperties.Position | UpdatedProperties.Orientation)) == 0)
{
- // Find the physical instance of the child
- if (LinksetRoot.PhysShape.HasPhysicalShape && PhysicsScene.PE.IsCompound(LinksetRoot.PhysShape))
+ // Find the physical instance of the child
+ if (LinksetRoot.PhysShape.HasPhysicalShape && PhysicsScene.PE.IsCompound(LinksetRoot.PhysShape.physShapeInfo))
{
// It is possible that the linkset is still under construction and the child is not yet
// inserted into the compound shape. A rebuild of the linkset in a pre-step action will
// build the whole thing with the new position or rotation.
// The index must be checked because Bullet references the child array but does no validity
// checking of the child index passed.
- int numLinksetChildren = PhysicsScene.PE.GetNumberOfCompoundChildren(LinksetRoot.PhysShape);
+ int numLinksetChildren = PhysicsScene.PE.GetNumberOfCompoundChildren(LinksetRoot.PhysShape.physShapeInfo);
if (updated.LinksetChildIndex < numLinksetChildren)
{
- BulletShape linksetChildShape = PhysicsScene.PE.GetChildShapeFromCompoundShapeIndex(LinksetRoot.PhysShape, updated.LinksetChildIndex);
+ BulletShape linksetChildShape = PhysicsScene.PE.GetChildShapeFromCompoundShapeIndex(LinksetRoot.PhysShape.physShapeInfo, updated.LinksetChildIndex);
if (linksetChildShape.HasPhysicalShape)
{
// Found the child shape within the compound shape
- PhysicsScene.PE.UpdateChildTransform(LinksetRoot.PhysShape, updated.LinksetChildIndex,
+ PhysicsScene.PE.UpdateChildTransform(LinksetRoot.PhysShape.physShapeInfo, updated.LinksetChildIndex,
updated.RawPosition - LinksetRoot.RawPosition,
updated.RawOrientation * OMV.Quaternion.Inverse(LinksetRoot.RawOrientation),
true /* shouldRecalculateLocalAabb */);
@@ -278,7 +265,7 @@ public sealed class BSLinksetCompound : BSLinkset
// Since we don't keep in world relationships, do nothing unless it's a child changing.
// Returns 'true' of something was actually removed and would need restoring
// Called at taint-time!!
- public override bool RemoveBodyDependencies(BSPrimLinkable child)
+ public override bool RemoveDependencies(BSPrimLinkable child)
{
bool ret = false;
@@ -404,11 +391,12 @@ public sealed class BSLinksetCompound : BSLinkset
{
try
{
+ /*
// Suppress rebuilding while rebuilding. (We know rebuilding is on only one thread.)
Rebuilding = true;
// Cause the root shape to be rebuilt as a compound object with just the root in it
- LinksetRoot.ForceBodyShapeRebuild(true /* inTaintTime */);
+ LinksetRoot.ForceBodyShapeRebuild(true /* inTaintTime );
// The center of mass for the linkset is the geometric center of the group.
// Compute a displacement for each component so it is relative to the center-of-mass.
@@ -430,10 +418,10 @@ public sealed class BSLinksetCompound : BSLinkset
LinksetRoot.ForcePosition = LinksetRoot.RawPosition;
// Update the local transform for the root child shape so it is offset from the <0,0,0> which is COM
- PhysicsScene.PE.UpdateChildTransform(LinksetRoot.PhysShape, 0 /* childIndex */,
+ PhysicsScene.PE.UpdateChildTransform(LinksetRoot.PhysShape.physShapeInfo, 0 /* childIndex ,
-centerDisplacement,
OMV.Quaternion.Identity, // LinksetRoot.RawOrientation,
- false /* shouldRecalculateLocalAabb (is done later after linkset built) */);
+ false /* shouldRecalculateLocalAabb (is done later after linkset built) );
DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,COM,com={1},rootPos={2},centerDisp={3}",
LinksetRoot.LocalID, centerOfMassW, LinksetRoot.RawPosition, centerDisplacement);
@@ -501,6 +489,7 @@ public sealed class BSLinksetCompound : BSLinkset
// Enable the physical position updator to return the position and rotation of the root shape
PhysicsScene.PE.AddToCollisionFlags(LinksetRoot.PhysBody, CollisionFlags.BS_RETURN_ROOT_COMPOUND_SHAPE);
+ */
}
finally
{
@@ -508,7 +497,7 @@ public sealed class BSLinksetCompound : BSLinkset
}
// See that the Aabb surrounds the new shape
- PhysicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetRoot.PhysShape);
+ PhysicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetRoot.PhysShape.physShapeInfo);
}
}
}
\ No newline at end of file
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index 6d252ca..1811772 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -93,11 +93,11 @@ public sealed class BSLinksetConstraints : BSLinkset
// up to rebuild the constraints before the next simulation step.
// Returns 'true' of something was actually removed and would need restoring
// Called at taint-time!!
- public override bool RemoveBodyDependencies(BSPrimLinkable child)
+ public override bool RemoveDependencies(BSPrimLinkable child)
{
bool ret = false;
- DetailLog("{0},BSLinksetConstraint.RemoveBodyDependencies,removeChildrenForRoot,rID={1},rBody={2}",
+ DetailLog("{0},BSLinksetConstraint.RemoveDependencies,removeChildrenForRoot,rID={1},rBody={2}",
child.LocalID, LinksetRoot.LocalID, LinksetRoot.PhysBody.AddrString);
lock (m_linksetActivityLock)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 309d004..b6eb619 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -88,7 +88,7 @@ public abstract class BSPhysObject : PhysicsActor
// We don't have any physical representation yet.
PhysBody = new BulletBody(localID);
- PhysShape = new BulletShape();
+ PhysShape = new BSShapeNull();
PrimAssetState = PrimAssetCondition.Unknown;
@@ -138,7 +138,7 @@ public abstract class BSPhysObject : PhysicsActor
// Reference to the physical body (btCollisionObject) of this object
public BulletBody PhysBody;
// Reference to the physical shape (btCollisionShape) of this object
- public BulletShape PhysShape;
+ public BSShape PhysShape;
// The physical representation of the prim might require an asset fetch.
// The asset state is first 'Unknown' then 'Waiting' then either 'Failed' or 'Fetched'.
@@ -151,13 +151,6 @@ public abstract class BSPhysObject : PhysicsActor
// The objects base shape information. Null if not a prim type shape.
public PrimitiveBaseShape BaseShape { get; protected set; }
- // Some types of objects have preferred physical representations.
- // Returns SHAPE_UNKNOWN if there is no preference.
- public virtual BSPhysicsShapeType PreferredPhysicalShape
- {
- get { return BSPhysicsShapeType.SHAPE_UNKNOWN; }
- }
-
// When the physical properties are updated, an EntityProperty holds the update values.
// Keep the current and last EntityProperties to enable computation of differences
// between the current update and the previous values.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 4bc266b..5d12338 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -134,8 +134,8 @@ public class BSPrim : BSPhysObject
// If there are physical body and shape, release my use of same.
PhysicsScene.Shapes.DereferenceBody(PhysBody, null);
PhysBody.Clear();
- PhysicsScene.Shapes.DereferenceShape(PhysShape, null);
- PhysShape.Clear();
+ PhysShape.Dereference(PhysicsScene);
+ PhysShape = new BSShapeNull();
});
}
@@ -161,25 +161,13 @@ public class BSPrim : BSPhysObject
ForceBodyShapeRebuild(false);
}
}
- // 'unknown' says to choose the best type
- public override BSPhysicsShapeType PreferredPhysicalShape
- { get { return BSPhysicsShapeType.SHAPE_UNKNOWN; } }
-
public override bool ForceBodyShapeRebuild(bool inTaintTime)
{
- if (inTaintTime)
+ PhysicsScene.TaintedObject(inTaintTime, "BSPrim.ForceBodyShapeRebuild", delegate()
{
_mass = CalculateMass(); // changing the shape changes the mass
CreateGeomAndObject(true);
- }
- else
- {
- PhysicsScene.TaintedObject("BSPrim.ForceBodyShapeRebuild", delegate()
- {
- _mass = CalculateMass(); // changing the shape changes the mass
- CreateGeomAndObject(true);
- });
- }
+ });
return true;
}
public override bool Grabbed {
@@ -462,7 +450,7 @@ public class BSPrim : BSPhysObject
Gravity = ComputeGravity(Buoyancy);
PhysicsScene.PE.SetGravity(PhysBody, Gravity);
- Inertia = PhysicsScene.PE.CalculateLocalInertia(PhysShape, physMass);
+ Inertia = PhysicsScene.PE.CalculateLocalInertia(PhysShape.physShapeInfo, physMass);
PhysicsScene.PE.SetMassProps(PhysBody, physMass, Inertia);
PhysicsScene.PE.UpdateInertiaTensor(PhysBody);
@@ -805,7 +793,8 @@ public class BSPrim : BSPhysObject
PhysicsScene.PE.UpdateSingleAabb(PhysicsScene.World, PhysBody);
DetailLog("{0},BSPrim.UpdatePhysicalParameters,taintExit,static={1},solid={2},mass={3},collide={4},cf={5:X},cType={6},body={7},shape={8}",
- LocalID, IsStatic, IsSolid, Mass, SubscribedEvents(), CurrentCollisionFlags, PhysBody.collisionType, PhysBody, PhysShape);
+ LocalID, IsStatic, IsSolid, Mass, SubscribedEvents(),
+ CurrentCollisionFlags, PhysBody.collisionType, PhysBody, PhysShape);
}
// "Making dynamic" means changing to and from static.
@@ -1463,12 +1452,13 @@ public class BSPrim : BSPhysObject
// Create the correct physical representation for this type of object.
// Updates base.PhysBody and base.PhysShape with the new information.
// Ignore 'forceRebuild'. 'GetBodyAndShape' makes the right choices and changes of necessary.
- PhysicsScene.Shapes.GetBodyAndShape(false /*forceRebuild */, PhysicsScene.World, this, null, delegate(BulletBody dBody)
+ PhysicsScene.Shapes.GetBodyAndShape(false /*forceRebuild */, PhysicsScene.World, this, delegate(BulletBody pBody, BulletShape pShape)
{
// Called if the current prim body is about to be destroyed.
// Remove all the physical dependencies on the old body.
// (Maybe someday make the changing of BSShape an event to be subscribed to by BSLinkset, ...)
- RemoveBodyDependencies();
+ // Note: this virtual function is overloaded by BSPrimLinkable to remove linkset constraints.
+ RemoveDependencies();
});
// Make sure the properties are set on the new object
@@ -1477,9 +1467,9 @@ public class BSPrim : BSPhysObject
}
// Called at taint-time
- protected virtual void RemoveBodyDependencies()
+ protected virtual void RemoveDependencies()
{
- PhysicalActors.RemoveBodyDependencies();
+ PhysicalActors.RemoveDependencies();
}
// The physics engine says that properties have updated. Update same and inform
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 28242d4..81104ec 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -61,9 +61,6 @@ public class BSPrimLinkable : BSPrimDisplaced
base.Destroy();
}
- public override BSPhysicsShapeType PreferredPhysicalShape
- { get { return Linkset.PreferredPhysicalShape(this); } }
-
public override void link(Manager.PhysicsActor obj)
{
BSPrimLinkable parent = obj as BSPrimLinkable;
@@ -149,10 +146,10 @@ public class BSPrimLinkable : BSPrimDisplaced
}
// Body is being taken apart. Remove physical dependencies and schedule a rebuild.
- protected override void RemoveBodyDependencies()
+ protected override void RemoveDependencies()
{
- Linkset.RemoveBodyDependencies(this);
- base.RemoveBodyDependencies();
+ Linkset.RemoveDependencies(this);
+ base.RemoveDependencies();
}
public override void UpdateProperties(EntityProperties entprop)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 0f9b3c3..3c23509 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -38,38 +38,15 @@ public sealed class BSShapeCollection : IDisposable
{
private static string LogHeader = "[BULLETSIM SHAPE COLLECTION]";
- private BSScene PhysicsScene { get; set; }
+ private BSScene m_physicsScene { get; set; }
private Object m_collectionActivityLock = new Object();
- // Description of a Mesh
- private struct MeshDesc
- {
- public BulletShape shape;
- public int referenceCount;
- public DateTime lastReferenced;
- public UInt64 shapeKey;
- }
-
- // Description of a hull.
- // Meshes and hulls have the same shape hash key but we only need hulls for efficient collision calculations.
- private struct HullDesc
- {
- public BulletShape shape;
- public int referenceCount;
- public DateTime lastReferenced;
- public UInt64 shapeKey;
- }
-
- // The sharable set of meshes and hulls. Indexed by their shape hash.
- private Dictionary Meshes = new Dictionary();
- private Dictionary Hulls = new Dictionary();
-
private bool DDetail = false;
public BSShapeCollection(BSScene physScene)
{
- PhysicsScene = physScene;
+ m_physicsScene = physScene;
// Set the next to 'true' for very detailed shape update detailed logging (detailed details?)
// While detailed debugging is still active, this is better than commenting out all the
// DetailLog statements. When debugging slows down, this and the protected logging
@@ -86,22 +63,18 @@ public sealed class BSShapeCollection : IDisposable
// Mostly used for changing bodies out from under Linksets.
// Useful for other cases where parameters need saving.
// Passing 'null' says no callback.
- public delegate void ShapeDestructionCallback(BulletShape shape);
- public delegate void BodyDestructionCallback(BulletBody body);
+ public delegate void PhysicalDestructionCallback(BulletBody pBody, BulletShape pShape);
// Called to update/change the body and shape for an object.
- // First checks the shape and updates that if necessary then makes
- // sure the body is of the right type.
+ // The object has some shape and body on it. Here we decide if that is the correct shape
+ // for the current state of the object (static/dynamic/...).
+ // If bodyCallback is not null, it is called if either the body or the shape are changed
+ // so dependencies (like constraints) can be removed before the physical object is dereferenced.
// Return 'true' if either the body or the shape changed.
- // 'shapeCallback' and 'bodyCallback' are, if non-null, functions called just before
- // the current shape or body is destroyed. This allows the caller to remove any
- // higher level dependencies on the shape or body. Mostly used for LinkSets to
- // remove the physical constraints before the body is destroyed.
- // Called at taint-time!!
- public bool GetBodyAndShape(bool forceRebuild, BulletWorld sim, BSPhysObject prim,
- ShapeDestructionCallback shapeCallback, BodyDestructionCallback bodyCallback)
+ // Called at taint-time.
+ public bool GetBodyAndShape(bool forceRebuild, BulletWorld sim, BSPhysObject prim, PhysicalDestructionCallback bodyCallback)
{
- PhysicsScene.AssertInTaintTime("BSShapeCollection.GetBodyAndShape");
+ m_physicsScene.AssertInTaintTime("BSShapeCollection.GetBodyAndShape");
bool ret = false;
@@ -111,12 +84,12 @@ public sealed class BSShapeCollection : IDisposable
// Do we have the correct geometry for this type of object?
// Updates prim.BSShape with information/pointers to shape.
// Returns 'true' of BSShape is changed to a new shape.
- bool newGeom = CreateGeom(forceRebuild, prim, shapeCallback);
+ bool newGeom = CreateGeom(forceRebuild, prim, bodyCallback);
// If we had to select a new shape geometry for the object,
// rebuild the body around it.
// Updates prim.BSBody with information/pointers to requested body
// Returns 'true' if BSBody was changed.
- bool newBody = CreateBody((newGeom || forceRebuild), prim, PhysicsScene.World, bodyCallback);
+ bool newBody = CreateBody((newGeom || forceRebuild), prim, m_physicsScene.World, bodyCallback);
ret = newGeom || newBody;
}
DetailLog("{0},BSShapeCollection.GetBodyAndShape,taintExit,force={1},ret={2},body={3},shape={4}",
@@ -127,271 +100,20 @@ public sealed class BSShapeCollection : IDisposable
public bool GetBodyAndShape(bool forceRebuild, BulletWorld sim, BSPhysObject prim)
{
- return GetBodyAndShape(forceRebuild, sim, prim, null, null);
- }
-
- // Track another user of a body.
- // We presume the caller has allocated the body.
- // Bodies only have one user so the body is just put into the world if not already there.
- private void ReferenceBody(BulletBody body)
- {
- lock (m_collectionActivityLock)
- {
- if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceBody,newBody,body={1}", body.ID, body);
- if (!PhysicsScene.PE.IsInWorld(PhysicsScene.World, body))
- {
- PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, body);
- if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceBody,addedToWorld,ref={1}", body.ID, body);
- }
- }
- }
-
- // Release the usage of a body.
- // Called when releasing use of a BSBody. BSShape is handled separately.
- // Called in taint time.
- public void DereferenceBody(BulletBody body, BodyDestructionCallback bodyCallback )
- {
- if (!body.HasPhysicalBody)
- return;
-
- PhysicsScene.AssertInTaintTime("BSShapeCollection.DereferenceBody");
-
- lock (m_collectionActivityLock)
- {
- if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceBody,DestroyingBody,body={1}", body.ID, body);
- // If the caller needs to know the old body is going away, pass the event up.
- if (bodyCallback != null) bodyCallback(body);
-
- // Removing an object not in the world is a NOOP
- PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, body);
-
- // Zero any reference to the shape so it is not freed when the body is deleted.
- PhysicsScene.PE.SetCollisionShape(PhysicsScene.World, body, null);
- PhysicsScene.PE.DestroyObject(PhysicsScene.World, body);
- }
- }
-
- // Track the datastructures and use count for a shape.
- // When creating a hull, this is called first to reference the mesh
- // and then again to reference the hull.
- // Meshes and hulls for the same shape have the same hash key.
- // NOTE that native shapes are not added to the mesh list or removed.
- // Returns 'true' if this is the initial reference to the shape. Otherwise reused.
- public bool ReferenceShape(BulletShape shape)
- {
- bool ret = false;
- switch (shape.type)
- {
- case BSPhysicsShapeType.SHAPE_MESH:
- MeshDesc meshDesc;
- if (Meshes.TryGetValue(shape.shapeKey, out meshDesc))
- {
- // There is an existing instance of this mesh.
- meshDesc.referenceCount++;
- if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceShape,existingMesh,key={1},cnt={2}",
- BSScene.DetailLogZero, shape.shapeKey.ToString("X"), meshDesc.referenceCount);
- }
- else
- {
- // This is a new reference to a mesh
- meshDesc.shape = shape.Clone();
- meshDesc.shapeKey = shape.shapeKey;
- // We keep a reference to the underlying IMesh data so a hull can be built
- meshDesc.referenceCount = 1;
- if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceShape,newMesh,key={1},cnt={2}",
- BSScene.DetailLogZero, shape.shapeKey.ToString("X"), meshDesc.referenceCount);
- ret = true;
- }
- meshDesc.lastReferenced = System.DateTime.Now;
- Meshes[shape.shapeKey] = meshDesc;
- break;
- case BSPhysicsShapeType.SHAPE_HULL:
- HullDesc hullDesc;
- if (Hulls.TryGetValue(shape.shapeKey, out hullDesc))
- {
- // There is an existing instance of this hull.
- hullDesc.referenceCount++;
- if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceShape,existingHull,key={1},cnt={2}",
- BSScene.DetailLogZero, shape.shapeKey.ToString("X"), hullDesc.referenceCount);
- }
- else
- {
- // This is a new reference to a hull
- hullDesc.shape = shape.Clone();
- hullDesc.shapeKey = shape.shapeKey;
- hullDesc.referenceCount = 1;
- if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceShape,newHull,key={1},cnt={2}",
- BSScene.DetailLogZero, shape.shapeKey.ToString("X"), hullDesc.referenceCount);
- ret = true;
-
- }
- hullDesc.lastReferenced = System.DateTime.Now;
- Hulls[shape.shapeKey] = hullDesc;
- break;
- case BSPhysicsShapeType.SHAPE_UNKNOWN:
- break;
- default:
- // Native shapes are not tracked and they don't go into any list
- break;
- }
- return ret;
- }
-
- // Release the usage of a shape.
- public void DereferenceShape(BulletShape shape, ShapeDestructionCallback shapeCallback)
- {
- if (!shape.HasPhysicalShape)
- return;
-
- PhysicsScene.AssertInTaintTime("BSShapeCollection.DereferenceShape");
-
- if (shape.HasPhysicalShape)
- {
- if (shape.isNativeShape)
- {
- // Native shapes are not tracked and are released immediately
- if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceShape,deleteNativeShape,ptr={1}",
- BSScene.DetailLogZero, shape.AddrString);
- if (shapeCallback != null) shapeCallback(shape);
- PhysicsScene.PE.DeleteCollisionShape(PhysicsScene.World, shape);
- }
- else
- {
- switch (shape.type)
- {
- case BSPhysicsShapeType.SHAPE_HULL:
- DereferenceHull(shape, shapeCallback);
- break;
- case BSPhysicsShapeType.SHAPE_MESH:
- DereferenceMesh(shape, shapeCallback);
- break;
- case BSPhysicsShapeType.SHAPE_COMPOUND:
- DereferenceCompound(shape, shapeCallback);
- break;
- case BSPhysicsShapeType.SHAPE_UNKNOWN:
- break;
- default:
- break;
- }
- }
- }
- }
-
- // Count down the reference count for a mesh shape
- // Called at taint-time.
- private void DereferenceMesh(BulletShape shape, ShapeDestructionCallback shapeCallback)
- {
- MeshDesc meshDesc;
- if (Meshes.TryGetValue(shape.shapeKey, out meshDesc))
- {
- meshDesc.referenceCount--;
- // TODO: release the Bullet storage
- if (shapeCallback != null) shapeCallback(shape);
- meshDesc.lastReferenced = System.DateTime.Now;
- Meshes[shape.shapeKey] = meshDesc;
- if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceMesh,shape={1},refCnt={2}",
- BSScene.DetailLogZero, shape, meshDesc.referenceCount);
-
- }
+ return GetBodyAndShape(forceRebuild, sim, prim, null);
}
- // Count down the reference count for a hull shape
- // Called at taint-time.
- private void DereferenceHull(BulletShape shape, ShapeDestructionCallback shapeCallback)
+ // If the existing prim's shape is to be replaced, remove the tie to the existing shape
+ // before replacing it.
+ private void DereferenceExistingShape(BSPhysObject prim, PhysicalDestructionCallback shapeCallback)
{
- HullDesc hullDesc;
- if (Hulls.TryGetValue(shape.shapeKey, out hullDesc))
+ if (prim.PhysShape.HasPhysicalShape)
{
- hullDesc.referenceCount--;
- // TODO: release the Bullet storage (aging old entries?)
-
- // Tell upper layers that, if they have dependencies on this shape, this link is going away
- if (shapeCallback != null) shapeCallback(shape);
-
- hullDesc.lastReferenced = System.DateTime.Now;
- Hulls[shape.shapeKey] = hullDesc;
- if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceHull,shape={1},refCnt={2}",
- BSScene.DetailLogZero, shape, hullDesc.referenceCount);
- }
- }
-
- // Remove a reference to a compound shape.
- // Taking a compound shape apart is a little tricky because if you just delete the
- // physical shape, it will free all the underlying children. We can't do that because
- // they could be shared. So, this removes each of the children from the compound and
- // dereferences them separately before destroying the compound collision object itself.
- // Called at taint-time.
- private void DereferenceCompound(BulletShape shape, ShapeDestructionCallback shapeCallback)
- {
- if (!PhysicsScene.PE.IsCompound(shape))
- {
- // Failed the sanity check!!
- PhysicsScene.Logger.ErrorFormat("{0} Attempt to free a compound shape that is not compound!! type={1}, ptr={2}",
- LogHeader, shape.type, shape.AddrString);
- if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceCompound,notACompoundShape,type={1},ptr={2}",
- BSScene.DetailLogZero, shape.type, shape.AddrString);
- return;
- }
-
- int numChildren = PhysicsScene.PE.GetNumberOfCompoundChildren(shape);
- if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceCompound,shape={1},children={2}", BSScene.DetailLogZero, shape, numChildren);
-
- for (int ii = numChildren - 1; ii >= 0; ii--)
- {
- BulletShape childShape = PhysicsScene.PE.RemoveChildShapeFromCompoundShapeIndex(shape, ii);
- DereferenceAnonCollisionShape(childShape);
- }
- PhysicsScene.PE.DeleteCollisionShape(PhysicsScene.World, shape);
- }
-
- // Sometimes we have a pointer to a collision shape but don't know what type it is.
- // Figure out type and call the correct dereference routine.
- // Called at taint-time.
- private void DereferenceAnonCollisionShape(BulletShape shapeInfo)
- {
- MeshDesc meshDesc;
- HullDesc hullDesc;
-
- if (TryGetMeshByPtr(shapeInfo, out meshDesc))
- {
- shapeInfo.type = BSPhysicsShapeType.SHAPE_MESH;
- shapeInfo.shapeKey = meshDesc.shapeKey;
- }
- else
- {
- if (TryGetHullByPtr(shapeInfo, out hullDesc))
- {
- shapeInfo.type = BSPhysicsShapeType.SHAPE_HULL;
- shapeInfo.shapeKey = hullDesc.shapeKey;
- }
- else
- {
- if (PhysicsScene.PE.IsCompound(shapeInfo))
- {
- shapeInfo.type = BSPhysicsShapeType.SHAPE_COMPOUND;
- }
- else
- {
- if (PhysicsScene.PE.IsNativeShape(shapeInfo))
- {
- shapeInfo.isNativeShape = true;
- shapeInfo.type = BSPhysicsShapeType.SHAPE_BOX; // (technically, type doesn't matter)
- }
- }
- }
- }
-
- if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceAnonCollisionShape,shape={1}", BSScene.DetailLogZero, shapeInfo);
-
- if (shapeInfo.type != BSPhysicsShapeType.SHAPE_UNKNOWN)
- {
- DereferenceShape(shapeInfo, null);
- }
- else
- {
- PhysicsScene.Logger.ErrorFormat("{0} Could not decypher shape type. Region={1}, addr={2}",
- LogHeader, PhysicsScene.RegionName, shapeInfo.AddrString);
+ if (shapeCallback != null)
+ shapeCallback(prim.PhysBody, prim.PhysShape.physShapeInfo);
+ prim.PhysShape.Dereference(m_physicsScene);
}
+ prim.PhysShape = new BSShapeNull();
}
// Create the geometry information in Bullet for later use.
@@ -402,40 +124,7 @@ public sealed class BSShapeCollection : IDisposable
// Info in prim.BSShape is updated to the new shape.
// Returns 'true' if the geometry was rebuilt.
// Called at taint-time!
- private bool CreateGeom(bool forceRebuild, BSPhysObject prim, ShapeDestructionCallback shapeCallback)
- {
- bool ret = false;
- bool haveShape = false;
-
- if (!haveShape && prim.PreferredPhysicalShape == BSPhysicsShapeType.SHAPE_CAPSULE)
- {
- // an avatar capsule is close to a native shape (it is not shared)
- GetReferenceToNativeShape(prim, BSPhysicsShapeType.SHAPE_CAPSULE, FixedShapeKey.KEY_CAPSULE, shapeCallback);
- if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,avatarCapsule,shape={1}", prim.LocalID, prim.PhysShape);
- ret = true;
- haveShape = true;
- }
-
- // Compound shapes are handled special as they are rebuilt from scratch.
- // This isn't too great a hardship since most of the child shapes will have already been created.
- if (!haveShape && prim.PreferredPhysicalShape == BSPhysicsShapeType.SHAPE_COMPOUND)
- {
- ret = GetReferenceToCompoundShape(prim, shapeCallback);
- if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,compoundShape,shape={1}", prim.LocalID, prim.PhysShape);
- haveShape = true;
- }
-
- if (!haveShape)
- {
- ret = CreateGeomNonSpecial(forceRebuild, prim, shapeCallback);
- }
-
- return ret;
- }
-
- // Create a mesh, hull or native shape.
- // Return 'true' if the prim's shape was changed.
- public bool CreateGeomNonSpecial(bool forceRebuild, BSPhysObject prim, ShapeDestructionCallback shapeCallback)
+ private bool CreateGeom(bool forceRebuild, BSPhysObject prim, PhysicalDestructionCallback shapeCallback)
{
bool ret = false;
bool haveShape = false;
@@ -443,19 +132,21 @@ public sealed class BSShapeCollection : IDisposable
PrimitiveBaseShape pbs = prim.BaseShape;
// If the prim attributes are simple, this could be a simple Bullet native shape
+ // Native shapes work whether to object is static or physical.
if (!haveShape
&& nativeShapePossible
&& pbs != null
- && !pbs.SculptEntry
- && ((pbs.SculptEntry && !BSParam.ShouldMeshSculptedPrim) || PrimHasNoCuts(pbs)) )
+ && PrimHasNoCuts(pbs)
+ && ( !pbs.SculptEntry || (pbs.SculptEntry && !BSParam.ShouldMeshSculptedPrim) )
+ )
{
// Get the scale of any existing shape so we can see if the new shape is same native type and same size.
OMV.Vector3 scaleOfExistingShape = OMV.Vector3.Zero;
if (prim.PhysShape.HasPhysicalShape)
- scaleOfExistingShape = PhysicsScene.PE.GetLocalScaling(prim.PhysShape);
+ scaleOfExistingShape = m_physicsScene.PE.GetLocalScaling(prim.PhysShape.physShapeInfo);
if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,maybeNative,force={1},primScale={2},primSize={3},primShape={4}",
- prim.LocalID, forceRebuild, prim.Scale, prim.Size, prim.PhysShape.type);
+ prim.LocalID, forceRebuild, prim.Scale, prim.Size, prim.PhysShape.physShapeInfo.shapeType);
// It doesn't look like Bullet scales native spheres so make sure the scales are all equal
if ((pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1)
@@ -463,26 +154,28 @@ public sealed class BSShapeCollection : IDisposable
{
haveShape = true;
if (forceRebuild
- || prim.Scale != scaleOfExistingShape
- || prim.PhysShape.type != BSPhysicsShapeType.SHAPE_SPHERE
- )
+ || prim.PhysShape.ShapeType != BSPhysicsShapeType.SHAPE_SPHERE
+ )
{
- ret = GetReferenceToNativeShape(prim, BSPhysicsShapeType.SHAPE_SPHERE,
- FixedShapeKey.KEY_SPHERE, shapeCallback);
+ DereferenceExistingShape(prim, shapeCallback);
+ prim.PhysShape = BSShapeNative.GetReference(m_physicsScene, prim,
+ BSPhysicsShapeType.SHAPE_SPHERE, FixedShapeKey.KEY_SPHERE);
}
if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,sphere,force={1},rebuilt={2},shape={3}",
prim.LocalID, forceRebuild, ret, prim.PhysShape);
}
+ // If we didn't make a sphere, maybe a box will work.
if (!haveShape && pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight)
{
haveShape = true;
if (forceRebuild
|| prim.Scale != scaleOfExistingShape
- || prim.PhysShape.type != BSPhysicsShapeType.SHAPE_BOX
+ || prim.PhysShape.ShapeType != BSPhysicsShapeType.SHAPE_BOX
)
{
- ret = GetReferenceToNativeShape( prim, BSPhysicsShapeType.SHAPE_BOX,
- FixedShapeKey.KEY_BOX, shapeCallback);
+ DereferenceExistingShape(prim, shapeCallback);
+ prim.PhysShape = BSShapeNative.GetReference(m_physicsScene, prim,
+ BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX);
}
if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,box,force={1},rebuilt={2},shape={3}",
prim.LocalID, forceRebuild, ret, prim.PhysShape);
@@ -511,7 +204,7 @@ public sealed class BSShapeCollection : IDisposable
}
// return 'true' if the prim's shape was changed.
- public bool CreateGeomMeshOrHull(BSPhysObject prim, ShapeDestructionCallback shapeCallback)
+ private bool CreateGeomMeshOrHull(BSPhysObject prim, PhysicalDestructionCallback shapeCallback)
{
bool ret = false;
@@ -520,537 +213,70 @@ public sealed class BSShapeCollection : IDisposable
if (prim.IsPhysical && BSParam.ShouldUseHullsForPhysicalObjects)
{
// Update prim.BSShape to reference a hull of this shape.
- ret = GetReferenceToHull(prim, shapeCallback);
+ DereferenceExistingShape(prim, shapeCallback);
+ prim.PhysShape = BSShapeMesh.GetReference(m_physicsScene, false /*forceRebuild*/, prim);
if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,hull,shape={1},key={2}",
- prim.LocalID, prim.PhysShape, prim.PhysShape.shapeKey.ToString("X"));
+ prim.LocalID, prim.PhysShape, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"));
}
else
{
- ret = GetReferenceToMesh(prim, shapeCallback);
+ // Update prim.BSShape to reference a mesh of this shape.
+ DereferenceExistingShape(prim, shapeCallback);
+ prim.PhysShape = BSShapeHull.GetReference(m_physicsScene, false /*forceRebuild*/, prim);
if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,mesh,shape={1},key={2}",
- prim.LocalID, prim.PhysShape, prim.PhysShape.shapeKey.ToString("X"));
+ prim.LocalID, prim.PhysShape, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"));
}
return ret;
}
- // Creates a native shape and assignes it to prim.BSShape.
- // "Native" shapes are never shared. they are created here and destroyed in DereferenceShape().
- private bool GetReferenceToNativeShape(BSPhysObject prim,
- BSPhysicsShapeType shapeType, FixedShapeKey shapeKey,
- ShapeDestructionCallback shapeCallback)
- {
- // release any previous shape
- DereferenceShape(prim.PhysShape, shapeCallback);
-
- BulletShape newShape = BuildPhysicalNativeShape(prim, shapeType, shapeKey);
-
- // Don't need to do a 'ReferenceShape()' here because native shapes are not shared.
- if (DDetail) DetailLog("{0},BSShapeCollection.AddNativeShapeToPrim,create,newshape={1},scale={2}",
- prim.LocalID, newShape, prim.Scale);
-
- // native shapes are scaled by Bullet
- prim.PhysShape = newShape;
- return true;
- }
-
- private BulletShape BuildPhysicalNativeShape(BSPhysObject prim, BSPhysicsShapeType shapeType,
- FixedShapeKey shapeKey)
- {
- BulletShape newShape;
- // Need to make sure the passed shape information is for the native type.
- ShapeData nativeShapeData = new ShapeData();
- nativeShapeData.Type = shapeType;
- nativeShapeData.ID = prim.LocalID;
- nativeShapeData.Scale = prim.Scale;
- nativeShapeData.Size = prim.Scale; // unneeded, I think.
- nativeShapeData.MeshKey = (ulong)shapeKey;
- nativeShapeData.HullKey = (ulong)shapeKey;
-
- if (shapeType == BSPhysicsShapeType.SHAPE_CAPSULE)
- {
-
- newShape = PhysicsScene.PE.BuildCapsuleShape(PhysicsScene.World, 1f, 1f, prim.Scale);
- if (DDetail) DetailLog("{0},BSShapeCollection.BuildPhysicalNativeShape,capsule,scale={1}", prim.LocalID, prim.Scale);
- }
- else
- {
- // Native shapes are scaled in Bullet so set the scaling to the size
- newShape = PhysicsScene.PE.BuildNativeShape(PhysicsScene.World, nativeShapeData);
-
- }
- if (!newShape.HasPhysicalShape)
- {
- PhysicsScene.Logger.ErrorFormat("{0} BuildPhysicalNativeShape failed. ID={1}, shape={2}",
- LogHeader, prim.LocalID, shapeType);
- }
- newShape.shapeKey = (System.UInt64)shapeKey;
- newShape.isNativeShape = true;
-
- return newShape;
- }
-
- // Builds a mesh shape in the physical world and updates prim.BSShape.
- // Dereferences previous shape in BSShape and adds a reference for this new shape.
- // Returns 'true' of a mesh was actually built. Otherwise .
- // Called at taint-time!
- private bool GetReferenceToMesh(BSPhysObject prim, ShapeDestructionCallback shapeCallback)
- {
- BulletShape newShape = new BulletShape();
-
- float lod;
- System.UInt64 newMeshKey = ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
-
- // if this new shape is the same as last time, don't recreate the mesh
- if (newMeshKey == prim.PhysShape.shapeKey && prim.PhysShape.type == BSPhysicsShapeType.SHAPE_MESH)
- return false;
-
- if (DDetail) DetailLog("{0},BSShapeCollection.GetReferenceToMesh,create,oldKey={1},newKey={2},size={3},lod={4}",
- prim.LocalID, prim.PhysShape.shapeKey.ToString("X"), newMeshKey.ToString("X"), prim.Size, lod);
-
- // Since we're recreating new, get rid of the reference to the previous shape
- DereferenceShape(prim.PhysShape, shapeCallback);
-
- newShape = CreatePhysicalMesh(prim, newMeshKey, prim.BaseShape, prim.Size, lod);
- // Take evasive action if the mesh was not constructed.
- newShape = VerifyMeshCreated(PhysicsScene, newShape, prim);
-
- ReferenceShape(newShape);
-
- prim.PhysShape = newShape;
-
- return true; // 'true' means a new shape has been added to this prim
- }
-
- private BulletShape CreatePhysicalMesh(BSPhysObject prim, System.UInt64 newMeshKey, PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
+ // Track another user of a body.
+ // We presume the caller has allocated the body.
+ // Bodies only have one user so the body is just put into the world if not already there.
+ private void ReferenceBody(BulletBody body)
{
- BulletShape newShape = new BulletShape();
-
- MeshDesc meshDesc;
- if (Meshes.TryGetValue(newMeshKey, out meshDesc))
- {
- // If the mesh has already been built just use it.
- newShape = meshDesc.shape.Clone();
- }
- else
+ lock (m_collectionActivityLock)
{
- IMesh meshData = PhysicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod,
- false, // say it is not physical so a bounding box is not built
- false // do not cache the mesh and do not use previously built versions
- );
-
- if (meshData != null)
+ if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceBody,newBody,body={1}", body.ID, body);
+ if (!m_physicsScene.PE.IsInWorld(m_physicsScene.World, body))
{
-
- int[] indices = meshData.getIndexListAsInt();
- int realIndicesIndex = indices.Length;
- float[] verticesAsFloats = meshData.getVertexListAsFloat();
-
- if (BSParam.ShouldRemoveZeroWidthTriangles)
- {
- // Remove degenerate triangles. These are triangles with two of the vertices
- // are the same. This is complicated by the problem that vertices are not
- // made unique in sculpties so we have to compare the values in the vertex.
- realIndicesIndex = 0;
- for (int tri = 0; tri < indices.Length; tri += 3)
- {
- // Compute displacements into vertex array for each vertex of the triangle
- int v1 = indices[tri + 0] * 3;
- int v2 = indices[tri + 1] * 3;
- int v3 = indices[tri + 2] * 3;
- // Check to see if any two of the vertices are the same
- if (!( ( verticesAsFloats[v1 + 0] == verticesAsFloats[v2 + 0]
- && verticesAsFloats[v1 + 1] == verticesAsFloats[v2 + 1]
- && verticesAsFloats[v1 + 2] == verticesAsFloats[v2 + 2])
- || ( verticesAsFloats[v2 + 0] == verticesAsFloats[v3 + 0]
- && verticesAsFloats[v2 + 1] == verticesAsFloats[v3 + 1]
- && verticesAsFloats[v2 + 2] == verticesAsFloats[v3 + 2])
- || ( verticesAsFloats[v1 + 0] == verticesAsFloats[v3 + 0]
- && verticesAsFloats[v1 + 1] == verticesAsFloats[v3 + 1]
- && verticesAsFloats[v1 + 2] == verticesAsFloats[v3 + 2]) )
- )
- {
- // None of the vertices of the triangles are the same. This is a good triangle;
- indices[realIndicesIndex + 0] = indices[tri + 0];
- indices[realIndicesIndex + 1] = indices[tri + 1];
- indices[realIndicesIndex + 2] = indices[tri + 2];
- realIndicesIndex += 3;
- }
- }
- }
- DetailLog("{0},BSShapeCollection.CreatePhysicalMesh,origTri={1},realTri={2},numVerts={3}",
- BSScene.DetailLogZero, indices.Length / 3, realIndicesIndex / 3, verticesAsFloats.Length / 3);
-
- if (realIndicesIndex != 0)
- {
- newShape = PhysicsScene.PE.CreateMeshShape(PhysicsScene.World,
- realIndicesIndex, indices, verticesAsFloats.Length / 3, verticesAsFloats);
- }
- else
- {
- PhysicsScene.Logger.DebugFormat("{0} All mesh triangles degenerate. Prim {1} at {2} in {3}",
- LogHeader, prim.PhysObjectName, prim.RawPosition, PhysicsScene.Name);
- }
+ m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, body);
+ if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceBody,addedToWorld,ref={1}", body.ID, body);
}
}
- newShape.shapeKey = newMeshKey;
-
- return newShape;
- }
-
- // See that hull shape exists in the physical world and update prim.BSShape.
- // We could be creating the hull because scale changed or whatever.
- // Return 'true' if a new hull was built. Otherwise, returning a shared hull instance.
- private bool GetReferenceToHull(BSPhysObject prim, ShapeDestructionCallback shapeCallback)
- {
- BulletShape newShape;
-
- float lod;
- System.UInt64 newHullKey = ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
-
- // if the hull hasn't changed, don't rebuild it
- if (newHullKey == prim.PhysShape.shapeKey && prim.PhysShape.type == BSPhysicsShapeType.SHAPE_HULL)
- return false;
-
- if (DDetail) DetailLog("{0},BSShapeCollection.GetReferenceToHull,create,oldKey={1},newKey={2}",
- prim.LocalID, prim.PhysShape.shapeKey.ToString("X"), newHullKey.ToString("X"));
-
- // Remove usage of the previous shape.
- DereferenceShape(prim.PhysShape, shapeCallback);
-
- newShape = CreatePhysicalHull(prim, newHullKey, prim.BaseShape, prim.Size, lod);
- // It might not have been created if we're waiting for an asset.
- newShape = VerifyMeshCreated(PhysicsScene, newShape, prim);
-
- ReferenceShape(newShape);
-
- prim.PhysShape = newShape;
- return true; // 'true' means a new shape has been added to this prim
}
- List m_hulls;
- private BulletShape CreatePhysicalHull(BSPhysObject prim, System.UInt64 newHullKey, PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
+ // Release the usage of a body.
+ // Called when releasing use of a BSBody. BSShape is handled separately.
+ // Called in taint time.
+ public void DereferenceBody(BulletBody body, PhysicalDestructionCallback bodyCallback )
{
+ if (!body.HasPhysicalBody)
+ return;
- BulletShape newShape = new BulletShape();
- IntPtr hullPtr = IntPtr.Zero;
+ m_physicsScene.AssertInTaintTime("BSShapeCollection.DereferenceBody");
- HullDesc hullDesc;
- if (Hulls.TryGetValue(newHullKey, out hullDesc))
- {
- // If the hull shape already has been created, just use the one shared instance.
- newShape = hullDesc.shape.Clone();
- }
- else
+ lock (m_collectionActivityLock)
{
- if (BSParam.ShouldUseBulletHACD)
- {
- DetailLog("{0},BSShapeCollection.CreatePhysicalHull,shouldUseBulletHACD,entry", prim.LocalID);
- MeshDesc meshDesc;
- if (!Meshes.TryGetValue(newHullKey, out meshDesc))
- {
- // That's odd because the mesh should have been created before the hull
- // but, since it doesn't exist, create it.
- newShape = CreatePhysicalMesh(prim, newHullKey, prim.BaseShape, prim.Size, lod);
- DetailLog("{0},BSShapeCollection.CreatePhysicalHull,noMeshBuiltNew,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
-
- if (newShape.HasPhysicalShape)
- {
- ReferenceShape(newShape);
- Meshes.TryGetValue(newHullKey, out meshDesc);
- }
- }
- if (meshDesc.shape.HasPhysicalShape)
- {
- HACDParams parms;
- parms.maxVerticesPerHull = BSParam.BHullMaxVerticesPerHull;
- parms.minClusters = BSParam.BHullMinClusters;
- parms.compacityWeight = BSParam.BHullCompacityWeight;
- parms.volumeWeight = BSParam.BHullVolumeWeight;
- parms.concavity = BSParam.BHullConcavity;
- parms.addExtraDistPoints = BSParam.NumericBool(BSParam.BHullAddExtraDistPoints);
- parms.addNeighboursDistPoints = BSParam.NumericBool(BSParam.BHullAddNeighboursDistPoints);
- parms.addFacesPoints = BSParam.NumericBool(BSParam.BHullAddFacesPoints);
- parms.shouldAdjustCollisionMargin = BSParam.NumericBool(BSParam.BHullShouldAdjustCollisionMargin);
-
- DetailLog("{0},BSShapeCollection.CreatePhysicalHull,hullFromMesh,beforeCall", prim.LocalID, newShape.HasPhysicalShape);
- newShape = PhysicsScene.PE.BuildHullShapeFromMesh(PhysicsScene.World, meshDesc.shape, parms);
- DetailLog("{0},BSShapeCollection.CreatePhysicalHull,hullFromMesh,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
- }
- DetailLog("{0},BSShapeCollection.CreatePhysicalHull,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
- }
- if (!newShape.HasPhysicalShape)
- {
- // Build a new hull in the physical world.
- // Pass true for physicalness as this prevents the creation of bounding box which is not needed
- IMesh meshData = PhysicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
- if (meshData != null)
- {
- int[] indices = meshData.getIndexListAsInt();
- List vertices = meshData.getVertexList();
-
- //format conversion from IMesh format to DecompDesc format
- List convIndices = new List();
- List convVertices = new List();
- for (int ii = 0; ii < indices.GetLength(0); ii++)
- {
- convIndices.Add(indices[ii]);
- }
- foreach (OMV.Vector3 vv in vertices)
- {
- convVertices.Add(new float3(vv.X, vv.Y, vv.Z));
- }
-
- uint maxDepthSplit = (uint)BSParam.CSHullMaxDepthSplit;
- if (BSParam.CSHullMaxDepthSplit != BSParam.CSHullMaxDepthSplitForSimpleShapes)
- {
- // Simple primitive shapes we know are convex so they are better implemented with
- // fewer hulls.
- // Check for simple shape (prim without cuts) and reduce split parameter if so.
- if (PrimHasNoCuts(pbs))
- {
- maxDepthSplit = (uint)BSParam.CSHullMaxDepthSplitForSimpleShapes;
- }
- }
-
- // setup and do convex hull conversion
- m_hulls = new List();
- DecompDesc dcomp = new DecompDesc();
- dcomp.mIndices = convIndices;
- dcomp.mVertices = convVertices;
- dcomp.mDepth = maxDepthSplit;
- dcomp.mCpercent = BSParam.CSHullConcavityThresholdPercent;
- dcomp.mPpercent = BSParam.CSHullVolumeConservationThresholdPercent;
- dcomp.mMaxVertices = (uint)BSParam.CSHullMaxVertices;
- dcomp.mSkinWidth = BSParam.CSHullMaxSkinWidth;
- ConvexBuilder convexBuilder = new ConvexBuilder(HullReturn);
- // create the hull into the _hulls variable
- convexBuilder.process(dcomp);
-
- DetailLog("{0},BSShapeCollection.CreatePhysicalHull,key={1},inVert={2},inInd={3},split={4},hulls={5}",
- BSScene.DetailLogZero, newHullKey, indices.GetLength(0), vertices.Count, maxDepthSplit, m_hulls.Count);
-
- // Convert the vertices and indices for passing to unmanaged.
- // The hull information is passed as a large floating point array.
- // The format is:
- // convHulls[0] = number of hulls
- // convHulls[1] = number of vertices in first hull
- // convHulls[2] = hull centroid X coordinate
- // convHulls[3] = hull centroid Y coordinate
- // convHulls[4] = hull centroid Z coordinate
- // convHulls[5] = first hull vertex X
- // convHulls[6] = first hull vertex Y
- // convHulls[7] = first hull vertex Z
- // convHulls[8] = second hull vertex X
- // ...
- // convHulls[n] = number of vertices in second hull
- // convHulls[n+1] = second hull centroid X coordinate
- // ...
- //
- // TODO: is is very inefficient. Someday change the convex hull generator to return
- // data structures that do not need to be converted in order to pass to Bullet.
- // And maybe put the values directly into pinned memory rather than marshaling.
- int hullCount = m_hulls.Count;
- int totalVertices = 1; // include one for the count of the hulls
- foreach (ConvexResult cr in m_hulls)
- {
- totalVertices += 4; // add four for the vertex count and centroid
- totalVertices += cr.HullIndices.Count * 3; // we pass just triangles
- }
- float[] convHulls = new float[totalVertices];
-
- convHulls[0] = (float)hullCount;
- int jj = 1;
- foreach (ConvexResult cr in m_hulls)
- {
- // copy vertices for index access
- float3[] verts = new float3[cr.HullVertices.Count];
- int kk = 0;
- foreach (float3 ff in cr.HullVertices)
- {
- verts[kk++] = ff;
- }
-
- // add to the array one hull's worth of data
- convHulls[jj++] = cr.HullIndices.Count;
- convHulls[jj++] = 0f; // centroid x,y,z
- convHulls[jj++] = 0f;
- convHulls[jj++] = 0f;
- foreach (int ind in cr.HullIndices)
- {
- convHulls[jj++] = verts[ind].x;
- convHulls[jj++] = verts[ind].y;
- convHulls[jj++] = verts[ind].z;
- }
- }
- // create the hull data structure in Bullet
- newShape = PhysicsScene.PE.CreateHullShape(PhysicsScene.World, hullCount, convHulls);
- }
- }
- newShape.shapeKey = newHullKey;
- }
-
- return newShape;
- }
-
- // Callback from convex hull creater with a newly created hull.
- // Just add it to our collection of hulls for this shape.
- private void HullReturn(ConvexResult result)
- {
- m_hulls.Add(result);
- return;
- }
-
- // Compound shapes are always built from scratch.
- // This shouldn't be to bad since most of the parts will be meshes that had been built previously.
- private bool GetReferenceToCompoundShape(BSPhysObject prim, ShapeDestructionCallback shapeCallback)
- {
- // Remove reference to the old shape
- // Don't need to do this as the shape is freed when the new root shape is created below.
- // DereferenceShape(prim.PhysShape, true, shapeCallback);
-
- BulletShape cShape = PhysicsScene.PE.CreateCompoundShape(PhysicsScene.World, false);
-
- // Create the shape for the root prim and add it to the compound shape. Cannot be a native shape.
- CreateGeomMeshOrHull(prim, shapeCallback);
- PhysicsScene.PE.AddChildShapeToCompoundShape(cShape, prim.PhysShape, OMV.Vector3.Zero, OMV.Quaternion.Identity);
- if (DDetail) DetailLog("{0},BSShapeCollection.GetReferenceToCompoundShape,addRootPrim,compShape={1},rootShape={2}",
- prim.LocalID, cShape, prim.PhysShape);
-
- prim.PhysShape = cShape;
-
- return true;
- }
-
- // Create a hash of all the shape parameters to be used as a key
- // for this particular shape.
- public static System.UInt64 ComputeShapeKey(OMV.Vector3 size, PrimitiveBaseShape pbs, out float retLod)
- {
- // level of detail based on size and type of the object
- float lod = BSParam.MeshLOD;
-
- // prims with curvy internal cuts need higher lod
- if (pbs.HollowShape == HollowShape.Circle)
- lod = BSParam.MeshCircularLOD;
-
- if (pbs.SculptEntry)
- lod = BSParam.SculptLOD;
-
- // Mega prims usually get more detail because one can interact with shape approximations at this size.
- float maxAxis = Math.Max(size.X, Math.Max(size.Y, size.Z));
- if (maxAxis > BSParam.MeshMegaPrimThreshold)
- lod = BSParam.MeshMegaPrimLOD;
-
- retLod = lod;
- return pbs.GetMeshKey(size, lod);
- }
- // For those who don't want the LOD
- public static System.UInt64 ComputeShapeKey(OMV.Vector3 size, PrimitiveBaseShape pbs)
- {
- float lod;
- return ComputeShapeKey(size, pbs, out lod);
- }
-
- // The creation of a mesh or hull can fail if an underlying asset is not available.
- // There are two cases: 1) the asset is not in the cache and it needs to be fetched;
- // and 2) the asset cannot be converted (like failed decompression of JPEG2000s).
- // The first case causes the asset to be fetched. The second case requires
- // us to not loop forever.
- // Called after creating a physical mesh or hull. If the physical shape was created,
- // just return.
- public static BulletShape VerifyMeshCreated(BSScene physicsScene, BulletShape newShape, BSPhysObject prim)
- {
- // If the shape was successfully created, nothing more to do
- if (newShape.HasPhysicalShape)
- return newShape;
+ if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceBody,DestroyingBody,body={1}", body.ID, body);
+ // If the caller needs to know the old body is going away, pass the event up.
+ if (bodyCallback != null)
+ bodyCallback(body, null);
- // VerifyMeshCreated is called after trying to create the mesh. If we think the asset had been
- // fetched but we end up here again, the meshing of the asset must have failed.
- // Prevent trying to keep fetching the mesh by declaring failure.
- if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
- {
- prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
- physicsScene.Logger.WarnFormat("{0} Fetched asset would not mesh. {1}, texture={2}",
- LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
- }
- else
- {
- // If this mesh has an underlying asset and we have not failed getting it before, fetch the asset
- if (prim.BaseShape.SculptEntry
- && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.Failed
- && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.Waiting
- && prim.BaseShape.SculptTexture != OMV.UUID.Zero
- )
- {
- physicsScene.DetailLog("{0},BSShapeCollection.VerifyMeshCreated,fetchAsset", prim.LocalID);
- // Multiple requestors will know we're waiting for this asset
- prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Waiting;
+ // Removing an object not in the world is a NOOP
+ m_physicsScene.PE.RemoveObjectFromWorld(m_physicsScene.World, body);
- BSPhysObject xprim = prim;
- Util.FireAndForget(delegate
- {
- RequestAssetDelegate assetProvider = physicsScene.RequestAssetMethod;
- if (assetProvider != null)
- {
- BSPhysObject yprim = xprim; // probably not necessary, but, just in case.
- assetProvider(yprim.BaseShape.SculptTexture, delegate(AssetBase asset)
- {
- bool assetFound = false;
- string mismatchIDs = String.Empty; // DEBUG DEBUG
- if (asset != null && yprim.BaseShape.SculptEntry)
- {
- if (yprim.BaseShape.SculptTexture.ToString() == asset.ID)
- {
- yprim.BaseShape.SculptData = asset.Data;
- // This will cause the prim to see that the filler shape is not the right
- // one and try again to build the object.
- // No race condition with the normal shape setting since the rebuild is at taint time.
- yprim.ForceBodyShapeRebuild(false /* inTaintTime */);
- assetFound = true;
- }
- else
- {
- mismatchIDs = yprim.BaseShape.SculptTexture.ToString() + "/" + asset.ID;
- }
- }
- if (assetFound)
- yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Fetched;
- else
- yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
- physicsScene.DetailLog("{0},BSShapeCollection,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
- yprim.LocalID, assetFound, yprim.BaseShape.SculptEntry, mismatchIDs );
+ // Zero any reference to the shape so it is not freed when the body is deleted.
+ m_physicsScene.PE.SetCollisionShape(m_physicsScene.World, body, null);
- });
- }
- else
- {
- xprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
- physicsScene.Logger.ErrorFormat("{0} Physical object requires asset but no asset provider. Name={1}",
- LogHeader, physicsScene.Name);
- }
- });
- }
- else
- {
- if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Failed)
- {
- physicsScene.Logger.WarnFormat("{0} Mesh failed to fetch asset. obj={1}, texture={2}",
- LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
- }
- }
+ m_physicsScene.PE.DestroyObject(m_physicsScene.World, body);
}
-
- // While we wait for the mesh defining asset to be loaded, stick in a simple box for the object.
- BulletShape fillinShape = physicsScene.Shapes.BuildPhysicalNativeShape(prim, BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX);
- physicsScene.DetailLog("{0},BSShapeCollection.VerifyMeshCreated,boxTempShape", prim.LocalID);
-
- return fillinShape;
}
// Create a body object in Bullet.
// Updates prim.BSBody with the information about the new body if one is created.
// Returns 'true' if an object was actually created.
// Called at taint-time.
- private bool CreateBody(bool forceRebuild, BSPhysObject prim, BulletWorld sim, BodyDestructionCallback bodyCallback)
+ private bool CreateBody(bool forceRebuild, BSPhysObject prim, BulletWorld sim, PhysicalDestructionCallback bodyCallback)
{
bool ret = false;
@@ -1061,7 +287,7 @@ public sealed class BSShapeCollection : IDisposable
// If not a solid object, body is a GhostObject. Otherwise a RigidBody.
if (!mustRebuild)
{
- CollisionObjectTypes bodyType = (CollisionObjectTypes)PhysicsScene.PE.GetBodyType(prim.PhysBody);
+ CollisionObjectTypes bodyType = (CollisionObjectTypes)m_physicsScene.PE.GetBodyType(prim.PhysBody);
if (prim.IsSolid && bodyType != CollisionObjectTypes.CO_RIGID_BODY
|| !prim.IsSolid && bodyType != CollisionObjectTypes.CO_GHOST_OBJECT)
{
@@ -1079,12 +305,12 @@ public sealed class BSShapeCollection : IDisposable
BulletBody aBody;
if (prim.IsSolid)
{
- aBody = PhysicsScene.PE.CreateBodyFromShape(sim, prim.PhysShape, prim.LocalID, prim.RawPosition, prim.RawOrientation);
+ aBody = m_physicsScene.PE.CreateBodyFromShape(sim, prim.PhysShape.physShapeInfo, prim.LocalID, prim.RawPosition, prim.RawOrientation);
if (DDetail) DetailLog("{0},BSShapeCollection.CreateBody,mesh,body={1}", prim.LocalID, aBody);
}
else
{
- aBody = PhysicsScene.PE.CreateGhostFromShape(sim, prim.PhysShape, prim.LocalID, prim.RawPosition, prim.RawOrientation);
+ aBody = m_physicsScene.PE.CreateGhostFromShape(sim, prim.PhysShape.physShapeInfo, prim.LocalID, prim.RawPosition, prim.RawOrientation);
if (DDetail) DetailLog("{0},BSShapeCollection.CreateBody,ghost,body={1}", prim.LocalID, aBody);
}
@@ -1098,46 +324,10 @@ public sealed class BSShapeCollection : IDisposable
return ret;
}
- private bool TryGetMeshByPtr(BulletShape shape, out MeshDesc outDesc)
- {
- bool ret = false;
- MeshDesc foundDesc = new MeshDesc();
- foreach (MeshDesc md in Meshes.Values)
- {
- if (md.shape.ReferenceSame(shape))
- {
- foundDesc = md;
- ret = true;
- break;
- }
-
- }
- outDesc = foundDesc;
- return ret;
- }
-
- private bool TryGetHullByPtr(BulletShape shape, out HullDesc outDesc)
- {
- bool ret = false;
- HullDesc foundDesc = new HullDesc();
- foreach (HullDesc hd in Hulls.Values)
- {
- if (hd.shape.ReferenceSame(shape))
- {
- foundDesc = hd;
- ret = true;
- break;
- }
-
- }
- outDesc = foundDesc;
- return ret;
- }
-
private void DetailLog(string msg, params Object[] args)
{
- if (PhysicsScene.PhysicsLogging.Enabled)
- PhysicsScene.DetailLog(msg, args);
+ if (m_physicsScene.PhysicsLogging.Enabled)
+ m_physicsScene.DetailLog(msg, args);
}
}
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index e427dbc..a7b3f02 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -39,6 +39,8 @@ namespace OpenSim.Region.Physics.BulletSPlugin
{
public abstract class BSShape
{
+ private static string LogHeader = "[BULLETSIM SHAPE]";
+
public int referenceCount { get; set; }
public DateTime lastReferenced { get; set; }
public BulletShape physShapeInfo { get; set; }
@@ -56,49 +58,6 @@ public abstract class BSShape
physShapeInfo = pShape;
}
- // Get a reference to a physical shape. Create if it doesn't exist
- public static BSShape GetShapeReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
- {
- BSShape ret = null;
-
- if (prim.PreferredPhysicalShape == BSPhysicsShapeType.SHAPE_CAPSULE)
- {
- // an avatar capsule is close to a native shape (it is not shared)
- ret = BSShapeNative.GetReference(physicsScene, prim, BSPhysicsShapeType.SHAPE_CAPSULE,
- FixedShapeKey.KEY_CAPSULE);
- physicsScene.DetailLog("{0},BSShape.GetShapeReference,avatarCapsule,shape={1}", prim.LocalID, ret);
- }
-
- // Compound shapes are handled special as they are rebuilt from scratch.
- // This isn't too great a hardship since most of the child shapes will have already been created.
- if (ret == null && prim.PreferredPhysicalShape == BSPhysicsShapeType.SHAPE_COMPOUND)
- {
- // Getting a reference to a compound shape gets you the compound shape with the root prim shape added
- ret = BSShapeCompound.GetReference(physicsScene, prim);
- physicsScene.DetailLog("{0},BSShapeCollection.CreateGeom,compoundShape,shape={1}", prim.LocalID, ret);
- }
-
- // Avatars have their own unique shape
- if (ret == null && prim.PreferredPhysicalShape == BSPhysicsShapeType.SHAPE_AVATAR)
- {
- // Getting a reference to a compound shape gets you the compound shape with the root prim shape added
- ret = BSShapeAvatar.GetReference(prim);
- physicsScene.DetailLog("{0},BSShapeCollection.CreateGeom,avatarShape,shape={1}", prim.LocalID, ret);
- }
-
- if (ret == null)
- ret = GetShapeReferenceNonSpecial(physicsScene, forceRebuild, prim);
-
- return ret;
- }
- private static BSShape GetShapeReferenceNonSpecial(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
- {
- // TODO: work needed here!!
- BSShapeMesh.GetReference(physicsScene, forceRebuild, prim);
- BSShapeHull.GetReference(physicsScene, forceRebuild, prim);
- return null;
- }
-
// Called when this shape is being used again.
public virtual void IncrementReference()
{
@@ -116,6 +75,27 @@ public abstract class BSShape
// Release the use of a physical shape.
public abstract void Dereference(BSScene physicsScene);
+ // Return 'true' if there is an allocated physics physical shape under this class instance.
+ public virtual bool HasPhysicalShape
+ {
+ get
+ {
+ if (physShapeInfo != null)
+ return physShapeInfo.HasPhysicalShape;
+ return false;
+ }
+ }
+ public virtual BSPhysicsShapeType ShapeType
+ {
+ get
+ {
+ BSPhysicsShapeType ret = BSPhysicsShapeType.SHAPE_UNKNOWN;
+ if (physShapeInfo != null && physShapeInfo.HasPhysicalShape)
+ ret = physShapeInfo.shapeType;
+ return ret;
+ }
+ }
+
// Returns a string for debugging that uniquily identifies the memory used by this instance
public virtual string AddrString
{
@@ -132,6 +112,119 @@ public abstract class BSShape
buff.Append(">");
return buff.ToString();
}
+
+ // Create a hash of all the shape parameters to be used as a key for this particular shape.
+ public static System.UInt64 ComputeShapeKey(OMV.Vector3 size, PrimitiveBaseShape pbs, out float retLod)
+ {
+ // level of detail based on size and type of the object
+ float lod = BSParam.MeshLOD;
+ if (pbs.SculptEntry)
+ lod = BSParam.SculptLOD;
+
+ // Mega prims usually get more detail because one can interact with shape approximations at this size.
+ float maxAxis = Math.Max(size.X, Math.Max(size.Y, size.Z));
+ if (maxAxis > BSParam.MeshMegaPrimThreshold)
+ lod = BSParam.MeshMegaPrimLOD;
+
+ retLod = lod;
+ return pbs.GetMeshKey(size, lod);
+ }
+
+ // The creation of a mesh or hull can fail if an underlying asset is not available.
+ // There are two cases: 1) the asset is not in the cache and it needs to be fetched;
+ // and 2) the asset cannot be converted (like failed decompression of JPEG2000s).
+ // The first case causes the asset to be fetched. The second case requires
+ // us to not loop forever.
+ // Called after creating a physical mesh or hull. If the physical shape was created,
+ // just return.
+ public static BulletShape VerifyMeshCreated(BSScene physicsScene, BulletShape newShape, BSPhysObject prim)
+ {
+ // If the shape was successfully created, nothing more to do
+ if (newShape.HasPhysicalShape)
+ return newShape;
+
+ // VerifyMeshCreated is called after trying to create the mesh. If we think the asset had been
+ // fetched but we end up here again, the meshing of the asset must have failed.
+ // Prevent trying to keep fetching the mesh by declaring failure.
+ if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
+ {
+ prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
+ physicsScene.Logger.WarnFormat("{0} Fetched asset would not mesh. {1}, texture={2}",
+ LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
+ }
+ else
+ {
+ // If this mesh has an underlying asset and we have not failed getting it before, fetch the asset
+ if (prim.BaseShape.SculptEntry
+ && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.Failed
+ && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.Waiting
+ && prim.BaseShape.SculptTexture != OMV.UUID.Zero
+ )
+ {
+ physicsScene.DetailLog("{0},BSShapeCollection.VerifyMeshCreated,fetchAsset", prim.LocalID);
+ // Multiple requestors will know we're waiting for this asset
+ prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Waiting;
+
+ BSPhysObject xprim = prim;
+ Util.FireAndForget(delegate
+ {
+ RequestAssetDelegate assetProvider = physicsScene.RequestAssetMethod;
+ if (assetProvider != null)
+ {
+ BSPhysObject yprim = xprim; // probably not necessary, but, just in case.
+ assetProvider(yprim.BaseShape.SculptTexture, delegate(AssetBase asset)
+ {
+ bool assetFound = false;
+ string mismatchIDs = String.Empty; // DEBUG DEBUG
+ if (asset != null && yprim.BaseShape.SculptEntry)
+ {
+ if (yprim.BaseShape.SculptTexture.ToString() == asset.ID)
+ {
+ yprim.BaseShape.SculptData = asset.Data;
+ // This will cause the prim to see that the filler shape is not the right
+ // one and try again to build the object.
+ // No race condition with the normal shape setting since the rebuild is at taint time.
+ yprim.ForceBodyShapeRebuild(false /* inTaintTime */);
+ assetFound = true;
+ }
+ else
+ {
+ mismatchIDs = yprim.BaseShape.SculptTexture.ToString() + "/" + asset.ID;
+ }
+ }
+ if (assetFound)
+ yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Fetched;
+ else
+ yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
+ physicsScene.DetailLog("{0},BSShapeCollection,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
+ yprim.LocalID, assetFound, yprim.BaseShape.SculptEntry, mismatchIDs );
+ });
+ }
+ else
+ {
+ xprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
+ physicsScene.Logger.ErrorFormat("{0} Physical object requires asset but no asset provider. Name={1}",
+ LogHeader, physicsScene.Name);
+ }
+ });
+ }
+ else
+ {
+ if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Failed)
+ {
+ physicsScene.Logger.WarnFormat("{0} Mesh failed to fetch asset. obj={1}, texture={2}",
+ LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
+ }
+ }
+ }
+
+ // While we wait for the mesh defining asset to be loaded, stick in a simple box for the object.
+ BSShape fillShape = BSShapeNative.GetReference(physicsScene, prim, BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX);
+ physicsScene.DetailLog("{0},BSShapeCollection.VerifyMeshCreated,boxTempShape", prim.LocalID);
+
+ return fillShape.physShapeInfo;
+ }
+
}
// ============================================================================================================
@@ -199,7 +292,7 @@ public class BSShapeNative : BSShape
physicsScene.Logger.ErrorFormat("{0} BuildPhysicalNativeShape failed. ID={1}, shape={2}",
LogHeader, prim.LocalID, shapeType);
}
- newShape.type = shapeType;
+ newShape.shapeType = shapeType;
newShape.isNativeShape = true;
newShape.shapeKey = (UInt64)shapeKey;
return newShape;
@@ -219,10 +312,11 @@ public class BSShapeMesh : BSShape
public static BSShape GetReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
{
float lod;
- System.UInt64 newMeshKey = BSShapeCollection.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
+ System.UInt64 newMeshKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
physicsScene.DetailLog("{0},BSShapeMesh,getReference,oldKey={1},newKey={2},size={3},lod={4}",
- prim.LocalID, prim.PhysShape.shapeKey.ToString("X"), newMeshKey.ToString("X"), prim.Size, lod);
+ prim.LocalID, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"),
+ newMeshKey.ToString("X"), prim.Size, lod);
BSShapeMesh retMesh = new BSShapeMesh(new BulletShape());
lock (Meshes)
@@ -238,8 +332,8 @@ public class BSShapeMesh : BSShape
BulletShape newShape = retMesh.CreatePhysicalMesh(physicsScene, prim, newMeshKey, prim.BaseShape, prim.Size, lod);
// Check to see if mesh was created (might require an asset).
- newShape = BSShapeCollection.VerifyMeshCreated(physicsScene, newShape, prim);
- if (newShape.type == BSPhysicsShapeType.SHAPE_MESH)
+ newShape = VerifyMeshCreated(physicsScene, newShape, prim);
+ if (newShape.shapeType == BSPhysicsShapeType.SHAPE_MESH)
{
// If a mesh was what was created, remember the built shape for later sharing.
Meshes.Add(newMeshKey, retMesh);
@@ -360,10 +454,10 @@ public class BSShapeHull : BSShape
public static BSShape GetReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
{
float lod;
- System.UInt64 newHullKey = BSShapeCollection.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
+ System.UInt64 newHullKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
physicsScene.DetailLog("{0},BSShapeHull,getReference,oldKey={1},newKey={2},size={3},lod={4}",
- prim.LocalID, prim.PhysShape.shapeKey.ToString("X"), newHullKey.ToString("X"), prim.Size, lod);
+ prim.LocalID, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"), newHullKey.ToString("X"), prim.Size, lod);
BSShapeHull retHull = new BSShapeHull(new BulletShape());
lock (Hulls)
@@ -379,8 +473,8 @@ public class BSShapeHull : BSShape
BulletShape newShape = retHull.CreatePhysicalHull(physicsScene, prim, newHullKey, prim.BaseShape, prim.Size, lod);
// Check to see if mesh was created (might require an asset).
- newShape = BSShapeCollection.VerifyMeshCreated(physicsScene, newShape, prim);
- if (newShape.type == BSPhysicsShapeType.SHAPE_MESH)
+ newShape = VerifyMeshCreated(physicsScene, newShape, prim);
+ if (newShape.shapeType == BSPhysicsShapeType.SHAPE_MESH)
{
// If a mesh was what was created, remember the built shape for later sharing.
Hulls.Add(newHullKey, retHull);
@@ -569,7 +663,6 @@ public class BSShapeHull : BSShape
}
}
-
// ============================================================================================================
public class BSShapeCompound : BSShape
{
@@ -589,9 +682,9 @@ public class BSShapeCompound : BSShape
{
// Failed the sanity check!!
physicsScene.Logger.ErrorFormat("{0} Attempt to free a compound shape that is not compound!! type={1}, ptr={2}",
- LogHeader, physShapeInfo.type, physShapeInfo.AddrString);
+ LogHeader, physShapeInfo.shapeType, physShapeInfo.AddrString);
physicsScene.DetailLog("{0},BSShapeCollection.DereferenceCompound,notACompoundShape,type={1},ptr={2}",
- BSScene.DetailLogZero, physShapeInfo.type, physShapeInfo.AddrString);
+ BSScene.DetailLogZero, physShapeInfo.shapeType, physShapeInfo.AddrString);
return;
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
index 8012d91..906e4f9 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
@@ -104,11 +104,11 @@ public class BulletShape
{
public BulletShape()
{
- type = BSPhysicsShapeType.SHAPE_UNKNOWN;
+ shapeType = BSPhysicsShapeType.SHAPE_UNKNOWN;
shapeKey = (System.UInt64)FixedShapeKey.KEY_NONE;
isNativeShape = false;
}
- public BSPhysicsShapeType type;
+ public BSPhysicsShapeType shapeType;
public System.UInt64 shapeKey;
public bool isNativeShape;
@@ -133,7 +133,7 @@ public class BulletShape
buff.Append(") is its center-of-mass
- OMV.Vector3 centerOfMassW = LinksetRoot.RawPosition;
- if (!disableCOM) // DEBUG DEBUG
- {
- // Compute a center-of-mass in world coordinates.
- centerOfMassW = ComputeLinksetCenterOfMass();
- }
+ OMV.Vector3 centerOfMassW = ComputeLinksetCenterOfMass();
OMV.Quaternion invRootOrientation = OMV.Quaternion.Inverse(LinksetRoot.RawOrientation);
@@ -414,20 +416,7 @@ public sealed class BSLinksetCompound : BSLinkset
OMV.Vector3 centerDisplacement = (centerOfMassW - LinksetRoot.RawPosition) * invRootOrientation;
LinksetRoot.SetEffectiveCenterOfMassW(centerDisplacement);
- // This causes the physical position of the root prim to be offset to accomodate for the displacements
- LinksetRoot.ForcePosition = LinksetRoot.RawPosition;
-
- // Update the local transform for the root child shape so it is offset from the <0,0,0> which is COM
- PhysicsScene.PE.UpdateChildTransform(LinksetRoot.PhysShape.physShapeInfo, 0 /* childIndex ,
- -centerDisplacement,
- OMV.Quaternion.Identity, // LinksetRoot.RawOrientation,
- false /* shouldRecalculateLocalAabb (is done later after linkset built) );
-
- DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,COM,com={1},rootPos={2},centerDisp={3}",
- LinksetRoot.LocalID, centerOfMassW, LinksetRoot.RawPosition, centerDisplacement);
-
- DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,start,rBody={1},rShape={2},numChildren={3}",
- LinksetRoot.LocalID, LinksetRoot.PhysBody, LinksetRoot.PhysShape, NumberOfChildren);
+ // TODO: add phantom root shape to be the center-of-mass
// Add a shape for each of the other children in the linkset
int memberIndex = 1;
@@ -440,56 +429,31 @@ public sealed class BSLinksetCompound : BSLinkset
else
{
cPrim.LinksetChildIndex = memberIndex;
+ }
- if (cPrim.PhysShape.isNativeShape)
- {
- // A native shape is turned into a hull collision shape because native
- // shapes are not shared so we have to hullify it so it will be tracked
- // and freed at the correct time. This also solves the scaling problem
- // (native shapes scale but hull/meshes are assumed to not be).
- // TODO: decide of the native shape can just be used in the compound shape.
- // Use call to CreateGeomNonSpecial().
- BulletShape saveShape = cPrim.PhysShape;
- cPrim.PhysShape.Clear(); // Don't let the create free the child's shape
- PhysicsScene.Shapes.CreateGeomMeshOrHull(cPrim, null);
- BulletShape newShape = cPrim.PhysShape;
- cPrim.PhysShape = saveShape;
-
- OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacement;
- OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
- PhysicsScene.PE.AddChildShapeToCompoundShape(LinksetRoot.PhysShape, newShape, offsetPos, offsetRot);
- DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addNative,indx={1},rShape={2},cShape={3},offPos={4},offRot={5}",
- LinksetRoot.LocalID, memberIndex, LinksetRoot.PhysShape, newShape, offsetPos, offsetRot);
- }
- else
- {
- // For the shared shapes (meshes and hulls), just use the shape in the child.
- // The reference count added here will be decremented when the compound shape
- // is destroyed in BSShapeCollection (the child shapes are looped over and dereferenced).
- if (PhysicsScene.Shapes.ReferenceShape(cPrim.PhysShape))
- {
- PhysicsScene.Logger.ErrorFormat("{0} Rebuilt sharable shape when building linkset! Region={1}, primID={2}, shape={3}",
- LogHeader, PhysicsScene.RegionName, cPrim.LocalID, cPrim.PhysShape);
- }
- OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacement;
- OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
- PhysicsScene.PE.AddChildShapeToCompoundShape(LinksetRoot.PhysShape, cPrim.PhysShape, offsetPos, offsetRot);
- DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addNonNative,indx={1},rShape={2},cShape={3},offPos={4},offRot={5}",
+ BSShape childShape = cPrim.PhysShape;
+ childShape.IncrementReference();
+ OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacement;
+ OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
+ PhysicsScene.PE.AddChildShapeToCompoundShape(LinksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
+ DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChild,indx={1},rShape={2},cShape={3},offPos={4},offRot={5}",
LinksetRoot.LocalID, memberIndex, LinksetRoot.PhysShape, cPrim.PhysShape, offsetPos, offsetRot);
- }
- memberIndex++;
- }
+ memberIndex++;
+
return false; // 'false' says to move onto the next child in the list
});
+ // Sneak the built compound shape in as the shape of the root prim.
+ // Note this doesn't touch the root prim's PhysShape so be sure the manage the difference.
+ PhysicsScene.PE.SetCollisionShape(PhysicsScene.World, LinksetRoot.PhysBody, LinksetShape.physShapeInfo);
+
// With all of the linkset packed into the root prim, it has the mass of everyone.
LinksetMass = ComputeLinksetMass();
LinksetRoot.UpdatePhysicalMassProperties(LinksetMass, true);
// Enable the physical position updator to return the position and rotation of the root shape
PhysicsScene.PE.AddToCollisionFlags(LinksetRoot.PhysBody, CollisionFlags.BS_RETURN_ROOT_COMPOUND_SHAPE);
- */
}
finally
{
--
cgit v1.1
From ad1787770ed02f71feaa002ab689467e187803bb Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 28 Apr 2013 21:50:47 -0700
Subject: BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or
'm_physicsScene' to match coding conventions and reduce confusion.
---
.../Region/Physics/BulletSPlugin/BSCharacter.cs | 112 ++++++------
OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 8 +-
OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 10 +-
.../Physics/BulletSPlugin/BSLinksetCompound.cs | 34 ++--
.../Physics/BulletSPlugin/BSLinksetConstraints.cs | 16 +-
.../Region/Physics/BulletSPlugin/BSPhysObject.cs | 52 +++---
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 188 ++++++++++-----------
.../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 8 +-
.../Physics/BulletSPlugin/BSTerrainHeightmap.cs | 28 +--
.../Physics/BulletSPlugin/BSTerrainManager.cs | 56 +++---
.../Region/Physics/BulletSPlugin/BSTerrainMesh.cs | 52 +++---
11 files changed, 282 insertions(+), 282 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index da23a262..e12fc8e 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -95,18 +95,18 @@ public sealed class BSCharacter : BSPhysObject
// the avatar seeking to reach the motor's target speed.
// This motor runs as a prestep action for the avatar so it will keep the avatar
// standing as well as moving. Destruction of the avatar will destroy the pre-step action.
- m_moveActor = new BSActorAvatarMove(PhysicsScene, this, AvatarMoveActorName);
+ m_moveActor = new BSActorAvatarMove(PhysScene, this, AvatarMoveActorName);
PhysicalActors.Add(AvatarMoveActorName, m_moveActor);
DetailLog("{0},BSCharacter.create,call,size={1},scale={2},density={3},volume={4},mass={5}",
LocalID, _size, Scale, Density, _avatarVolume, RawMass);
// do actual creation in taint time
- PhysicsScene.TaintedObject("BSCharacter.create", delegate()
+ PhysScene.TaintedObject("BSCharacter.create", delegate()
{
DetailLog("{0},BSCharacter.create,taint", LocalID);
// New body and shape into PhysBody and PhysShape
- PhysicsScene.Shapes.GetBodyAndShape(true, PhysicsScene.World, this);
+ PhysScene.Shapes.GetBodyAndShape(true, PhysScene.World, this);
SetPhysicalProperties();
});
@@ -119,18 +119,18 @@ public sealed class BSCharacter : BSPhysObject
base.Destroy();
DetailLog("{0},BSCharacter.Destroy", LocalID);
- PhysicsScene.TaintedObject("BSCharacter.destroy", delegate()
+ PhysScene.TaintedObject("BSCharacter.destroy", delegate()
{
- PhysicsScene.Shapes.DereferenceBody(PhysBody, null /* bodyCallback */);
+ PhysScene.Shapes.DereferenceBody(PhysBody, null /* bodyCallback */);
PhysBody.Clear();
- PhysShape.Dereference(PhysicsScene);
+ PhysShape.Dereference(PhysScene);
PhysShape = new BSShapeNull();
});
}
private void SetPhysicalProperties()
{
- PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, PhysBody);
+ PhysScene.PE.RemoveObjectFromWorld(PhysScene.World, PhysBody);
ZeroMotion(true);
ForcePosition = _position;
@@ -145,35 +145,35 @@ public sealed class BSCharacter : BSPhysObject
// Needs to be reset especially when an avatar is recreated after crossing a region boundry.
Flying = _flying;
- PhysicsScene.PE.SetRestitution(PhysBody, BSParam.AvatarRestitution);
- PhysicsScene.PE.SetMargin(PhysShape.physShapeInfo, PhysicsScene.Params.collisionMargin);
- PhysicsScene.PE.SetLocalScaling(PhysShape.physShapeInfo, Scale);
- PhysicsScene.PE.SetContactProcessingThreshold(PhysBody, BSParam.ContactProcessingThreshold);
+ PhysScene.PE.SetRestitution(PhysBody, BSParam.AvatarRestitution);
+ PhysScene.PE.SetMargin(PhysShape.physShapeInfo, PhysScene.Params.collisionMargin);
+ PhysScene.PE.SetLocalScaling(PhysShape.physShapeInfo, Scale);
+ PhysScene.PE.SetContactProcessingThreshold(PhysBody, BSParam.ContactProcessingThreshold);
if (BSParam.CcdMotionThreshold > 0f)
{
- PhysicsScene.PE.SetCcdMotionThreshold(PhysBody, BSParam.CcdMotionThreshold);
- PhysicsScene.PE.SetCcdSweptSphereRadius(PhysBody, BSParam.CcdSweptSphereRadius);
+ PhysScene.PE.SetCcdMotionThreshold(PhysBody, BSParam.CcdMotionThreshold);
+ PhysScene.PE.SetCcdSweptSphereRadius(PhysBody, BSParam.CcdSweptSphereRadius);
}
UpdatePhysicalMassProperties(RawMass, false);
// Make so capsule does not fall over
- PhysicsScene.PE.SetAngularFactorV(PhysBody, OMV.Vector3.Zero);
+ PhysScene.PE.SetAngularFactorV(PhysBody, OMV.Vector3.Zero);
// The avatar mover sets some parameters.
PhysicalActors.Refresh();
- PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.CF_CHARACTER_OBJECT);
+ PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.CF_CHARACTER_OBJECT);
- PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, PhysBody);
+ PhysScene.PE.AddObjectToWorld(PhysScene.World, PhysBody);
// PhysicsScene.PE.ForceActivationState(PhysBody, ActivationState.ACTIVE_TAG);
- PhysicsScene.PE.ForceActivationState(PhysBody, ActivationState.DISABLE_DEACTIVATION);
- PhysicsScene.PE.UpdateSingleAabb(PhysicsScene.World, PhysBody);
+ PhysScene.PE.ForceActivationState(PhysBody, ActivationState.DISABLE_DEACTIVATION);
+ PhysScene.PE.UpdateSingleAabb(PhysScene.World, PhysBody);
// Do this after the object has been added to the world
PhysBody.collisionType = CollisionType.Avatar;
- PhysBody.ApplyCollisionMask(PhysicsScene);
+ PhysBody.ApplyCollisionMask(PhysScene);
}
@@ -203,14 +203,14 @@ public sealed class BSCharacter : BSPhysObject
DetailLog("{0},BSCharacter.setSize,call,size={1},scale={2},density={3},volume={4},mass={5}",
LocalID, _size, Scale, Density, _avatarVolume, RawMass);
- PhysicsScene.TaintedObject("BSCharacter.setSize", delegate()
+ PhysScene.TaintedObject("BSCharacter.setSize", delegate()
{
if (PhysBody.HasPhysicalBody && PhysShape.physShapeInfo.HasPhysicalShape)
{
- PhysicsScene.PE.SetLocalScaling(PhysShape.physShapeInfo, Scale);
+ PhysScene.PE.SetLocalScaling(PhysShape.physShapeInfo, Scale);
UpdatePhysicalMassProperties(RawMass, true);
// Make sure this change appears as a property update event
- PhysicsScene.PE.PushUpdate(PhysBody);
+ PhysScene.PE.PushUpdate(PhysBody);
}
});
@@ -247,24 +247,24 @@ public sealed class BSCharacter : BSPhysObject
_rotationalVelocity = OMV.Vector3.Zero;
// Zero some other properties directly into the physics engine
- PhysicsScene.TaintedObject(inTaintTime, "BSCharacter.ZeroMotion", delegate()
+ PhysScene.TaintedObject(inTaintTime, "BSCharacter.ZeroMotion", delegate()
{
if (PhysBody.HasPhysicalBody)
- PhysicsScene.PE.ClearAllForces(PhysBody);
+ PhysScene.PE.ClearAllForces(PhysBody);
});
}
public override void ZeroAngularMotion(bool inTaintTime)
{
_rotationalVelocity = OMV.Vector3.Zero;
- PhysicsScene.TaintedObject(inTaintTime, "BSCharacter.ZeroMotion", delegate()
+ PhysScene.TaintedObject(inTaintTime, "BSCharacter.ZeroMotion", delegate()
{
if (PhysBody.HasPhysicalBody)
{
- PhysicsScene.PE.SetInterpolationAngularVelocity(PhysBody, OMV.Vector3.Zero);
- PhysicsScene.PE.SetAngularVelocity(PhysBody, OMV.Vector3.Zero);
+ PhysScene.PE.SetInterpolationAngularVelocity(PhysBody, OMV.Vector3.Zero);
+ PhysScene.PE.SetAngularVelocity(PhysBody, OMV.Vector3.Zero);
// The next also get rid of applied linear force but the linear velocity is untouched.
- PhysicsScene.PE.ClearForces(PhysBody);
+ PhysScene.PE.ClearForces(PhysBody);
}
});
}
@@ -286,7 +286,7 @@ public sealed class BSCharacter : BSPhysObject
set {
_position = value;
- PhysicsScene.TaintedObject("BSCharacter.setPosition", delegate()
+ PhysScene.TaintedObject("BSCharacter.setPosition", delegate()
{
DetailLog("{0},BSCharacter.SetPosition,taint,pos={1},orient={2}", LocalID, _position, _orientation);
PositionSanityCheck();
@@ -296,14 +296,14 @@ public sealed class BSCharacter : BSPhysObject
}
public override OMV.Vector3 ForcePosition {
get {
- _position = PhysicsScene.PE.GetPosition(PhysBody);
+ _position = PhysScene.PE.GetPosition(PhysBody);
return _position;
}
set {
_position = value;
if (PhysBody.HasPhysicalBody)
{
- PhysicsScene.PE.SetTranslation(PhysBody, _position, _orientation);
+ PhysScene.PE.SetTranslation(PhysBody, _position, _orientation);
}
}
}
@@ -317,18 +317,18 @@ public sealed class BSCharacter : BSPhysObject
bool ret = false;
// TODO: check for out of bounds
- if (!PhysicsScene.TerrainManager.IsWithinKnownTerrain(RawPosition))
+ if (!PhysScene.TerrainManager.IsWithinKnownTerrain(RawPosition))
{
// The character is out of the known/simulated area.
// Force the avatar position to be within known. ScenePresence will use the position
// plus the velocity to decide if the avatar is moving out of the region.
- RawPosition = PhysicsScene.TerrainManager.ClampPositionIntoKnownTerrain(RawPosition);
+ RawPosition = PhysScene.TerrainManager.ClampPositionIntoKnownTerrain(RawPosition);
DetailLog("{0},BSCharacter.PositionSanityCheck,notWithinKnownTerrain,clampedPos={1}", LocalID, RawPosition);
return true;
}
// If below the ground, move the avatar up
- float terrainHeight = PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(RawPosition);
+ float terrainHeight = PhysScene.TerrainManager.GetTerrainHeightAtXYZ(RawPosition);
if (Position.Z < terrainHeight)
{
DetailLog("{0},BSCharacter.PositionSanityCheck,adjustForUnderGround,pos={1},terrain={2}", LocalID, _position, terrainHeight);
@@ -337,7 +337,7 @@ public sealed class BSCharacter : BSPhysObject
}
if ((CurrentCollisionFlags & CollisionFlags.BS_FLOATS_ON_WATER) != 0)
{
- float waterHeight = PhysicsScene.TerrainManager.GetWaterLevelAtXYZ(_position);
+ float waterHeight = PhysScene.TerrainManager.GetWaterLevelAtXYZ(_position);
if (Position.Z < waterHeight)
{
_position.Z = waterHeight;
@@ -358,7 +358,7 @@ public sealed class BSCharacter : BSPhysObject
{
// The new position value must be pushed into the physics engine but we can't
// just assign to "Position" because of potential call loops.
- PhysicsScene.TaintedObject(inTaintTime, "BSCharacter.PositionSanityCheck", delegate()
+ PhysScene.TaintedObject(inTaintTime, "BSCharacter.PositionSanityCheck", delegate()
{
DetailLog("{0},BSCharacter.PositionSanityCheck,taint,pos={1},orient={2}", LocalID, _position, _orientation);
ForcePosition = _position;
@@ -376,8 +376,8 @@ public sealed class BSCharacter : BSPhysObject
}
public override void UpdatePhysicalMassProperties(float physMass, bool inWorld)
{
- OMV.Vector3 localInertia = PhysicsScene.PE.CalculateLocalInertia(PhysShape.physShapeInfo, physMass);
- PhysicsScene.PE.SetMassProps(PhysBody, physMass, localInertia);
+ OMV.Vector3 localInertia = PhysScene.PE.CalculateLocalInertia(PhysShape.physShapeInfo, physMass);
+ PhysScene.PE.SetMassProps(PhysBody, physMass, localInertia);
}
public override OMV.Vector3 Force {
@@ -385,11 +385,11 @@ public sealed class BSCharacter : BSPhysObject
set {
RawForce = value;
// m_log.DebugFormat("{0}: Force = {1}", LogHeader, _force);
- PhysicsScene.TaintedObject("BSCharacter.SetForce", delegate()
+ PhysScene.TaintedObject("BSCharacter.SetForce", delegate()
{
DetailLog("{0},BSCharacter.setForce,taint,force={1}", LocalID, RawForce);
if (PhysBody.HasPhysicalBody)
- PhysicsScene.PE.SetObjectForce(PhysBody, RawForce);
+ PhysScene.PE.SetObjectForce(PhysBody, RawForce);
});
}
}
@@ -432,7 +432,7 @@ public sealed class BSCharacter : BSPhysObject
set {
RawVelocity = value;
// m_log.DebugFormat("{0}: set velocity = {1}", LogHeader, RawVelocity);
- PhysicsScene.TaintedObject("BSCharacter.setVelocity", delegate()
+ PhysScene.TaintedObject("BSCharacter.setVelocity", delegate()
{
if (m_moveActor != null)
m_moveActor.SetVelocityAndTarget(RawVelocity, RawVelocity, true /* inTaintTime */);
@@ -445,11 +445,11 @@ public sealed class BSCharacter : BSPhysObject
public override OMV.Vector3 ForceVelocity {
get { return RawVelocity; }
set {
- PhysicsScene.AssertInTaintTime("BSCharacter.ForceVelocity");
+ PhysScene.AssertInTaintTime("BSCharacter.ForceVelocity");
RawVelocity = value;
- PhysicsScene.PE.SetLinearVelocity(PhysBody, RawVelocity);
- PhysicsScene.PE.Activate(PhysBody, true);
+ PhysScene.PE.SetLinearVelocity(PhysBody, RawVelocity);
+ PhysScene.PE.Activate(PhysBody, true);
}
}
public override OMV.Vector3 Torque {
@@ -479,7 +479,7 @@ public sealed class BSCharacter : BSPhysObject
if (_orientation != value)
{
_orientation = value;
- PhysicsScene.TaintedObject("BSCharacter.setOrientation", delegate()
+ PhysScene.TaintedObject("BSCharacter.setOrientation", delegate()
{
ForceOrientation = _orientation;
});
@@ -491,7 +491,7 @@ public sealed class BSCharacter : BSPhysObject
{
get
{
- _orientation = PhysicsScene.PE.GetOrientation(PhysBody);
+ _orientation = PhysScene.PE.GetOrientation(PhysBody);
return _orientation;
}
set
@@ -500,7 +500,7 @@ public sealed class BSCharacter : BSPhysObject
if (PhysBody.HasPhysicalBody)
{
// _position = PhysicsScene.PE.GetPosition(BSBody);
- PhysicsScene.PE.SetTranslation(PhysBody, _position, _orientation);
+ PhysScene.PE.SetTranslation(PhysBody, _position, _orientation);
}
}
}
@@ -549,14 +549,14 @@ public sealed class BSCharacter : BSPhysObject
public override bool FloatOnWater {
set {
_floatOnWater = value;
- PhysicsScene.TaintedObject("BSCharacter.setFloatOnWater", delegate()
+ PhysScene.TaintedObject("BSCharacter.setFloatOnWater", delegate()
{
if (PhysBody.HasPhysicalBody)
{
if (_floatOnWater)
- CurrentCollisionFlags = PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
+ CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
else
- CurrentCollisionFlags = PhysicsScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
+ CurrentCollisionFlags = PhysScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
}
});
}
@@ -577,7 +577,7 @@ public sealed class BSCharacter : BSPhysObject
public override float Buoyancy {
get { return _buoyancy; }
set { _buoyancy = value;
- PhysicsScene.TaintedObject("BSCharacter.setBuoyancy", delegate()
+ PhysScene.TaintedObject("BSCharacter.setBuoyancy", delegate()
{
DetailLog("{0},BSCharacter.setBuoyancy,taint,buoy={1}", LocalID, _buoyancy);
ForceBuoyancy = _buoyancy;
@@ -587,7 +587,7 @@ public sealed class BSCharacter : BSPhysObject
public override float ForceBuoyancy {
get { return _buoyancy; }
set {
- PhysicsScene.AssertInTaintTime("BSCharacter.ForceBuoyancy");
+ PhysScene.AssertInTaintTime("BSCharacter.ForceBuoyancy");
_buoyancy = value;
DetailLog("{0},BSCharacter.setForceBuoyancy,taint,buoy={1}", LocalID, _buoyancy);
@@ -595,7 +595,7 @@ public sealed class BSCharacter : BSPhysObject
float grav = BSParam.Gravity * (1f - _buoyancy);
Gravity = new OMV.Vector3(0f, 0f, grav);
if (PhysBody.HasPhysicalBody)
- PhysicsScene.PE.SetGravity(PhysBody, Gravity);
+ PhysScene.PE.SetGravity(PhysBody, Gravity);
}
}
@@ -613,7 +613,7 @@ public sealed class BSCharacter : BSPhysObject
public override void AddForce(OMV.Vector3 force, bool pushforce)
{
// Since this force is being applied in only one step, make this a force per second.
- OMV.Vector3 addForce = force / PhysicsScene.LastTimeStep;
+ OMV.Vector3 addForce = force / PhysScene.LastTimeStep;
AddForce(addForce, pushforce, false);
}
private void AddForce(OMV.Vector3 force, bool pushforce, bool inTaintTime) {
@@ -622,13 +622,13 @@ public sealed class BSCharacter : BSPhysObject
OMV.Vector3 addForce = Util.ClampV(force, BSParam.MaxAddForceMagnitude);
// DetailLog("{0},BSCharacter.addForce,call,force={1}", LocalID, addForce);
- PhysicsScene.TaintedObject(inTaintTime, "BSCharacter.AddForce", delegate()
+ PhysScene.TaintedObject(inTaintTime, "BSCharacter.AddForce", delegate()
{
// Bullet adds this central force to the total force for this tick
// DetailLog("{0},BSCharacter.addForce,taint,force={1}", LocalID, addForce);
if (PhysBody.HasPhysicalBody)
{
- PhysicsScene.PE.ApplyCentralForce(PhysBody, addForce);
+ PhysScene.PE.ApplyCentralForce(PhysBody, addForce);
}
});
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index e2e807e..56d2415 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -789,7 +789,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
if ((m_knownHas & m_knownChangedTerrainHeight) == 0 || pos != lastRememberedHeightPos)
{
lastRememberedHeightPos = pos;
- m_knownTerrainHeight = ControllingPrim.PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(pos);
+ m_knownTerrainHeight = ControllingPrim.PhysScene.TerrainManager.GetTerrainHeightAtXYZ(pos);
m_knownHas |= m_knownChangedTerrainHeight;
}
return m_knownTerrainHeight;
@@ -801,7 +801,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
{
if ((m_knownHas & m_knownChangedWaterLevel) == 0)
{
- m_knownWaterLevel = ControllingPrim.PhysicsScene.TerrainManager.GetWaterLevelAtXYZ(pos);
+ m_knownWaterLevel = ControllingPrim.PhysScene.TerrainManager.GetWaterLevelAtXYZ(pos);
m_knownHas |= m_knownChangedWaterLevel;
}
return (float)m_knownWaterLevel;
@@ -1637,8 +1637,8 @@ namespace OpenSim.Region.Physics.BulletSPlugin
// Invoke the detailed logger and output something if it's enabled.
private void VDetailLog(string msg, params Object[] args)
{
- if (ControllingPrim.PhysicsScene.VehicleLoggingEnabled)
- ControllingPrim.PhysicsScene.DetailLog(msg, args);
+ if (ControllingPrim.PhysScene.VehicleLoggingEnabled)
+ ControllingPrim.PhysScene.DetailLog(msg, args);
}
}
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index df1dd34..6d0d0eb 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -80,7 +80,7 @@ public abstract class BSLinkset
public BSPrimLinkable LinksetRoot { get; protected set; }
- public BSScene PhysicsScene { get; private set; }
+ protected BSScene m_physicsScene { get; private set; }
static int m_nextLinksetID = 1;
public int LinksetID { get; private set; }
@@ -115,7 +115,7 @@ public abstract class BSLinkset
// We create LOTS of linksets.
if (m_nextLinksetID <= 0)
m_nextLinksetID = 1;
- PhysicsScene = scene;
+ m_physicsScene = scene;
LinksetRoot = parent;
m_children = new HashSet();
LinksetMass = parent.RawMass;
@@ -158,7 +158,7 @@ public abstract class BSLinkset
}
// The child is down to a linkset of just itself
- return BSLinkset.Factory(PhysicsScene, child);
+ return BSLinkset.Factory(m_physicsScene, child);
}
// Return 'true' if the passed object is the root object of this linkset
@@ -316,8 +316,8 @@ public abstract class BSLinkset
// Invoke the detailed logger and output something if it's enabled.
protected void DetailLog(string msg, params Object[] args)
{
- if (PhysicsScene.PhysicsLogging.Enabled)
- PhysicsScene.DetailLog(msg, args);
+ if (m_physicsScene.PhysicsLogging.Enabled)
+ m_physicsScene.DetailLog(msg, args);
}
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index be01808..01ada3f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -121,7 +121,7 @@ public sealed class BSLinksetCompound : BSLinkset
// If a linkset with just a root prim (simple non-linked prim) don't bother rebuilding.
if (!Rebuilding && HasAnyChildren)
{
- PhysicsScene.PostTaintObject("BSLinksetCompound.ScheduleRebuild", LinksetRoot.LocalID, delegate()
+ m_physicsScene.PostTaintObject("BSLinksetCompound.ScheduleRebuild", LinksetRoot.LocalID, delegate()
{
if (HasAnyChildren)
RecomputeLinksetCompound();
@@ -147,10 +147,10 @@ public sealed class BSLinksetCompound : BSLinkset
{
// The origional prims are removed from the world as the shape of the root compound
// shape takes over.
- PhysicsScene.PE.AddToCollisionFlags(child.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
- PhysicsScene.PE.ForceActivationState(child.PhysBody, ActivationState.DISABLE_SIMULATION);
+ m_physicsScene.PE.AddToCollisionFlags(child.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
+ m_physicsScene.PE.ForceActivationState(child.PhysBody, ActivationState.DISABLE_SIMULATION);
// We don't want collisions from the old linkset children.
- PhysicsScene.PE.RemoveFromCollisionFlags(child.PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
+ m_physicsScene.PE.RemoveFromCollisionFlags(child.PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
child.PhysBody.collisionType = CollisionType.LinksetChild;
@@ -175,12 +175,12 @@ public sealed class BSLinksetCompound : BSLinkset
else
{
// The non-physical children can come back to life.
- PhysicsScene.PE.RemoveFromCollisionFlags(child.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
+ m_physicsScene.PE.RemoveFromCollisionFlags(child.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
child.PhysBody.collisionType = CollisionType.LinksetChild;
// Don't force activation so setting of DISABLE_SIMULATION can stay if used.
- PhysicsScene.PE.Activate(child.PhysBody, false);
+ m_physicsScene.PE.Activate(child.PhysBody, false);
ret = true;
}
return ret;
@@ -196,7 +196,7 @@ public sealed class BSLinksetCompound : BSLinkset
// but it also means all the child positions get updated.
// What would cause an unnecessary rebuild so we make sure the linkset is in a
// region before bothering to do a rebuild.
- if (!IsRoot(updated) && PhysicsScene.TerrainManager.IsWithinKnownTerrain(LinksetRoot.RawPosition))
+ if (!IsRoot(updated) && m_physicsScene.TerrainManager.IsWithinKnownTerrain(LinksetRoot.RawPosition))
{
// If a child of the linkset is updating only the position or rotation, that can be done
// without rebuilding the linkset.
@@ -209,21 +209,21 @@ public sealed class BSLinksetCompound : BSLinkset
if ((whichUpdated & ~(UpdatedProperties.Position | UpdatedProperties.Orientation)) == 0)
{
// Find the physical instance of the child
- if (LinksetRoot.PhysShape.HasPhysicalShape && PhysicsScene.PE.IsCompound(LinksetRoot.PhysShape.physShapeInfo))
+ if (LinksetRoot.PhysShape.HasPhysicalShape && m_physicsScene.PE.IsCompound(LinksetRoot.PhysShape.physShapeInfo))
{
// It is possible that the linkset is still under construction and the child is not yet
// inserted into the compound shape. A rebuild of the linkset in a pre-step action will
// build the whole thing with the new position or rotation.
// The index must be checked because Bullet references the child array but does no validity
// checking of the child index passed.
- int numLinksetChildren = PhysicsScene.PE.GetNumberOfCompoundChildren(LinksetRoot.PhysShape.physShapeInfo);
+ int numLinksetChildren = m_physicsScene.PE.GetNumberOfCompoundChildren(LinksetRoot.PhysShape.physShapeInfo);
if (updated.LinksetChildIndex < numLinksetChildren)
{
- BulletShape linksetChildShape = PhysicsScene.PE.GetChildShapeFromCompoundShapeIndex(LinksetRoot.PhysShape.physShapeInfo, updated.LinksetChildIndex);
+ BulletShape linksetChildShape = m_physicsScene.PE.GetChildShapeFromCompoundShapeIndex(LinksetRoot.PhysShape.physShapeInfo, updated.LinksetChildIndex);
if (linksetChildShape.HasPhysicalShape)
{
// Found the child shape within the compound shape
- PhysicsScene.PE.UpdateChildTransform(LinksetRoot.PhysShape.physShapeInfo, updated.LinksetChildIndex,
+ m_physicsScene.PE.UpdateChildTransform(LinksetRoot.PhysShape.physShapeInfo, updated.LinksetChildIndex,
updated.RawPosition - LinksetRoot.RawPosition,
updated.RawOrientation * OMV.Quaternion.Inverse(LinksetRoot.RawOrientation),
true /* shouldRecalculateLocalAabb */);
@@ -401,9 +401,9 @@ public sealed class BSLinksetCompound : BSLinkset
// Here we build the compound shape made up of all the children.
// Free up any shape we'd previously built.
- LinksetShape.Dereference(PhysicsScene);
+ LinksetShape.Dereference(m_physicsScene);
- LinksetShape = BSShapeCompound.GetReference(PhysicsScene, LinksetRoot);
+ LinksetShape = BSShapeCompound.GetReference(m_physicsScene, LinksetRoot);
// The center of mass for the linkset is the geometric center of the group.
// Compute a displacement for each component so it is relative to the center-of-mass.
@@ -435,7 +435,7 @@ public sealed class BSLinksetCompound : BSLinkset
childShape.IncrementReference();
OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacement;
OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
- PhysicsScene.PE.AddChildShapeToCompoundShape(LinksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
+ m_physicsScene.PE.AddChildShapeToCompoundShape(LinksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChild,indx={1},rShape={2},cShape={3},offPos={4},offRot={5}",
LinksetRoot.LocalID, memberIndex, LinksetRoot.PhysShape, cPrim.PhysShape, offsetPos, offsetRot);
@@ -446,14 +446,14 @@ public sealed class BSLinksetCompound : BSLinkset
// Sneak the built compound shape in as the shape of the root prim.
// Note this doesn't touch the root prim's PhysShape so be sure the manage the difference.
- PhysicsScene.PE.SetCollisionShape(PhysicsScene.World, LinksetRoot.PhysBody, LinksetShape.physShapeInfo);
+ m_physicsScene.PE.SetCollisionShape(m_physicsScene.World, LinksetRoot.PhysBody, LinksetShape.physShapeInfo);
// With all of the linkset packed into the root prim, it has the mass of everyone.
LinksetMass = ComputeLinksetMass();
LinksetRoot.UpdatePhysicalMassProperties(LinksetMass, true);
// Enable the physical position updator to return the position and rotation of the root shape
- PhysicsScene.PE.AddToCollisionFlags(LinksetRoot.PhysBody, CollisionFlags.BS_RETURN_ROOT_COMPOUND_SHAPE);
+ m_physicsScene.PE.AddToCollisionFlags(LinksetRoot.PhysBody, CollisionFlags.BS_RETURN_ROOT_COMPOUND_SHAPE);
}
finally
{
@@ -461,7 +461,7 @@ public sealed class BSLinksetCompound : BSLinkset
}
// See that the Aabb surrounds the new shape
- PhysicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetRoot.PhysShape.physShapeInfo);
+ m_physicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetRoot.PhysShape.physShapeInfo);
}
}
}
\ No newline at end of file
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index 1811772..a06a44d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -51,7 +51,7 @@ public sealed class BSLinksetConstraints : BSLinkset
if (HasAnyChildren && IsRoot(requestor))
{
// Queue to happen after all the other taint processing
- PhysicsScene.PostTaintObject("BSLinksetContraints.Refresh", requestor.LocalID, delegate()
+ m_physicsScene.PostTaintObject("BSLinksetContraints.Refresh", requestor.LocalID, delegate()
{
if (HasAnyChildren && IsRoot(requestor))
RecomputeLinksetConstraints();
@@ -142,7 +142,7 @@ public sealed class BSLinksetConstraints : BSLinkset
rootx.LocalID, rootx.PhysBody.AddrString,
childx.LocalID, childx.PhysBody.AddrString);
- PhysicsScene.TaintedObject("BSLinksetConstraints.RemoveChildFromLinkset", delegate()
+ m_physicsScene.TaintedObject("BSLinksetConstraints.RemoveChildFromLinkset", delegate()
{
PhysicallyUnlinkAChildFromRoot(rootx, childx);
});
@@ -187,7 +187,7 @@ public sealed class BSLinksetConstraints : BSLinkset
// http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?t=4818
BSConstraint6Dof constrain = new BSConstraint6Dof(
- PhysicsScene.World, rootPrim.PhysBody, childPrim.PhysBody, midPoint, true, true );
+ m_physicsScene.World, rootPrim.PhysBody, childPrim.PhysBody, midPoint, true, true );
// PhysicsScene.World, childPrim.BSBody, rootPrim.BSBody, midPoint, true, true );
/* NOTE: below is an attempt to build constraint with full frame computation, etc.
@@ -216,7 +216,7 @@ public sealed class BSLinksetConstraints : BSLinkset
// ==================================================================================
*/
- PhysicsScene.Constraints.AddConstraint(constrain);
+ m_physicsScene.Constraints.AddConstraint(constrain);
// zero linear and angular limits makes the objects unable to move in relation to each other
constrain.SetLinearLimits(OMV.Vector3.Zero, OMV.Vector3.Zero);
@@ -248,10 +248,10 @@ public sealed class BSLinksetConstraints : BSLinkset
childPrim.LocalID, childPrim.PhysBody.AddrString);
// Find the constraint for this link and get rid of it from the overall collection and from my list
- if (PhysicsScene.Constraints.RemoveAndDestroyConstraint(rootPrim.PhysBody, childPrim.PhysBody))
+ if (m_physicsScene.Constraints.RemoveAndDestroyConstraint(rootPrim.PhysBody, childPrim.PhysBody))
{
// Make the child refresh its location
- PhysicsScene.PE.PushUpdate(childPrim.PhysBody);
+ m_physicsScene.PE.PushUpdate(childPrim.PhysBody);
ret = true;
}
@@ -265,7 +265,7 @@ public sealed class BSLinksetConstraints : BSLinkset
{
DetailLog("{0},BSLinksetConstraint.PhysicallyUnlinkAllChildren,taint", rootPrim.LocalID);
- return PhysicsScene.Constraints.RemoveAndDestroyConstraint(rootPrim.PhysBody);
+ return m_physicsScene.Constraints.RemoveAndDestroyConstraint(rootPrim.PhysBody);
}
// Call each of the constraints that make up this linkset and recompute the
@@ -289,7 +289,7 @@ public sealed class BSLinksetConstraints : BSLinkset
child.UpdatePhysicalMassProperties(linksetMass, true);
BSConstraint constrain;
- if (!PhysicsScene.Constraints.TryGetConstraint(LinksetRoot.PhysBody, child.PhysBody, out constrain))
+ if (!m_physicsScene.Constraints.TryGetConstraint(LinksetRoot.PhysBody, child.PhysBody, out constrain))
{
// If constraint doesn't exist yet, create it.
constrain = BuildConstraint(LinksetRoot, child);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index b6eb619..6a3ada2 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -72,14 +72,14 @@ public abstract class BSPhysObject : PhysicsActor
}
protected BSPhysObject(BSScene parentScene, uint localID, string name, string typeName)
{
- PhysicsScene = parentScene;
+ PhysScene = parentScene;
LocalID = localID;
PhysObjectName = name;
Name = name; // PhysicsActor also has the name of the object. Someday consolidate.
TypeName = typeName;
// The collection of things that push me around
- PhysicalActors = new BSActorCollection(PhysicsScene);
+ PhysicalActors = new BSActorCollection(PhysScene);
// Initialize variables kept in base.
GravModifier = 1.0f;
@@ -112,13 +112,13 @@ public abstract class BSPhysObject : PhysicsActor
public virtual void Destroy()
{
PhysicalActors.Enable(false);
- PhysicsScene.TaintedObject("BSPhysObject.Destroy", delegate()
+ PhysScene.TaintedObject("BSPhysObject.Destroy", delegate()
{
PhysicalActors.Dispose();
});
}
- public BSScene PhysicsScene { get; protected set; }
+ public BSScene PhysScene { get; protected set; }
// public override uint LocalID { get; set; } // Use the LocalID definition in PhysicsActor
public string PhysObjectName { get; protected set; }
public string TypeName { get; protected set; }
@@ -270,7 +270,7 @@ public abstract class BSPhysObject : PhysicsActor
public void ActivateIfPhysical(bool forceIt)
{
if (IsPhysical && PhysBody.HasPhysicalBody)
- PhysicsScene.PE.Activate(PhysBody, forceIt);
+ PhysScene.PE.Activate(PhysBody, forceIt);
}
// 'actors' act on the physical object to change or constrain its motion. These can range from
@@ -333,29 +333,29 @@ public abstract class BSPhysObject : PhysicsActor
protected long CollisionAccumulation { get; set; }
public override bool IsColliding {
- get { return (CollidingStep == PhysicsScene.SimulationStep); }
+ get { return (CollidingStep == PhysScene.SimulationStep); }
set {
if (value)
- CollidingStep = PhysicsScene.SimulationStep;
+ CollidingStep = PhysScene.SimulationStep;
else
CollidingStep = 0;
}
}
public override bool CollidingGround {
- get { return (CollidingGroundStep == PhysicsScene.SimulationStep); }
+ get { return (CollidingGroundStep == PhysScene.SimulationStep); }
set
{
if (value)
- CollidingGroundStep = PhysicsScene.SimulationStep;
+ CollidingGroundStep = PhysScene.SimulationStep;
else
CollidingGroundStep = 0;
}
}
public override bool CollidingObj {
- get { return (CollidingObjectStep == PhysicsScene.SimulationStep); }
+ get { return (CollidingObjectStep == PhysScene.SimulationStep); }
set {
if (value)
- CollidingObjectStep = PhysicsScene.SimulationStep;
+ CollidingObjectStep = PhysScene.SimulationStep;
else
CollidingObjectStep = 0;
}
@@ -380,14 +380,14 @@ public abstract class BSPhysObject : PhysicsActor
bool ret = false;
// The following lines make IsColliding(), CollidingGround() and CollidingObj work
- CollidingStep = PhysicsScene.SimulationStep;
- if (collidingWith <= PhysicsScene.TerrainManager.HighestTerrainID)
+ CollidingStep = PhysScene.SimulationStep;
+ if (collidingWith <= PhysScene.TerrainManager.HighestTerrainID)
{
- CollidingGroundStep = PhysicsScene.SimulationStep;
+ CollidingGroundStep = PhysScene.SimulationStep;
}
else
{
- CollidingObjectStep = PhysicsScene.SimulationStep;
+ CollidingObjectStep = PhysScene.SimulationStep;
}
CollisionAccumulation++;
@@ -397,10 +397,10 @@ public abstract class BSPhysObject : PhysicsActor
// Make a collection of the collisions that happened the last simulation tick.
// This is different than the collection created for sending up to the simulator as it is cleared every tick.
- if (CollisionsLastTickStep != PhysicsScene.SimulationStep)
+ if (CollisionsLastTickStep != PhysScene.SimulationStep)
{
CollisionsLastTick = new CollisionEventUpdate();
- CollisionsLastTickStep = PhysicsScene.SimulationStep;
+ CollisionsLastTickStep = PhysScene.SimulationStep;
}
CollisionsLastTick.AddCollider(collidingWith, new ContactPoint(contactPoint, contactNormal, pentrationDepth));
@@ -427,9 +427,9 @@ public abstract class BSPhysObject : PhysicsActor
bool force = (CollisionCollection.Count == 0 && CollisionsLastReported.Count != 0);
// throttle the collisions to the number of milliseconds specified in the subscription
- if (force || (PhysicsScene.SimulationNowTime >= NextCollisionOkTime))
+ if (force || (PhysScene.SimulationNowTime >= NextCollisionOkTime))
{
- NextCollisionOkTime = PhysicsScene.SimulationNowTime + SubscribedEventsMs;
+ NextCollisionOkTime = PhysScene.SimulationNowTime + SubscribedEventsMs;
// We are called if we previously had collisions. If there are no collisions
// this time, send up one last empty event so OpenSim can sense collision end.
@@ -464,10 +464,10 @@ public abstract class BSPhysObject : PhysicsActor
// make sure first collision happens
NextCollisionOkTime = Util.EnvironmentTickCountSubtract(SubscribedEventsMs);
- PhysicsScene.TaintedObject(TypeName+".SubscribeEvents", delegate()
+ PhysScene.TaintedObject(TypeName+".SubscribeEvents", delegate()
{
if (PhysBody.HasPhysicalBody)
- CurrentCollisionFlags = PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
+ CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
});
}
else
@@ -479,11 +479,11 @@ public abstract class BSPhysObject : PhysicsActor
public override void UnSubscribeEvents() {
// DetailLog("{0},{1}.UnSubscribeEvents,unsubscribing", LocalID, TypeName);
SubscribedEventsMs = 0;
- PhysicsScene.TaintedObject(TypeName+".UnSubscribeEvents", delegate()
+ PhysScene.TaintedObject(TypeName+".UnSubscribeEvents", delegate()
{
// Make sure there is a body there because sometimes destruction happens in an un-ideal order.
if (PhysBody.HasPhysicalBody)
- CurrentCollisionFlags = PhysicsScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
+ CurrentCollisionFlags = PhysScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
});
}
// Return 'true' if the simulator wants collision events
@@ -497,7 +497,7 @@ public abstract class BSPhysObject : PhysicsActor
{
// Scale the collision count by the time since the last collision.
// The "+1" prevents dividing by zero.
- long timeAgo = PhysicsScene.SimulationStep - CollidingStep + 1;
+ long timeAgo = PhysScene.SimulationStep - CollidingStep + 1;
CollisionScore = CollisionAccumulation / timeAgo;
}
public override float CollisionScore { get; set; }
@@ -524,8 +524,8 @@ public abstract class BSPhysObject : PhysicsActor
// High performance detailed logging routine used by the physical objects.
protected void DetailLog(string msg, params Object[] args)
{
- if (PhysicsScene.PhysicsLogging.Enabled)
- PhysicsScene.DetailLog(msg, args);
+ if (PhysScene.PhysicsLogging.Enabled)
+ PhysScene.DetailLog(msg, args);
}
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 5d12338..0d45579 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -101,21 +101,21 @@ public class BSPrim : BSPhysObject
_isVolumeDetect = false;
// We keep a handle to the vehicle actor so we can set vehicle parameters later.
- VehicleActor = new BSDynamics(PhysicsScene, this, VehicleActorName);
+ VehicleActor = new BSDynamics(PhysScene, this, VehicleActorName);
PhysicalActors.Add(VehicleActorName, VehicleActor);
_mass = CalculateMass();
// DetailLog("{0},BSPrim.constructor,call", LocalID);
// do the actual object creation at taint time
- PhysicsScene.TaintedObject("BSPrim.create", delegate()
+ PhysScene.TaintedObject("BSPrim.create", delegate()
{
// Make sure the object is being created with some sanity.
ExtremeSanityCheck(true /* inTaintTime */);
CreateGeomAndObject(true);
- CurrentCollisionFlags = PhysicsScene.PE.GetCollisionFlags(PhysBody);
+ CurrentCollisionFlags = PhysScene.PE.GetCollisionFlags(PhysBody);
});
}
@@ -128,13 +128,13 @@ public class BSPrim : BSPhysObject
// Undo any vehicle properties
this.VehicleType = (int)Vehicle.TYPE_NONE;
- PhysicsScene.TaintedObject("BSPrim.Destroy", delegate()
+ PhysScene.TaintedObject("BSPrim.Destroy", delegate()
{
DetailLog("{0},BSPrim.Destroy,taint,", LocalID);
// If there are physical body and shape, release my use of same.
- PhysicsScene.Shapes.DereferenceBody(PhysBody, null);
+ PhysScene.Shapes.DereferenceBody(PhysBody, null);
PhysBody.Clear();
- PhysShape.Dereference(PhysicsScene);
+ PhysShape.Dereference(PhysScene);
PhysShape = new BSShapeNull();
});
}
@@ -163,7 +163,7 @@ public class BSPrim : BSPhysObject
}
public override bool ForceBodyShapeRebuild(bool inTaintTime)
{
- PhysicsScene.TaintedObject(inTaintTime, "BSPrim.ForceBodyShapeRebuild", delegate()
+ PhysScene.TaintedObject(inTaintTime, "BSPrim.ForceBodyShapeRebuild", delegate()
{
_mass = CalculateMass(); // changing the shape changes the mass
CreateGeomAndObject(true);
@@ -180,7 +180,7 @@ public class BSPrim : BSPhysObject
if (value != _isSelected)
{
_isSelected = value;
- PhysicsScene.TaintedObject("BSPrim.setSelected", delegate()
+ PhysScene.TaintedObject("BSPrim.setSelected", delegate()
{
DetailLog("{0},BSPrim.selected,taint,selected={1}", LocalID, _isSelected);
SetObjectDynamic(false);
@@ -226,23 +226,23 @@ public class BSPrim : BSPhysObject
_rotationalVelocity = OMV.Vector3.Zero;
// Zero some other properties in the physics engine
- PhysicsScene.TaintedObject(inTaintTime, "BSPrim.ZeroMotion", delegate()
+ PhysScene.TaintedObject(inTaintTime, "BSPrim.ZeroMotion", delegate()
{
if (PhysBody.HasPhysicalBody)
- PhysicsScene.PE.ClearAllForces(PhysBody);
+ PhysScene.PE.ClearAllForces(PhysBody);
});
}
public override void ZeroAngularMotion(bool inTaintTime)
{
_rotationalVelocity = OMV.Vector3.Zero;
// Zero some other properties in the physics engine
- PhysicsScene.TaintedObject(inTaintTime, "BSPrim.ZeroMotion", delegate()
+ PhysScene.TaintedObject(inTaintTime, "BSPrim.ZeroMotion", delegate()
{
// DetailLog("{0},BSPrim.ZeroAngularMotion,call,rotVel={1}", LocalID, _rotationalVelocity);
if (PhysBody.HasPhysicalBody)
{
- PhysicsScene.PE.SetInterpolationAngularVelocity(PhysBody, _rotationalVelocity);
- PhysicsScene.PE.SetAngularVelocity(PhysBody, _rotationalVelocity);
+ PhysScene.PE.SetInterpolationAngularVelocity(PhysBody, _rotationalVelocity);
+ PhysScene.PE.SetAngularVelocity(PhysBody, _rotationalVelocity);
}
});
}
@@ -260,11 +260,11 @@ public class BSPrim : BSPhysObject
EnableActor(LockedAxis != LockedAxisFree, LockedAxisActorName, delegate()
{
- return new BSActorLockAxis(PhysicsScene, this, LockedAxisActorName);
+ return new BSActorLockAxis(PhysScene, this, LockedAxisActorName);
});
// Update parameters so the new actor's Refresh() action is called at the right time.
- PhysicsScene.TaintedObject("BSPrim.LockAngularMotion", delegate()
+ PhysScene.TaintedObject("BSPrim.LockAngularMotion", delegate()
{
UpdatePhysicalParameters();
});
@@ -294,7 +294,7 @@ public class BSPrim : BSPhysObject
_position = value;
PositionSanityCheck(false);
- PhysicsScene.TaintedObject("BSPrim.setPosition", delegate()
+ PhysScene.TaintedObject("BSPrim.setPosition", delegate()
{
DetailLog("{0},BSPrim.SetPosition,taint,pos={1},orient={2}", LocalID, _position, _orientation);
ForcePosition = _position;
@@ -304,14 +304,14 @@ public class BSPrim : BSPhysObject
public override OMV.Vector3 ForcePosition {
get {
- _position = PhysicsScene.PE.GetPosition(PhysBody);
+ _position = PhysScene.PE.GetPosition(PhysBody);
return _position;
}
set {
_position = value;
if (PhysBody.HasPhysicalBody)
{
- PhysicsScene.PE.SetTranslation(PhysBody, _position, _orientation);
+ PhysScene.PE.SetTranslation(PhysBody, _position, _orientation);
ActivateIfPhysical(false);
}
}
@@ -328,7 +328,7 @@ public class BSPrim : BSPhysObject
if (!IsPhysicallyActive)
return ret;
- if (!PhysicsScene.TerrainManager.IsWithinKnownTerrain(RawPosition))
+ if (!PhysScene.TerrainManager.IsWithinKnownTerrain(RawPosition))
{
// The physical object is out of the known/simulated area.
// Upper levels of code will handle the transition to other areas so, for
@@ -336,7 +336,7 @@ public class BSPrim : BSPhysObject
return ret;
}
- float terrainHeight = PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(RawPosition);
+ float terrainHeight = PhysScene.TerrainManager.GetTerrainHeightAtXYZ(RawPosition);
OMV.Vector3 upForce = OMV.Vector3.Zero;
float approxSize = Math.Max(Size.X, Math.Max(Size.Y, Size.Z));
if ((RawPosition.Z + approxSize / 2f) < terrainHeight)
@@ -357,7 +357,7 @@ public class BSPrim : BSPhysObject
if ((CurrentCollisionFlags & CollisionFlags.BS_FLOATS_ON_WATER) != 0)
{
- float waterHeight = PhysicsScene.TerrainManager.GetWaterLevelAtXYZ(_position);
+ float waterHeight = PhysScene.TerrainManager.GetWaterLevelAtXYZ(_position);
// TODO: a floating motor so object will bob in the water
if (Math.Abs(RawPosition.Z - waterHeight) > 0.1f)
{
@@ -365,7 +365,7 @@ public class BSPrim : BSPhysObject
upForce.Z = (waterHeight - RawPosition.Z) * 1f;
// Apply upforce and overcome gravity.
- OMV.Vector3 correctionForce = upForce - PhysicsScene.DefaultGravity;
+ OMV.Vector3 correctionForce = upForce - PhysScene.DefaultGravity;
DetailLog("{0},BSPrim.PositionSanityCheck,applyForce,pos={1},upForce={2},correctionForce={3}", LocalID, _position, upForce, correctionForce);
AddForce(correctionForce, false, inTaintTime);
ret = true;
@@ -431,10 +431,10 @@ public class BSPrim : BSPhysObject
{
if (IsStatic)
{
- PhysicsScene.PE.SetGravity(PhysBody, PhysicsScene.DefaultGravity);
+ PhysScene.PE.SetGravity(PhysBody, PhysScene.DefaultGravity);
Inertia = OMV.Vector3.Zero;
- PhysicsScene.PE.SetMassProps(PhysBody, 0f, Inertia);
- PhysicsScene.PE.UpdateInertiaTensor(PhysBody);
+ PhysScene.PE.SetMassProps(PhysBody, 0f, Inertia);
+ PhysScene.PE.UpdateInertiaTensor(PhysBody);
}
else
{
@@ -443,16 +443,16 @@ public class BSPrim : BSPhysObject
// Changing interesting properties doesn't change proxy and collision cache
// information. The Bullet solution is to re-add the object to the world
// after parameters are changed.
- PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, PhysBody);
+ PhysScene.PE.RemoveObjectFromWorld(PhysScene.World, PhysBody);
}
// The computation of mass props requires gravity to be set on the object.
Gravity = ComputeGravity(Buoyancy);
- PhysicsScene.PE.SetGravity(PhysBody, Gravity);
+ PhysScene.PE.SetGravity(PhysBody, Gravity);
- Inertia = PhysicsScene.PE.CalculateLocalInertia(PhysShape.physShapeInfo, physMass);
- PhysicsScene.PE.SetMassProps(PhysBody, physMass, Inertia);
- PhysicsScene.PE.UpdateInertiaTensor(PhysBody);
+ Inertia = PhysScene.PE.CalculateLocalInertia(PhysShape.physShapeInfo, physMass);
+ PhysScene.PE.SetMassProps(PhysBody, physMass, Inertia);
+ PhysScene.PE.UpdateInertiaTensor(PhysBody);
DetailLog("{0},BSPrim.UpdateMassProperties,mass={1},localInertia={2},grav={3},inWorld={4}",
LocalID, physMass, Inertia, Gravity, inWorld);
@@ -468,7 +468,7 @@ public class BSPrim : BSPhysObject
// Return what gravity should be set to this very moment
public OMV.Vector3 ComputeGravity(float buoyancy)
{
- OMV.Vector3 ret = PhysicsScene.DefaultGravity;
+ OMV.Vector3 ret = PhysScene.DefaultGravity;
if (!IsStatic)
{
@@ -497,7 +497,7 @@ public class BSPrim : BSPhysObject
RawForce = value;
EnableActor(RawForce != OMV.Vector3.Zero, SetForceActorName, delegate()
{
- return new BSActorSetForce(PhysicsScene, this, SetForceActorName);
+ return new BSActorSetForce(PhysScene, this, SetForceActorName);
});
}
}
@@ -509,7 +509,7 @@ public class BSPrim : BSPhysObject
set {
Vehicle type = (Vehicle)value;
- PhysicsScene.TaintedObject("setVehicleType", delegate()
+ PhysScene.TaintedObject("setVehicleType", delegate()
{
// Vehicle code changes the parameters for this vehicle type.
VehicleActor.ProcessTypeChange(type);
@@ -519,7 +519,7 @@ public class BSPrim : BSPhysObject
}
public override void VehicleFloatParam(int param, float value)
{
- PhysicsScene.TaintedObject("BSPrim.VehicleFloatParam", delegate()
+ PhysScene.TaintedObject("BSPrim.VehicleFloatParam", delegate()
{
VehicleActor.ProcessFloatVehicleParam((Vehicle)param, value);
ActivateIfPhysical(false);
@@ -527,7 +527,7 @@ public class BSPrim : BSPhysObject
}
public override void VehicleVectorParam(int param, OMV.Vector3 value)
{
- PhysicsScene.TaintedObject("BSPrim.VehicleVectorParam", delegate()
+ PhysScene.TaintedObject("BSPrim.VehicleVectorParam", delegate()
{
VehicleActor.ProcessVectorVehicleParam((Vehicle)param, value);
ActivateIfPhysical(false);
@@ -535,7 +535,7 @@ public class BSPrim : BSPhysObject
}
public override void VehicleRotationParam(int param, OMV.Quaternion rotation)
{
- PhysicsScene.TaintedObject("BSPrim.VehicleRotationParam", delegate()
+ PhysScene.TaintedObject("BSPrim.VehicleRotationParam", delegate()
{
VehicleActor.ProcessRotationVehicleParam((Vehicle)param, rotation);
ActivateIfPhysical(false);
@@ -543,7 +543,7 @@ public class BSPrim : BSPhysObject
}
public override void VehicleFlags(int param, bool remove)
{
- PhysicsScene.TaintedObject("BSPrim.VehicleFlags", delegate()
+ PhysScene.TaintedObject("BSPrim.VehicleFlags", delegate()
{
VehicleActor.ProcessVehicleFlags(param, remove);
});
@@ -555,7 +555,7 @@ public class BSPrim : BSPhysObject
if (_isVolumeDetect != newValue)
{
_isVolumeDetect = newValue;
- PhysicsScene.TaintedObject("BSPrim.SetVolumeDetect", delegate()
+ PhysScene.TaintedObject("BSPrim.SetVolumeDetect", delegate()
{
// DetailLog("{0},setVolumeDetect,taint,volDetect={1}", LocalID, _isVolumeDetect);
SetObjectDynamic(true);
@@ -566,7 +566,7 @@ public class BSPrim : BSPhysObject
public override void SetMaterial(int material)
{
base.SetMaterial(material);
- PhysicsScene.TaintedObject("BSPrim.SetMaterial", delegate()
+ PhysScene.TaintedObject("BSPrim.SetMaterial", delegate()
{
UpdatePhysicalParameters();
});
@@ -579,7 +579,7 @@ public class BSPrim : BSPhysObject
if (base.Friction != value)
{
base.Friction = value;
- PhysicsScene.TaintedObject("BSPrim.setFriction", delegate()
+ PhysScene.TaintedObject("BSPrim.setFriction", delegate()
{
UpdatePhysicalParameters();
});
@@ -594,7 +594,7 @@ public class BSPrim : BSPhysObject
if (base.Restitution != value)
{
base.Restitution = value;
- PhysicsScene.TaintedObject("BSPrim.setRestitution", delegate()
+ PhysScene.TaintedObject("BSPrim.setRestitution", delegate()
{
UpdatePhysicalParameters();
});
@@ -611,7 +611,7 @@ public class BSPrim : BSPhysObject
if (base.Density != value)
{
base.Density = value;
- PhysicsScene.TaintedObject("BSPrim.setDensity", delegate()
+ PhysScene.TaintedObject("BSPrim.setDensity", delegate()
{
UpdatePhysicalParameters();
});
@@ -626,7 +626,7 @@ public class BSPrim : BSPhysObject
if (base.GravModifier != value)
{
base.GravModifier = value;
- PhysicsScene.TaintedObject("BSPrim.setGravityModifier", delegate()
+ PhysScene.TaintedObject("BSPrim.setGravityModifier", delegate()
{
UpdatePhysicalParameters();
});
@@ -637,7 +637,7 @@ public class BSPrim : BSPhysObject
get { return RawVelocity; }
set {
RawVelocity = value;
- PhysicsScene.TaintedObject("BSPrim.setVelocity", delegate()
+ PhysScene.TaintedObject("BSPrim.setVelocity", delegate()
{
// DetailLog("{0},BSPrim.SetVelocity,taint,vel={1}", LocalID, RawVelocity);
ForceVelocity = RawVelocity;
@@ -647,13 +647,13 @@ public class BSPrim : BSPhysObject
public override OMV.Vector3 ForceVelocity {
get { return RawVelocity; }
set {
- PhysicsScene.AssertInTaintTime("BSPrim.ForceVelocity");
+ PhysScene.AssertInTaintTime("BSPrim.ForceVelocity");
RawVelocity = Util.ClampV(value, BSParam.MaxLinearVelocity);
if (PhysBody.HasPhysicalBody)
{
DetailLog("{0},BSPrim.ForceVelocity,taint,vel={1}", LocalID, RawVelocity);
- PhysicsScene.PE.SetLinearVelocity(PhysBody, RawVelocity);
+ PhysScene.PE.SetLinearVelocity(PhysBody, RawVelocity);
ActivateIfPhysical(false);
}
}
@@ -664,7 +664,7 @@ public class BSPrim : BSPhysObject
RawTorque = value;
EnableActor(RawTorque != OMV.Vector3.Zero, SetTorqueActorName, delegate()
{
- return new BSActorSetTorque(PhysicsScene, this, SetTorqueActorName);
+ return new BSActorSetTorque(PhysScene, this, SetTorqueActorName);
});
DetailLog("{0},BSPrim.SetTorque,call,torque={1}", LocalID, RawTorque);
}
@@ -687,7 +687,7 @@ public class BSPrim : BSPhysObject
return;
_orientation = value;
- PhysicsScene.TaintedObject("BSPrim.setOrientation", delegate()
+ PhysScene.TaintedObject("BSPrim.setOrientation", delegate()
{
ForceOrientation = _orientation;
});
@@ -698,14 +698,14 @@ public class BSPrim : BSPhysObject
{
get
{
- _orientation = PhysicsScene.PE.GetOrientation(PhysBody);
+ _orientation = PhysScene.PE.GetOrientation(PhysBody);
return _orientation;
}
set
{
_orientation = value;
if (PhysBody.HasPhysicalBody)
- PhysicsScene.PE.SetTranslation(PhysBody, _position, _orientation);
+ PhysScene.PE.SetTranslation(PhysBody, _position, _orientation);
}
}
public override int PhysicsActorType {
@@ -718,7 +718,7 @@ public class BSPrim : BSPhysObject
if (_isPhysical != value)
{
_isPhysical = value;
- PhysicsScene.TaintedObject("BSPrim.setIsPhysical", delegate()
+ PhysScene.TaintedObject("BSPrim.setIsPhysical", delegate()
{
DetailLog("{0},setIsPhysical,taint,isPhys={1}", LocalID, _isPhysical);
SetObjectDynamic(true);
@@ -773,7 +773,7 @@ public class BSPrim : BSPhysObject
// Mangling all the physical properties requires the object not be in the physical world.
// This is a NOOP if the object is not in the world (BulletSim and Bullet ignore objects not found).
- PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, PhysBody);
+ PhysScene.PE.RemoveObjectFromWorld(PhysScene.World, PhysBody);
// Set up the object physicalness (does gravity and collisions move this object)
MakeDynamic(IsStatic);
@@ -790,7 +790,7 @@ public class BSPrim : BSPhysObject
AddObjectToPhysicalWorld();
// Rebuild its shape
- PhysicsScene.PE.UpdateSingleAabb(PhysicsScene.World, PhysBody);
+ PhysScene.PE.UpdateSingleAabb(PhysScene.World, PhysBody);
DetailLog("{0},BSPrim.UpdatePhysicalParameters,taintExit,static={1},solid={2},mass={3},collide={4},cf={5:X},cType={6},body={7},shape={8}",
LocalID, IsStatic, IsSolid, Mass, SubscribedEvents(),
@@ -807,28 +807,28 @@ public class BSPrim : BSPhysObject
if (makeStatic)
{
// Become a Bullet 'static' object type
- CurrentCollisionFlags = PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.CF_STATIC_OBJECT);
+ CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.CF_STATIC_OBJECT);
// Stop all movement
ZeroMotion(true);
// Set various physical properties so other object interact properly
- PhysicsScene.PE.SetFriction(PhysBody, Friction);
- PhysicsScene.PE.SetRestitution(PhysBody, Restitution);
- PhysicsScene.PE.SetContactProcessingThreshold(PhysBody, BSParam.ContactProcessingThreshold);
+ PhysScene.PE.SetFriction(PhysBody, Friction);
+ PhysScene.PE.SetRestitution(PhysBody, Restitution);
+ PhysScene.PE.SetContactProcessingThreshold(PhysBody, BSParam.ContactProcessingThreshold);
// Mass is zero which disables a bunch of physics stuff in Bullet
UpdatePhysicalMassProperties(0f, false);
// Set collision detection parameters
if (BSParam.CcdMotionThreshold > 0f)
{
- PhysicsScene.PE.SetCcdMotionThreshold(PhysBody, BSParam.CcdMotionThreshold);
- PhysicsScene.PE.SetCcdSweptSphereRadius(PhysBody, BSParam.CcdSweptSphereRadius);
+ PhysScene.PE.SetCcdMotionThreshold(PhysBody, BSParam.CcdMotionThreshold);
+ PhysScene.PE.SetCcdSweptSphereRadius(PhysBody, BSParam.CcdSweptSphereRadius);
}
// The activation state is 'disabled' so Bullet will not try to act on it.
// PhysicsScene.PE.ForceActivationState(PhysBody, ActivationState.DISABLE_SIMULATION);
// Start it out sleeping and physical actions could wake it up.
- PhysicsScene.PE.ForceActivationState(PhysBody, ActivationState.ISLAND_SLEEPING);
+ PhysScene.PE.ForceActivationState(PhysBody, ActivationState.ISLAND_SLEEPING);
// This collides like a static object
PhysBody.collisionType = CollisionType.Static;
@@ -836,11 +836,11 @@ public class BSPrim : BSPhysObject
else
{
// Not a Bullet static object
- CurrentCollisionFlags = PhysicsScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.CF_STATIC_OBJECT);
+ CurrentCollisionFlags = PhysScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.CF_STATIC_OBJECT);
// Set various physical properties so other object interact properly
- PhysicsScene.PE.SetFriction(PhysBody, Friction);
- PhysicsScene.PE.SetRestitution(PhysBody, Restitution);
+ PhysScene.PE.SetFriction(PhysBody, Friction);
+ PhysScene.PE.SetRestitution(PhysBody, Restitution);
// DetailLog("{0},BSPrim.MakeDynamic,frict={1},rest={2}", LocalID, Friction, Restitution);
// per http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?t=3382
@@ -858,22 +858,22 @@ public class BSPrim : BSPhysObject
// Set collision detection parameters
if (BSParam.CcdMotionThreshold > 0f)
{
- PhysicsScene.PE.SetCcdMotionThreshold(PhysBody, BSParam.CcdMotionThreshold);
- PhysicsScene.PE.SetCcdSweptSphereRadius(PhysBody, BSParam.CcdSweptSphereRadius);
+ PhysScene.PE.SetCcdMotionThreshold(PhysBody, BSParam.CcdMotionThreshold);
+ PhysScene.PE.SetCcdSweptSphereRadius(PhysBody, BSParam.CcdSweptSphereRadius);
}
// Various values for simulation limits
- PhysicsScene.PE.SetDamping(PhysBody, BSParam.LinearDamping, BSParam.AngularDamping);
- PhysicsScene.PE.SetDeactivationTime(PhysBody, BSParam.DeactivationTime);
- PhysicsScene.PE.SetSleepingThresholds(PhysBody, BSParam.LinearSleepingThreshold, BSParam.AngularSleepingThreshold);
- PhysicsScene.PE.SetContactProcessingThreshold(PhysBody, BSParam.ContactProcessingThreshold);
+ PhysScene.PE.SetDamping(PhysBody, BSParam.LinearDamping, BSParam.AngularDamping);
+ PhysScene.PE.SetDeactivationTime(PhysBody, BSParam.DeactivationTime);
+ PhysScene.PE.SetSleepingThresholds(PhysBody, BSParam.LinearSleepingThreshold, BSParam.AngularSleepingThreshold);
+ PhysScene.PE.SetContactProcessingThreshold(PhysBody, BSParam.ContactProcessingThreshold);
// This collides like an object.
PhysBody.collisionType = CollisionType.Dynamic;
// Force activation of the object so Bullet will act on it.
// Must do the ForceActivationState2() to overcome the DISABLE_SIMULATION from static objects.
- PhysicsScene.PE.ForceActivationState(PhysBody, ActivationState.ACTIVE_TAG);
+ PhysScene.PE.ForceActivationState(PhysBody, ActivationState.ACTIVE_TAG);
}
}
@@ -883,7 +883,7 @@ public class BSPrim : BSPhysObject
// the functions after this one set up the state of a possibly newly created collision body.
private void MakeSolid(bool makeSolid)
{
- CollisionObjectTypes bodyType = (CollisionObjectTypes)PhysicsScene.PE.GetBodyType(PhysBody);
+ CollisionObjectTypes bodyType = (CollisionObjectTypes)PhysScene.PE.GetBodyType(PhysBody);
if (makeSolid)
{
// Verify the previous code created the correct shape for this type of thing.
@@ -891,7 +891,7 @@ public class BSPrim : BSPhysObject
{
m_log.ErrorFormat("{0} MakeSolid: physical body of wrong type for solidity. id={1}, type={2}", LogHeader, LocalID, bodyType);
}
- CurrentCollisionFlags = PhysicsScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
+ CurrentCollisionFlags = PhysScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
}
else
{
@@ -899,7 +899,7 @@ public class BSPrim : BSPhysObject
{
m_log.ErrorFormat("{0} MakeSolid: physical body of wrong type for non-solidness. id={1}, type={2}", LogHeader, LocalID, bodyType);
}
- CurrentCollisionFlags = PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
+ CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
// Change collision info from a static object to a ghosty collision object
PhysBody.collisionType = CollisionType.VolumeDetect;
@@ -911,11 +911,11 @@ public class BSPrim : BSPhysObject
{
if (wantsCollisionEvents)
{
- CurrentCollisionFlags = PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
+ CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
}
else
{
- CurrentCollisionFlags = PhysicsScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
+ CurrentCollisionFlags = PhysScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
}
}
@@ -926,7 +926,7 @@ public class BSPrim : BSPhysObject
{
if (PhysBody.HasPhysicalBody)
{
- PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, PhysBody);
+ PhysScene.PE.AddObjectToWorld(PhysScene.World, PhysBody);
}
else
{
@@ -961,12 +961,12 @@ public class BSPrim : BSPhysObject
public override bool FloatOnWater {
set {
_floatOnWater = value;
- PhysicsScene.TaintedObject("BSPrim.setFloatOnWater", delegate()
+ PhysScene.TaintedObject("BSPrim.setFloatOnWater", delegate()
{
if (_floatOnWater)
- CurrentCollisionFlags = PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
+ CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
else
- CurrentCollisionFlags = PhysicsScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
+ CurrentCollisionFlags = PhysScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
});
}
}
@@ -978,7 +978,7 @@ public class BSPrim : BSPhysObject
_rotationalVelocity = value;
Util.ClampV(_rotationalVelocity, BSParam.MaxAngularVelocity);
// m_log.DebugFormat("{0}: RotationalVelocity={1}", LogHeader, _rotationalVelocity);
- PhysicsScene.TaintedObject("BSPrim.setRotationalVelocity", delegate()
+ PhysScene.TaintedObject("BSPrim.setRotationalVelocity", delegate()
{
ForceRotationalVelocity = _rotationalVelocity;
});
@@ -993,7 +993,7 @@ public class BSPrim : BSPhysObject
if (PhysBody.HasPhysicalBody)
{
DetailLog("{0},BSPrim.ForceRotationalVel,taint,rotvel={1}", LocalID, _rotationalVelocity);
- PhysicsScene.PE.SetAngularVelocity(PhysBody, _rotationalVelocity);
+ PhysScene.PE.SetAngularVelocity(PhysBody, _rotationalVelocity);
// PhysicsScene.PE.SetInterpolationAngularVelocity(PhysBody, _rotationalVelocity);
ActivateIfPhysical(false);
}
@@ -1009,7 +1009,7 @@ public class BSPrim : BSPhysObject
get { return _buoyancy; }
set {
_buoyancy = value;
- PhysicsScene.TaintedObject("BSPrim.setBuoyancy", delegate()
+ PhysScene.TaintedObject("BSPrim.setBuoyancy", delegate()
{
ForceBuoyancy = _buoyancy;
});
@@ -1032,7 +1032,7 @@ public class BSPrim : BSPhysObject
base.MoveToTargetActive = value;
EnableActor(MoveToTargetActive, MoveToTargetActorName, delegate()
{
- return new BSActorMoveToTarget(PhysicsScene, this, MoveToTargetActorName);
+ return new BSActorMoveToTarget(PhysScene, this, MoveToTargetActorName);
});
}
}
@@ -1044,7 +1044,7 @@ public class BSPrim : BSPhysObject
base.HoverActive = value;
EnableActor(HoverActive, HoverActorName, delegate()
{
- return new BSActorHover(PhysicsScene, this, HoverActorName);
+ return new BSActorHover(PhysScene, this, HoverActorName);
});
}
}
@@ -1054,7 +1054,7 @@ public class BSPrim : BSPhysObject
OMV.Vector3 addForce = Util.ClampV(force, BSParam.MaxAddForceMagnitude);
// Since this force is being applied in only one step, make this a force per second.
- addForce /= PhysicsScene.LastTimeStep;
+ addForce /= PhysScene.LastTimeStep;
AddForce(addForce, pushforce, false /* inTaintTime */);
}
@@ -1069,13 +1069,13 @@ public class BSPrim : BSPhysObject
// DetailLog("{0},BSPrim.addForce,call,force={1}", LocalID, addForce);
OMV.Vector3 addForce = force;
- PhysicsScene.TaintedObject(inTaintTime, "BSPrim.AddForce", delegate()
+ PhysScene.TaintedObject(inTaintTime, "BSPrim.AddForce", delegate()
{
// Bullet adds this central force to the total force for this tick
DetailLog("{0},BSPrim.addForce,taint,force={1}", LocalID, addForce);
if (PhysBody.HasPhysicalBody)
{
- PhysicsScene.PE.ApplyCentralForce(PhysBody, addForce);
+ PhysScene.PE.ApplyCentralForce(PhysBody, addForce);
ActivateIfPhysical(false);
}
});
@@ -1097,13 +1097,13 @@ public class BSPrim : BSPhysObject
OMV.Vector3 addImpulse = Util.ClampV(impulse, BSParam.MaxAddForceMagnitude);
// DetailLog("{0},BSPrim.addForceImpulse,call,impulse={1}", LocalID, impulse);
- PhysicsScene.TaintedObject(inTaintTime, "BSPrim.AddImpulse", delegate()
+ PhysScene.TaintedObject(inTaintTime, "BSPrim.AddImpulse", delegate()
{
// Bullet adds this impulse immediately to the velocity
DetailLog("{0},BSPrim.addForceImpulse,taint,impulseforce={1}", LocalID, addImpulse);
if (PhysBody.HasPhysicalBody)
{
- PhysicsScene.PE.ApplyCentralImpulse(PhysBody, addImpulse);
+ PhysScene.PE.ApplyCentralImpulse(PhysBody, addImpulse);
ActivateIfPhysical(false);
}
});
@@ -1122,12 +1122,12 @@ public class BSPrim : BSPhysObject
if (force.IsFinite())
{
OMV.Vector3 angForce = force;
- PhysicsScene.TaintedObject(inTaintTime, "BSPrim.AddAngularForce", delegate()
+ PhysScene.TaintedObject(inTaintTime, "BSPrim.AddAngularForce", delegate()
{
if (PhysBody.HasPhysicalBody)
{
DetailLog("{0},BSPrim.AddAngularForce,taint,angForce={1}", LocalID, angForce);
- PhysicsScene.PE.ApplyTorque(PhysBody, angForce);
+ PhysScene.PE.ApplyTorque(PhysBody, angForce);
ActivateIfPhysical(false);
}
});
@@ -1146,11 +1146,11 @@ public class BSPrim : BSPhysObject
public void ApplyTorqueImpulse(OMV.Vector3 impulse, bool inTaintTime)
{
OMV.Vector3 applyImpulse = impulse;
- PhysicsScene.TaintedObject(inTaintTime, "BSPrim.ApplyTorqueImpulse", delegate()
+ PhysScene.TaintedObject(inTaintTime, "BSPrim.ApplyTorqueImpulse", delegate()
{
if (PhysBody.HasPhysicalBody)
{
- PhysicsScene.PE.ApplyTorqueImpulse(PhysBody, applyImpulse);
+ PhysScene.PE.ApplyTorqueImpulse(PhysBody, applyImpulse);
ActivateIfPhysical(false);
}
});
@@ -1452,7 +1452,7 @@ public class BSPrim : BSPhysObject
// Create the correct physical representation for this type of object.
// Updates base.PhysBody and base.PhysShape with the new information.
// Ignore 'forceRebuild'. 'GetBodyAndShape' makes the right choices and changes of necessary.
- PhysicsScene.Shapes.GetBodyAndShape(false /*forceRebuild */, PhysicsScene.World, this, delegate(BulletBody pBody, BulletShape pShape)
+ PhysScene.Shapes.GetBodyAndShape(false /*forceRebuild */, PhysScene.World, this, delegate(BulletBody pBody, BulletShape pShape)
{
// Called if the current prim body is about to be destroyed.
// Remove all the physical dependencies on the old body.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 81104ec..5236909 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -47,9 +47,9 @@ public class BSPrimLinkable : BSPrimDisplaced
OMV.Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical)
: base(localID, primName, parent_scene, pos, size, rotation, pbs, pisPhysical)
{
- Linkset = BSLinkset.Factory(PhysicsScene, this);
+ Linkset = BSLinkset.Factory(PhysScene, this);
- PhysicsScene.TaintedObject("BSPrimLinksetCompound.Refresh", delegate()
+ PhysScene.TaintedObject("BSPrimLinksetCompound.Refresh", delegate()
{
Linkset.Refresh(this);
});
@@ -99,7 +99,7 @@ public class BSPrimLinkable : BSPrimDisplaced
set
{
base.Position = value;
- PhysicsScene.TaintedObject("BSPrimLinkset.setPosition", delegate()
+ PhysScene.TaintedObject("BSPrimLinkset.setPosition", delegate()
{
Linkset.UpdateProperties(UpdatedProperties.Position, this);
});
@@ -113,7 +113,7 @@ public class BSPrimLinkable : BSPrimDisplaced
set
{
base.Orientation = value;
- PhysicsScene.TaintedObject("BSPrimLinkset.setOrientation", delegate()
+ PhysScene.TaintedObject("BSPrimLinkset.setOrientation", delegate()
{
Linkset.UpdateProperties(UpdatedProperties.Orientation, this);
});
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
index e4fecc3..5a19797 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
@@ -92,7 +92,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
private void BuildHeightmapTerrain()
{
// Create the terrain shape from the mapInfo
- m_mapInfo.terrainShape = PhysicsScene.PE.CreateTerrainShape( m_mapInfo.ID,
+ m_mapInfo.terrainShape = m_physicsScene.PE.CreateTerrainShape( m_mapInfo.ID,
new Vector3(m_mapInfo.sizeX, m_mapInfo.sizeY, 0), m_mapInfo.minZ, m_mapInfo.maxZ,
m_mapInfo.heightMap, 1f, BSParam.TerrainCollisionMargin);
@@ -103,26 +103,26 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
centerPos.Y = m_mapInfo.minCoords.Y + (m_mapInfo.sizeY / 2f);
centerPos.Z = m_mapInfo.minZ + ((m_mapInfo.maxZ - m_mapInfo.minZ) / 2f);
- m_mapInfo.terrainBody = PhysicsScene.PE.CreateBodyWithDefaultMotionState(m_mapInfo.terrainShape,
+ m_mapInfo.terrainBody = m_physicsScene.PE.CreateBodyWithDefaultMotionState(m_mapInfo.terrainShape,
m_mapInfo.ID, centerPos, Quaternion.Identity);
// Set current terrain attributes
- PhysicsScene.PE.SetFriction(m_mapInfo.terrainBody, BSParam.TerrainFriction);
- PhysicsScene.PE.SetHitFraction(m_mapInfo.terrainBody, BSParam.TerrainHitFraction);
- PhysicsScene.PE.SetRestitution(m_mapInfo.terrainBody, BSParam.TerrainRestitution);
- PhysicsScene.PE.SetCollisionFlags(m_mapInfo.terrainBody, CollisionFlags.CF_STATIC_OBJECT);
+ m_physicsScene.PE.SetFriction(m_mapInfo.terrainBody, BSParam.TerrainFriction);
+ m_physicsScene.PE.SetHitFraction(m_mapInfo.terrainBody, BSParam.TerrainHitFraction);
+ m_physicsScene.PE.SetRestitution(m_mapInfo.terrainBody, BSParam.TerrainRestitution);
+ m_physicsScene.PE.SetCollisionFlags(m_mapInfo.terrainBody, CollisionFlags.CF_STATIC_OBJECT);
// Return the new terrain to the world of physical objects
- PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, m_mapInfo.terrainBody);
+ m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, m_mapInfo.terrainBody);
// redo its bounding box now that it is in the world
- PhysicsScene.PE.UpdateSingleAabb(PhysicsScene.World, m_mapInfo.terrainBody);
+ m_physicsScene.PE.UpdateSingleAabb(m_physicsScene.World, m_mapInfo.terrainBody);
m_mapInfo.terrainBody.collisionType = CollisionType.Terrain;
- m_mapInfo.terrainBody.ApplyCollisionMask(PhysicsScene);
+ m_mapInfo.terrainBody.ApplyCollisionMask(m_physicsScene);
// Make it so the terrain will not move or be considered for movement.
- PhysicsScene.PE.ForceActivationState(m_mapInfo.terrainBody, ActivationState.DISABLE_SIMULATION);
+ m_physicsScene.PE.ForceActivationState(m_mapInfo.terrainBody, ActivationState.DISABLE_SIMULATION);
return;
}
@@ -134,9 +134,9 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
{
if (m_mapInfo.terrainBody.HasPhysicalBody)
{
- PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, m_mapInfo.terrainBody);
+ m_physicsScene.PE.RemoveObjectFromWorld(m_physicsScene.World, m_mapInfo.terrainBody);
// Frees both the body and the shape.
- PhysicsScene.PE.DestroyObject(PhysicsScene.World, m_mapInfo.terrainBody);
+ m_physicsScene.PE.DestroyObject(m_physicsScene.World, m_mapInfo.terrainBody);
}
}
m_mapInfo = null;
@@ -155,7 +155,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
catch
{
// Sometimes they give us wonky values of X and Y. Give a warning and return something.
- PhysicsScene.Logger.WarnFormat("{0} Bad request for terrain height. terrainBase={1}, pos={2}",
+ m_physicsScene.Logger.WarnFormat("{0} Bad request for terrain height. terrainBase={1}, pos={2}",
LogHeader, m_mapInfo.terrainRegionBase, pos);
ret = BSTerrainManager.HEIGHT_GETHEIGHT_RET;
}
@@ -165,7 +165,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
// The passed position is relative to the base of the region.
public override float GetWaterLevelAtXYZ(Vector3 pos)
{
- return PhysicsScene.SimpleWaterLevel;
+ return m_physicsScene.SimpleWaterLevel;
}
}
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
index 5240ad8..0d16eda 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
@@ -50,14 +50,14 @@ public abstract class BSTerrainPhys : IDisposable
Mesh = 1
}
- public BSScene PhysicsScene { get; private set; }
+ protected BSScene m_physicsScene { get; private set; }
// Base of the region in world coordinates. Coordinates inside the region are relative to this.
public Vector3 TerrainBase { get; private set; }
public uint ID { get; private set; }
public BSTerrainPhys(BSScene physicsScene, Vector3 regionBase, uint id)
{
- PhysicsScene = physicsScene;
+ m_physicsScene = physicsScene;
TerrainBase = regionBase;
ID = id;
}
@@ -86,7 +86,7 @@ public sealed class BSTerrainManager : IDisposable
public Vector3 DefaultRegionSize = new Vector3(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight);
// The scene that I am part of
- private BSScene PhysicsScene { get; set; }
+ private BSScene m_physicsScene { get; set; }
// The ground plane created to keep thing from falling to infinity.
private BulletBody m_groundPlane;
@@ -113,7 +113,7 @@ public sealed class BSTerrainManager : IDisposable
public BSTerrainManager(BSScene physicsScene)
{
- PhysicsScene = physicsScene;
+ m_physicsScene = physicsScene;
m_terrains = new Dictionary();
// Assume one region of default size
@@ -132,21 +132,21 @@ public sealed class BSTerrainManager : IDisposable
// safe to call Bullet in real time. We hope no one is moving prims around yet.
public void CreateInitialGroundPlaneAndTerrain()
{
- DetailLog("{0},BSTerrainManager.CreateInitialGroundPlaneAndTerrain,region={1}", BSScene.DetailLogZero, PhysicsScene.RegionName);
+ DetailLog("{0},BSTerrainManager.CreateInitialGroundPlaneAndTerrain,region={1}", BSScene.DetailLogZero, m_physicsScene.RegionName);
// The ground plane is here to catch things that are trying to drop to negative infinity
- BulletShape groundPlaneShape = PhysicsScene.PE.CreateGroundPlaneShape(BSScene.GROUNDPLANE_ID, 1f, BSParam.TerrainCollisionMargin);
- m_groundPlane = PhysicsScene.PE.CreateBodyWithDefaultMotionState(groundPlaneShape,
+ BulletShape groundPlaneShape = m_physicsScene.PE.CreateGroundPlaneShape(BSScene.GROUNDPLANE_ID, 1f, BSParam.TerrainCollisionMargin);
+ m_groundPlane = m_physicsScene.PE.CreateBodyWithDefaultMotionState(groundPlaneShape,
BSScene.GROUNDPLANE_ID, Vector3.Zero, Quaternion.Identity);
- PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, m_groundPlane);
- PhysicsScene.PE.UpdateSingleAabb(PhysicsScene.World, m_groundPlane);
+ m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, m_groundPlane);
+ m_physicsScene.PE.UpdateSingleAabb(m_physicsScene.World, m_groundPlane);
// Ground plane does not move
- PhysicsScene.PE.ForceActivationState(m_groundPlane, ActivationState.DISABLE_SIMULATION);
+ m_physicsScene.PE.ForceActivationState(m_groundPlane, ActivationState.DISABLE_SIMULATION);
// Everything collides with the ground plane.
m_groundPlane.collisionType = CollisionType.Groundplane;
- m_groundPlane.ApplyCollisionMask(PhysicsScene);
+ m_groundPlane.ApplyCollisionMask(m_physicsScene);
- BSTerrainPhys initialTerrain = new BSTerrainHeightmap(PhysicsScene, Vector3.Zero, BSScene.TERRAIN_ID, DefaultRegionSize);
+ BSTerrainPhys initialTerrain = new BSTerrainHeightmap(m_physicsScene, Vector3.Zero, BSScene.TERRAIN_ID, DefaultRegionSize);
lock (m_terrains)
{
// Build an initial terrain and put it in the world. This quickly gets replaced by the real region terrain.
@@ -157,12 +157,12 @@ public sealed class BSTerrainManager : IDisposable
// Release all the terrain structures we might have allocated
public void ReleaseGroundPlaneAndTerrain()
{
- DetailLog("{0},BSTerrainManager.ReleaseGroundPlaneAndTerrain,region={1}", BSScene.DetailLogZero, PhysicsScene.RegionName);
+ DetailLog("{0},BSTerrainManager.ReleaseGroundPlaneAndTerrain,region={1}", BSScene.DetailLogZero, m_physicsScene.RegionName);
if (m_groundPlane.HasPhysicalBody)
{
- if (PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, m_groundPlane))
+ if (m_physicsScene.PE.RemoveObjectFromWorld(m_physicsScene.World, m_groundPlane))
{
- PhysicsScene.PE.DestroyObject(PhysicsScene.World, m_groundPlane);
+ m_physicsScene.PE.DestroyObject(m_physicsScene.World, m_groundPlane);
}
m_groundPlane.Clear();
}
@@ -188,7 +188,7 @@ public sealed class BSTerrainManager : IDisposable
float[] localHeightMap = heightMap;
// If there are multiple requests for changes to the same terrain between ticks,
// only do that last one.
- PhysicsScene.PostTaintObject("TerrainManager.SetTerrain-"+ m_worldOffset.ToString(), 0, delegate()
+ m_physicsScene.PostTaintObject("TerrainManager.SetTerrain-"+ m_worldOffset.ToString(), 0, delegate()
{
if (m_worldOffset != Vector3.Zero && MegaRegionParentPhysicsScene != null)
{
@@ -219,7 +219,7 @@ public sealed class BSTerrainManager : IDisposable
private void AddMegaRegionChildTerrain(uint id, float[] heightMap, Vector3 minCoords, Vector3 maxCoords)
{
// Since we are called by another region's thread, the action must be rescheduled onto our processing thread.
- PhysicsScene.PostTaintObject("TerrainManager.AddMegaRegionChild" + minCoords.ToString(), id, delegate()
+ m_physicsScene.PostTaintObject("TerrainManager.AddMegaRegionChild" + minCoords.ToString(), id, delegate()
{
UpdateTerrain(id, heightMap, minCoords, maxCoords);
});
@@ -318,26 +318,26 @@ public sealed class BSTerrainManager : IDisposable
// TODO: redo terrain implementation selection to allow other base types than heightMap.
private BSTerrainPhys BuildPhysicalTerrain(Vector3 terrainRegionBase, uint id, float[] heightMap, Vector3 minCoords, Vector3 maxCoords)
{
- PhysicsScene.Logger.DebugFormat("{0} Terrain for {1}/{2} created with {3}",
- LogHeader, PhysicsScene.RegionName, terrainRegionBase,
+ m_physicsScene.Logger.DebugFormat("{0} Terrain for {1}/{2} created with {3}",
+ LogHeader, m_physicsScene.RegionName, terrainRegionBase,
(BSTerrainPhys.TerrainImplementation)BSParam.TerrainImplementation);
BSTerrainPhys newTerrainPhys = null;
switch ((int)BSParam.TerrainImplementation)
{
case (int)BSTerrainPhys.TerrainImplementation.Heightmap:
- newTerrainPhys = new BSTerrainHeightmap(PhysicsScene, terrainRegionBase, id,
+ newTerrainPhys = new BSTerrainHeightmap(m_physicsScene, terrainRegionBase, id,
heightMap, minCoords, maxCoords);
break;
case (int)BSTerrainPhys.TerrainImplementation.Mesh:
- newTerrainPhys = new BSTerrainMesh(PhysicsScene, terrainRegionBase, id,
+ newTerrainPhys = new BSTerrainMesh(m_physicsScene, terrainRegionBase, id,
heightMap, minCoords, maxCoords);
break;
default:
- PhysicsScene.Logger.ErrorFormat("{0} Bad terrain implementation specified. Type={1}/{2},Region={3}/{4}",
+ m_physicsScene.Logger.ErrorFormat("{0} Bad terrain implementation specified. Type={1}/{2},Region={3}/{4}",
LogHeader,
(int)BSParam.TerrainImplementation,
BSParam.TerrainImplementation,
- PhysicsScene.RegionName, terrainRegionBase);
+ m_physicsScene.RegionName, terrainRegionBase);
break;
}
return newTerrainPhys;
@@ -429,8 +429,8 @@ public sealed class BSTerrainManager : IDisposable
}
else
{
- PhysicsScene.Logger.ErrorFormat("{0} GetTerrainHeightAtXY: terrain not found: region={1}, x={2}, y={3}",
- LogHeader, PhysicsScene.RegionName, tX, tY);
+ m_physicsScene.Logger.ErrorFormat("{0} GetTerrainHeightAtXY: terrain not found: region={1}, x={2}, y={3}",
+ LogHeader, m_physicsScene.RegionName, tX, tY);
DetailLog("{0},BSTerrainManager.GetTerrainHeightAtXYZ,terrainNotFound,pos={1},base={2}",
BSScene.DetailLogZero, pos, terrainBaseXYZ);
}
@@ -451,8 +451,8 @@ public sealed class BSTerrainManager : IDisposable
}
else
{
- PhysicsScene.Logger.ErrorFormat("{0} GetWaterHeightAtXY: terrain not found: pos={1}, terrainBase={2}, height={3}",
- LogHeader, PhysicsScene.RegionName, pos, terrainBaseXYZ, ret);
+ m_physicsScene.Logger.ErrorFormat("{0} GetWaterHeightAtXY: terrain not found: pos={1}, terrainBase={2}, height={3}",
+ LogHeader, m_physicsScene.RegionName, pos, terrainBaseXYZ, ret);
}
return ret;
}
@@ -564,7 +564,7 @@ public sealed class BSTerrainManager : IDisposable
private void DetailLog(string msg, params Object[] args)
{
- PhysicsScene.PhysicsLogging.Write(msg, args);
+ m_physicsScene.PhysicsLogging.Write(msg, args);
}
}
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
index 2ce1513..ee2a1f2 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
@@ -80,7 +80,7 @@ public sealed class BSTerrainMesh : BSTerrainPhys
if (BSParam.TerrainMeshMagnification == 1)
{
// If a magnification of one, use the old routine that is tried and true.
- meshCreationSuccess = BSTerrainMesh.ConvertHeightmapToMesh(PhysicsScene,
+ meshCreationSuccess = BSTerrainMesh.ConvertHeightmapToMesh(m_physicsScene,
initialMap, m_sizeX, m_sizeY, // input size
Vector3.Zero, // base for mesh
out indicesCount, out indices, out verticesCount, out vertices);
@@ -88,7 +88,7 @@ public sealed class BSTerrainMesh : BSTerrainPhys
else
{
// Other magnifications use the newer routine
- meshCreationSuccess = BSTerrainMesh.ConvertHeightmapToMesh2(PhysicsScene,
+ meshCreationSuccess = BSTerrainMesh.ConvertHeightmapToMesh2(m_physicsScene,
initialMap, m_sizeX, m_sizeY, // input size
BSParam.TerrainMeshMagnification,
physicsScene.TerrainManager.DefaultRegionSize,
@@ -98,21 +98,21 @@ public sealed class BSTerrainMesh : BSTerrainPhys
if (!meshCreationSuccess)
{
// DISASTER!!
- PhysicsScene.DetailLog("{0},BSTerrainMesh.create,failedConversionOfHeightmap,id={1}", BSScene.DetailLogZero, ID);
- PhysicsScene.Logger.ErrorFormat("{0} Failed conversion of heightmap to mesh! base={1}", LogHeader, TerrainBase);
+ m_physicsScene.DetailLog("{0},BSTerrainMesh.create,failedConversionOfHeightmap,id={1}", BSScene.DetailLogZero, ID);
+ m_physicsScene.Logger.ErrorFormat("{0} Failed conversion of heightmap to mesh! base={1}", LogHeader, TerrainBase);
// Something is very messed up and a crash is in our future.
return;
}
- PhysicsScene.DetailLog("{0},BSTerrainMesh.create,meshed,id={1},indices={2},indSz={3},vertices={4},vertSz={5}",
+ m_physicsScene.DetailLog("{0},BSTerrainMesh.create,meshed,id={1},indices={2},indSz={3},vertices={4},vertSz={5}",
BSScene.DetailLogZero, ID, indicesCount, indices.Length, verticesCount, vertices.Length);
- m_terrainShape = PhysicsScene.PE.CreateMeshShape(PhysicsScene.World, indicesCount, indices, verticesCount, vertices);
+ m_terrainShape = m_physicsScene.PE.CreateMeshShape(m_physicsScene.World, indicesCount, indices, verticesCount, vertices);
if (!m_terrainShape.HasPhysicalShape)
{
// DISASTER!!
- PhysicsScene.DetailLog("{0},BSTerrainMesh.create,failedCreationOfShape,id={1}", BSScene.DetailLogZero, ID);
- PhysicsScene.Logger.ErrorFormat("{0} Failed creation of terrain mesh! base={1}", LogHeader, TerrainBase);
+ m_physicsScene.DetailLog("{0},BSTerrainMesh.create,failedCreationOfShape,id={1}", BSScene.DetailLogZero, ID);
+ m_physicsScene.Logger.ErrorFormat("{0} Failed creation of terrain mesh! base={1}", LogHeader, TerrainBase);
// Something is very messed up and a crash is in our future.
return;
}
@@ -120,52 +120,52 @@ public sealed class BSTerrainMesh : BSTerrainPhys
Vector3 pos = regionBase;
Quaternion rot = Quaternion.Identity;
- m_terrainBody = PhysicsScene.PE.CreateBodyWithDefaultMotionState(m_terrainShape, ID, pos, rot);
+ m_terrainBody = m_physicsScene.PE.CreateBodyWithDefaultMotionState(m_terrainShape, ID, pos, rot);
if (!m_terrainBody.HasPhysicalBody)
{
// DISASTER!!
- PhysicsScene.Logger.ErrorFormat("{0} Failed creation of terrain body! base={1}", LogHeader, TerrainBase);
+ m_physicsScene.Logger.ErrorFormat("{0} Failed creation of terrain body! base={1}", LogHeader, TerrainBase);
// Something is very messed up and a crash is in our future.
return;
}
physicsScene.PE.SetShapeCollisionMargin(m_terrainShape, BSParam.TerrainCollisionMargin);
// Set current terrain attributes
- PhysicsScene.PE.SetFriction(m_terrainBody, BSParam.TerrainFriction);
- PhysicsScene.PE.SetHitFraction(m_terrainBody, BSParam.TerrainHitFraction);
- PhysicsScene.PE.SetRestitution(m_terrainBody, BSParam.TerrainRestitution);
- PhysicsScene.PE.SetContactProcessingThreshold(m_terrainBody, BSParam.TerrainContactProcessingThreshold);
- PhysicsScene.PE.SetCollisionFlags(m_terrainBody, CollisionFlags.CF_STATIC_OBJECT);
+ m_physicsScene.PE.SetFriction(m_terrainBody, BSParam.TerrainFriction);
+ m_physicsScene.PE.SetHitFraction(m_terrainBody, BSParam.TerrainHitFraction);
+ m_physicsScene.PE.SetRestitution(m_terrainBody, BSParam.TerrainRestitution);
+ m_physicsScene.PE.SetContactProcessingThreshold(m_terrainBody, BSParam.TerrainContactProcessingThreshold);
+ m_physicsScene.PE.SetCollisionFlags(m_terrainBody, CollisionFlags.CF_STATIC_OBJECT);
// Static objects are not very massive.
- PhysicsScene.PE.SetMassProps(m_terrainBody, 0f, Vector3.Zero);
+ m_physicsScene.PE.SetMassProps(m_terrainBody, 0f, Vector3.Zero);
// Put the new terrain to the world of physical objects
- PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, m_terrainBody);
+ m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, m_terrainBody);
// Redo its bounding box now that it is in the world
- PhysicsScene.PE.UpdateSingleAabb(PhysicsScene.World, m_terrainBody);
+ m_physicsScene.PE.UpdateSingleAabb(m_physicsScene.World, m_terrainBody);
m_terrainBody.collisionType = CollisionType.Terrain;
- m_terrainBody.ApplyCollisionMask(PhysicsScene);
+ m_terrainBody.ApplyCollisionMask(m_physicsScene);
if (BSParam.UseSingleSidedMeshes)
{
- PhysicsScene.DetailLog("{0},BSTerrainMesh.settingCustomMaterial,id={1}", BSScene.DetailLogZero, id);
- PhysicsScene.PE.AddToCollisionFlags(m_terrainBody, CollisionFlags.CF_CUSTOM_MATERIAL_CALLBACK);
+ m_physicsScene.DetailLog("{0},BSTerrainMesh.settingCustomMaterial,id={1}", BSScene.DetailLogZero, id);
+ m_physicsScene.PE.AddToCollisionFlags(m_terrainBody, CollisionFlags.CF_CUSTOM_MATERIAL_CALLBACK);
}
// Make it so the terrain will not move or be considered for movement.
- PhysicsScene.PE.ForceActivationState(m_terrainBody, ActivationState.DISABLE_SIMULATION);
+ m_physicsScene.PE.ForceActivationState(m_terrainBody, ActivationState.DISABLE_SIMULATION);
}
public override void Dispose()
{
if (m_terrainBody.HasPhysicalBody)
{
- PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, m_terrainBody);
+ m_physicsScene.PE.RemoveObjectFromWorld(m_physicsScene.World, m_terrainBody);
// Frees both the body and the shape.
- PhysicsScene.PE.DestroyObject(PhysicsScene.World, m_terrainBody);
+ m_physicsScene.PE.DestroyObject(m_physicsScene.World, m_terrainBody);
m_terrainBody.Clear();
m_terrainShape.Clear();
}
@@ -185,7 +185,7 @@ public sealed class BSTerrainMesh : BSTerrainPhys
catch
{
// Sometimes they give us wonky values of X and Y. Give a warning and return something.
- PhysicsScene.Logger.WarnFormat("{0} Bad request for terrain height. terrainBase={1}, pos={2}",
+ m_physicsScene.Logger.WarnFormat("{0} Bad request for terrain height. terrainBase={1}, pos={2}",
LogHeader, TerrainBase, pos);
ret = BSTerrainManager.HEIGHT_GETHEIGHT_RET;
}
@@ -195,7 +195,7 @@ public sealed class BSTerrainMesh : BSTerrainPhys
// The passed position is relative to the base of the region.
public override float GetWaterLevelAtXYZ(Vector3 pos)
{
- return PhysicsScene.SimpleWaterLevel;
+ return m_physicsScene.SimpleWaterLevel;
}
// Convert the passed heightmap to mesh information suitable for CreateMeshShape2().
--
cgit v1.1
From 92ee288d666963aae2a058cc964be009a504f084 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 29 Apr 2013 07:54:50 -0700
Subject: BulletSim: remove trailing white space to make git happier. No
functional changes.
---
OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs | 6 +-
OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | 138 ++++++++++-----------
.../Physics/BulletSPlugin/BSActorAvatarMove.cs | 2 +-
.../Physics/BulletSPlugin/BSActorLockAxis.cs | 2 +-
OpenSim/Region/Physics/BulletSPlugin/BSActors.cs | 2 +-
.../Region/Physics/BulletSPlugin/BSApiTemplate.cs | 6 +-
.../Region/Physics/BulletSPlugin/BSCharacter.cs | 6 +-
.../Physics/BulletSPlugin/BSConstraintHinge.cs | 2 +-
OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 22 ++--
OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 2 +-
.../Physics/BulletSPlugin/BSLinksetCompound.cs | 4 +-
OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs | 12 +-
OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 6 +-
.../Region/Physics/BulletSPlugin/BSPhysObject.cs | 8 +-
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 2 +-
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 20 +--
.../Physics/BulletSPlugin/BSTerrainHeightmap.cs | 6 +-
.../Physics/BulletSPlugin/BSTerrainManager.cs | 10 +-
.../Region/Physics/BulletSPlugin/BSTerrainMesh.cs | 6 +-
.../Region/Physics/BulletSPlugin/BulletSimData.cs | 42 +++----
20 files changed, 152 insertions(+), 152 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
index 8a22bc7..231f0f8 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
@@ -75,7 +75,7 @@ private sealed class BulletBodyUnman : BulletBody
private sealed class BulletShapeUnman : BulletShape
{
public IntPtr ptr;
- public BulletShapeUnman(IntPtr xx, BSPhysicsShapeType typ)
+ public BulletShapeUnman(IntPtr xx, BSPhysicsShapeType typ)
: base()
{
ptr = xx;
@@ -255,7 +255,7 @@ public override BulletShape CreateHullShape(BulletWorld world, int hullCount, fl
{
BulletWorldUnman worldu = world as BulletWorldUnman;
return new BulletShapeUnman(
- BSAPICPP.CreateHullShape2(worldu.ptr, hullCount, hulls),
+ BSAPICPP.CreateHullShape2(worldu.ptr, hullCount, hulls),
BSPhysicsShapeType.SHAPE_HULL);
}
@@ -1503,7 +1503,7 @@ public static extern void DestroyObject2(IntPtr sim, IntPtr obj);
public static extern IntPtr CreateGroundPlaneShape2(uint id, float height, float collisionMargin);
[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
-public static extern IntPtr CreateTerrainShape2(uint id, Vector3 size, float minHeight, float maxHeight,
+public static extern IntPtr CreateTerrainShape2(uint id, Vector3 size, float minHeight, float maxHeight,
[MarshalAs(UnmanagedType.LPArray)] float[] heightMap,
float scaleFactor, float collisionMargin);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
index 1ef8b17..59780ae 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
@@ -81,7 +81,7 @@ private sealed class BulletBodyXNA : BulletBody
private sealed class BulletShapeXNA : BulletShape
{
public CollisionShape shape;
- public BulletShapeXNA(CollisionShape xx, BSPhysicsShapeType typ)
+ public BulletShapeXNA(CollisionShape xx, BSPhysicsShapeType typ)
: base()
{
shape = xx;
@@ -137,8 +137,8 @@ private sealed class BulletConstraintXNA : BulletConstraint
internal int LastEntityProperty = 0;
internal EntityProperties[] UpdatedObjects;
- internal Dictionary specialCollisionObjects;
-
+ internal Dictionary specialCollisionObjects;
+
private static int m_collisionsThisFrame;
private BSScene PhysicsScene { get; set; }
@@ -151,7 +151,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
}
///
- ///
+ ///
///
///
///
@@ -174,7 +174,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
DiscreteDynamicsWorld world = (pWorld as BulletWorldXNA).world;
TypedConstraint constraint = (pConstraint as BulletConstraintXNA).constrain;
world.AddConstraint(constraint, pDisableCollisionsBetweenLinkedObjects);
-
+
return true;
}
@@ -300,7 +300,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
public override bool GetForceUpdateAllAabbs(BulletWorld pWorld) {
DiscreteDynamicsWorld world = (pWorld as BulletWorldXNA).world;
return world.GetForceUpdateAllAabbs();
-
+
}
public override void SetForceUpdateAllAabbs(BulletWorld pWorld, bool pForce)
{
@@ -404,7 +404,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
IndexedMatrix mat = IndexedMatrix.CreateFromQuaternion(vquaternion);
mat._origin = vposition;
collisionObject.SetWorldTransform(mat);
-
+
}
public override Vector3 GetPosition(BulletBody pCollisionObject)
@@ -457,7 +457,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
{
CollisionObject collisionObject = (pCollisionObject as BulletBodyXNA).rigidBody;
collisionObject.Activate(pforceactivation);
-
+
}
public override Quaternion GetOrientation(BulletBody pCollisionObject)
@@ -486,7 +486,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
{
CollisionObject collisionObject = (pCollisionObject as BulletBodyXNA).rigidBody;
return collisionObject.GetCcdSweptSphereRadius();
-
+
}
public override IntPtr GetUserPointer(BulletBody pCollisionObject)
@@ -559,8 +559,8 @@ private sealed class BulletConstraintXNA : BulletConstraint
}
- public override BulletConstraint Create6DofConstraint(BulletWorld pWorld, BulletBody pBody1, BulletBody pBody2,
- Vector3 pframe1, Quaternion pframe1rot, Vector3 pframe2, Quaternion pframe2rot,
+ public override BulletConstraint Create6DofConstraint(BulletWorld pWorld, BulletBody pBody1, BulletBody pBody2,
+ Vector3 pframe1, Quaternion pframe1rot, Vector3 pframe2, Quaternion pframe2rot,
bool puseLinearReferenceFrameA, bool pdisableCollisionsBetweenLinkedBodies)
{
@@ -604,7 +604,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
}
///
- ///
+ ///
///
///
///
@@ -824,7 +824,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
{
RigidBody body = (pBody as BulletBodyXNA).rigidBody;
float angularDamping = body.GetAngularDamping();
- body.SetDamping(lin_damping, angularDamping);
+ body.SetDamping(lin_damping, angularDamping);
}
public override float GetLinearDamping(BulletBody pBody)
@@ -907,7 +907,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
RigidBody bo = co as RigidBody;
if (bo == null)
{
-
+
if (world.IsInWorld(co))
{
world.RemoveCollisionObject(co);
@@ -915,7 +915,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
}
else
{
-
+
if (world.IsInWorld(bo))
{
world.RemoveRigidBody(bo);
@@ -947,7 +947,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
// TODO: Turn this from a reference copy to a Value Copy.
BulletShapeXNA shape2 = new BulletShapeXNA(shape1, BSShapeTypeFromBroadPhaseNativeType(shape1.GetShapeType()));
-
+
return shape2;
}
@@ -957,7 +957,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
return false;
}
//(sim.ptr, shape.ptr, prim.LocalID, prim.RawPosition, prim.RawOrientation);
-
+
public override BulletBody CreateBodyFromShape(BulletWorld pWorld, BulletShape pShape, uint pLocalID, Vector3 pRawPosition, Quaternion pRawOrientation)
{
CollisionWorld world = (pWorld as BulletWorldXNA).world;
@@ -993,11 +993,11 @@ private sealed class BulletConstraintXNA : BulletConstraint
m_startWorldTransform = IndexedMatrix.Identity;
*/
body.SetUserPointer(pLocalID);
-
+
return new BulletBodyXNA(pLocalID, body);
}
-
+
public override BulletBody CreateBodyWithDefaultMotionState( BulletShape pShape, uint pLocalID, Vector3 pRawPosition, Quaternion pRawOrientation)
{
@@ -1025,7 +1025,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
public override Vector3 GetAnisotripicFriction(BulletConstraint pconstrain)
{
- /* TODO */
+ /* TODO */
return Vector3.Zero;
}
public override Vector3 SetAnisotripicFriction(BulletConstraint pconstrain, Vector3 frict) { /* TODO */ return Vector3.Zero; }
@@ -1035,7 +1035,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
{
CollisionObject collisionObject = (pCollisionObject as BulletBodyXNA).rigidBody;
return collisionObject.IsStaticObject();
-
+
}
public override bool IsKinematicObject(BulletBody pCollisionObject)
{
@@ -1098,10 +1098,10 @@ private sealed class BulletConstraintXNA : BulletConstraint
return new BulletWorldXNA(1, PhysicsScene, BSAPIXNA.Initialize2(worldExtent, configparms, maxCollisions, ref collisionArray, maxUpdates, ref updateArray, null));
}
- private static DiscreteDynamicsWorld Initialize2(Vector3 worldExtent,
+ private static DiscreteDynamicsWorld Initialize2(Vector3 worldExtent,
ConfigurationParameters[] o,
int mMaxCollisionsPerFrame, ref CollisionDesc[] collisionArray,
- int mMaxUpdatesPerFrame, ref EntityProperties[] updateArray,
+ int mMaxUpdatesPerFrame, ref EntityProperties[] updateArray,
object mDebugLogCallbackHandle)
{
CollisionWorld.WorldData.ParamData p = new CollisionWorld.WorldData.ParamData();
@@ -1138,9 +1138,9 @@ private sealed class BulletConstraintXNA : BulletConstraint
p.avatarCapsuleDepth = BSParam.AvatarCapsuleDepth;
p.avatarCapsuleHeight = BSParam.AvatarCapsuleHeight;
p.avatarContactProcessingThreshold = BSParam.AvatarContactProcessingThreshold;
-
+
p.vehicleAngularDamping = BSParam.VehicleAngularDamping;
-
+
p.maxPersistantManifoldPoolSize = o[0].maxPersistantManifoldPoolSize;
p.maxCollisionAlgorithmPoolSize = o[0].maxCollisionAlgorithmPoolSize;
p.shouldDisableContactPoolDynamicAllocation = o[0].shouldDisableContactPoolDynamicAllocation;
@@ -1160,7 +1160,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
p.linkConstraintSolverIterations = BSParam.LinkConstraintSolverIterations;
p.physicsLoggingFrames = o[0].physicsLoggingFrames;
DefaultCollisionConstructionInfo ccci = new DefaultCollisionConstructionInfo();
-
+
DefaultCollisionConfiguration cci = new DefaultCollisionConfiguration();
CollisionDispatcher m_dispatcher = new CollisionDispatcher(cci);
@@ -1263,7 +1263,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
}
}
return ret;
-
+
}
public override float GetAngularMotionDisc(BulletShape pShape)
@@ -1353,10 +1353,10 @@ private sealed class BulletConstraintXNA : BulletConstraint
CollisionShape shape = (pShape as BulletShapeXNA).shape;
gObj.SetCollisionShape(shape);
gObj.SetUserPointer(pLocalID);
-
+
if (specialCollisionObjects.ContainsKey(pLocalID))
specialCollisionObjects[pLocalID] = gObj;
- else
+ else
specialCollisionObjects.Add(pLocalID, gObj);
// TODO: Add to Special CollisionObjects!
@@ -1447,8 +1447,8 @@ private sealed class BulletConstraintXNA : BulletConstraint
return new BulletShapeXNA(ret, BSShapeTypeFromBroadPhaseNativeType(ret.GetShapeType()));
}
- public override BulletShape GetChildShapeFromCompoundShapeIndex(BulletShape cShape, int indx) {
-
+ public override BulletShape GetChildShapeFromCompoundShapeIndex(BulletShape cShape, int indx) {
+
if (cShape == null)
return null;
CompoundShape compoundShape = (cShape as BulletShapeXNA).shape as CompoundShape;
@@ -1456,7 +1456,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
BulletShape retShape = new BulletShapeXNA(shape, BSShapeTypeFromBroadPhaseNativeType(shape.GetShapeType()));
- return retShape;
+ return retShape;
}
public BSPhysicsShapeType BSShapeTypeFromBroadPhaseNativeType(BroadphaseNativeTypes pin)
@@ -1598,8 +1598,8 @@ private sealed class BulletConstraintXNA : BulletConstraint
return new BulletShapeXNA(m_planeshape, BSPhysicsShapeType.SHAPE_GROUNDPLANE);
}
- public override BulletConstraint Create6DofSpringConstraint(BulletWorld pWorld, BulletBody pBody1, BulletBody pBody2,
- Vector3 pframe1, Quaternion pframe1rot, Vector3 pframe2, Quaternion pframe2rot,
+ public override BulletConstraint Create6DofSpringConstraint(BulletWorld pWorld, BulletBody pBody1, BulletBody pBody2,
+ Vector3 pframe1, Quaternion pframe1rot, Vector3 pframe2, Quaternion pframe2rot,
bool puseLinearReferenceFrameA, bool pdisableCollisionsBetweenLinkedBodies)
{
@@ -1745,7 +1745,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
{
DiscreteDynamicsWorld world = (pWorld as BulletWorldXNA).world;
CompoundShape compoundshape = new CompoundShape(false);
-
+
compoundshape.SetMargin(world.WorldSettings.Params.collisionMargin);
int ii = 1;
@@ -1761,7 +1761,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
int ender = ((ii + 4) + (vertexCount*3));
for (int iii = ii + 4; iii < ender; iii+=3)
{
-
+
virts.Add(new IndexedVector3(pConvHulls[iii], pConvHulls[iii + 1], pConvHulls[iii +2]));
}
ConvexHullShape convexShape = new ConvexHullShape(virts, vertexCount);
@@ -1769,7 +1769,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
compoundshape.AddChildShape(ref childTrans, convexShape);
ii += (vertexCount*3 + 4);
}
-
+
return new BulletShapeXNA(compoundshape, BSPhysicsShapeType.SHAPE_HULL);
}
@@ -1791,13 +1791,13 @@ private sealed class BulletConstraintXNA : BulletConstraint
public override BulletShape CreateMeshShape(BulletWorld pWorld, int pIndicesCount, int[] indices, int pVerticesCount, float[] verticesAsFloats)
{
//DumpRaw(indices,verticesAsFloats,pIndicesCount,pVerticesCount);
-
+
for (int iter = 0; iter < pVerticesCount; iter++)
{
if (verticesAsFloats[iter] > 0 && verticesAsFloats[iter] < 0.0001) verticesAsFloats[iter] = 0;
if (verticesAsFloats[iter] < 0 && verticesAsFloats[iter] > -0.0001) verticesAsFloats[iter] = 0;
}
-
+
ObjectArray indicesarr = new ObjectArray(indices);
ObjectArray vertices = new ObjectArray(verticesAsFloats);
DumpRaw(indicesarr,vertices,pIndicesCount,pVerticesCount);
@@ -1811,7 +1811,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
mesh.m_vertexStride = 3;
mesh.m_vertexType = PHY_ScalarType.PHY_FLOAT;
mesh.m_triangleIndexStride = 3;
-
+
TriangleIndexVertexArray tribuilder = new TriangleIndexVertexArray();
tribuilder.AddIndexedMesh(mesh, PHY_ScalarType.PHY_INTEGER);
BvhTriangleMeshShape meshShape = new BvhTriangleMeshShape(tribuilder, true,true);
@@ -1822,7 +1822,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
}
public static void DumpRaw(ObjectArrayindices, ObjectArray vertices, int pIndicesCount,int pVerticesCount )
{
-
+
String fileName = "objTest3.raw";
String completePath = System.IO.Path.Combine(Util.configDir(), fileName);
StreamWriter sw = new StreamWriter(completePath);
@@ -1848,7 +1848,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
string s = vertices[indices[i * 3]].ToString("0.0000");
s += " " + vertices[indices[i * 3 + 1]].ToString("0.0000");
s += " " + vertices[indices[i * 3 + 2]].ToString("0.0000");
-
+
sw.Write(s + "\n");
}
@@ -1870,7 +1870,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
mesh.m_vertexStride = 3;
mesh.m_vertexType = PHY_ScalarType.PHY_FLOAT;
mesh.m_triangleIndexStride = 3;
-
+
TriangleIndexVertexArray tribuilder = new TriangleIndexVertexArray();
tribuilder.AddIndexedMesh(mesh, PHY_ScalarType.PHY_INTEGER);
@@ -1901,7 +1901,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
sw.Close();
}
- public override BulletShape CreateTerrainShape(uint id, Vector3 size, float minHeight, float maxHeight, float[] heightMap,
+ public override BulletShape CreateTerrainShape(uint id, Vector3 size, float minHeight, float maxHeight, float[] heightMap,
float scaleFactor, float collisionMargin)
{
const int upAxis = 2;
@@ -1943,14 +1943,14 @@ private sealed class BulletConstraintXNA : BulletConstraint
/* TODO */
updatedEntityCount = 0;
collidersCount = 0;
-
+
int ret = PhysicsStep2(world,timeStep,maxSubSteps,fixedTimeStep,out updatedEntityCount,out world.physicsScene.m_updateArray, out collidersCount, out world.physicsScene.m_collisionArray);
return ret;
}
- private int PhysicsStep2(BulletWorld pWorld, float timeStep, int m_maxSubSteps, float m_fixedTimeStep,
+ private int PhysicsStep2(BulletWorld pWorld, float timeStep, int m_maxSubSteps, float m_fixedTimeStep,
out int updatedEntityCount, out EntityProperties[] updatedEntities,
out int collidersCount, out CollisionDesc[] colliders)
{
@@ -1959,24 +1959,24 @@ private sealed class BulletConstraintXNA : BulletConstraint
return epic;
}
- private int PhysicsStepint(BulletWorld pWorld,float timeStep, int m_maxSubSteps, float m_fixedTimeStep, out int updatedEntityCount,
+ private int PhysicsStepint(BulletWorld pWorld,float timeStep, int m_maxSubSteps, float m_fixedTimeStep, out int updatedEntityCount,
out EntityProperties[] updatedEntities, out int collidersCount, out CollisionDesc[] colliders, int maxCollisions, int maxUpdates)
{
int numSimSteps = 0;
Array.Clear(UpdatedObjects, 0, UpdatedObjects.Length);
Array.Clear(UpdatedCollisions, 0, UpdatedCollisions.Length);
LastEntityProperty=0;
-
+
LastCollisionDesc=0;
-
+
updatedEntityCount = 0;
collidersCount = 0;
-
+
if (pWorld is BulletWorldXNA)
{
@@ -2033,7 +2033,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
collidersCount = LastCollisionDesc;
colliders = UpdatedCollisions;
-
+
}
else
@@ -2041,15 +2041,15 @@ private sealed class BulletConstraintXNA : BulletConstraint
//if (updatedEntities is null)
//updatedEntities = new List();
//updatedEntityCount = 0;
-
-
+
+
//collidersCount = 0;
-
+
updatedEntities = new EntityProperties[0];
-
+
colliders = new CollisionDesc[0];
-
+
}
return numSimSteps;
}
@@ -2057,7 +2057,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
{
IOverlappingPairCache cache = obj.GetOverlappingPairCache();
ObjectArray pairs = cache.GetOverlappingPairArray();
-
+
DiscreteDynamicsWorld world = (PhysicsScene.World as BulletWorldXNA).world;
PersistentManifoldArray manifoldArray = new PersistentManifoldArray();
BroadphasePair collisionPair;
@@ -2069,7 +2069,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
ManifoldPoint pt;
int numPairs = pairs.Count;
-
+
for (int i = 0; i < numPairs; i++)
{
manifoldArray.Clear();
@@ -2078,7 +2078,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
collisionPair = world.GetPairCache().FindPair(pairs[i].m_pProxy0, pairs[i].m_pProxy1);
if (collisionPair == null)
continue;
-
+
collisionPair.m_algorithm.GetAllContactManifolds(manifoldArray);
for (int j = 0; j < manifoldArray.Count; j++)
{
@@ -2101,7 +2101,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
}
private static void RecordCollision(BSAPIXNA world, CollisionObject objA, CollisionObject objB, IndexedVector3 contact, IndexedVector3 norm, float penetration)
{
-
+
IndexedVector3 contactNormal = norm;
if ((objA.GetCollisionFlags() & BulletXNA.BulletCollision.CollisionFlags.BS_WANTS_COLLISIONS) == 0 &&
(objB.GetCollisionFlags() & BulletXNA.BulletCollision.CollisionFlags.BS_WANTS_COLLISIONS) == 0)
@@ -2171,11 +2171,11 @@ private sealed class BulletConstraintXNA : BulletConstraint
if (NotMe is BulletBodyXNA && NotMe.HasPhysicalBody)
{
CollisionObject AvoidBody = (NotMe as BulletBodyXNA).body;
-
+
IndexedVector3 rOrigin = new IndexedVector3(_RayOrigin.X, _RayOrigin.Y, _RayOrigin.Z);
IndexedVector3 rEnd = new IndexedVector3(_RayOrigin.X, _RayOrigin.Y, _RayOrigin.Z - pRayHeight);
using (
- ClosestNotMeRayResultCallback rayCallback =
+ ClosestNotMeRayResultCallback rayCallback =
new ClosestNotMeRayResultCallback(rOrigin, rEnd, AvoidBody)
)
{
@@ -2191,9 +2191,9 @@ private sealed class BulletConstraintXNA : BulletConstraint
return false;
}
}
-
-
+
+
public class SimMotionState : DefaultMotionState
{
@@ -2286,12 +2286,12 @@ private sealed class BulletConstraintXNA : BulletConstraint
m_lastProperties = m_properties;
if (m_world.LastEntityProperty < m_world.UpdatedObjects.Length)
m_world.UpdatedObjects[m_world.LastEntityProperty++]=(m_properties);
-
+
//(*m_updatesThisFrame)[m_properties.ID] = &m_properties;
}
-
-
-
+
+
+
}
public override void SetRigidBody(RigidBody body)
@@ -2314,7 +2314,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
(((v1.Z - nEpsilon) < v2.Z) && (v2.Z < (v1.Z + nEpsilon))) &&
(((v1.W - nEpsilon) < v2.W) && (v2.W < (v1.W + nEpsilon)));
}
-
+
}
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index ac05979..4e067b5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -115,7 +115,7 @@ public class BSActorAvatarMove : BSActor
if (m_velocityMotor == null)
{
// Infinite decay and timescale values so motor only changes current to target values.
- m_velocityMotor = new BSVMotor("BSCharacter.Velocity",
+ m_velocityMotor = new BSVMotor("BSCharacter.Velocity",
0.2f, // time scale
BSMotor.Infinite, // decay time scale
BSMotor.InfiniteVector, // friction timescale
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
index 6059af5..7801d8e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
@@ -63,7 +63,7 @@ public class BSActorLockAxis : BSActor
// BSActor.Refresh()
public override void Refresh()
{
- m_physicsScene.DetailLog("{0},BSActorLockAxis,refresh,lockedAxis={1},enabled={2},pActive={3}",
+ m_physicsScene.DetailLog("{0},BSActorLockAxis,refresh,lockedAxis={1},enabled={2},pActive={3}",
m_controllingPrim.LocalID, m_controllingPrim.LockedAxis, Enabled, m_controllingPrim.IsPhysicallyActive);
// If all the axis are free, we don't need to exist
if (m_controllingPrim.LockedAxis == m_controllingPrim.LockedAxisFree)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
index 5e3f1c4..fff63e4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
@@ -117,7 +117,7 @@ public class BSActorCollection
/// Each physical object can have 'actors' who are pushing the object around.
/// This can be used for hover, locking axis, making vehicles, etc.
/// Each physical object can have multiple actors acting on it.
-///
+///
/// An actor usually registers itself with physics scene events (pre-step action)
/// and modifies the parameters on the host physical object.
///
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index bfeec24..3378c93 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -298,7 +298,7 @@ public abstract class BSAPITemplate
{
// Returns the name of the underlying Bullet engine
public abstract string BulletEngineName { get; }
-public abstract string BulletEngineVersion { get; protected set;}
+public abstract string BulletEngineVersion { get; protected set;}
// Initialization and simulation
public abstract BulletWorld Initialize(Vector3 maxPosition, ConfigurationParameters parms,
@@ -373,7 +373,7 @@ public abstract void DestroyObject(BulletWorld sim, BulletBody obj);
// =====================================================================================
public abstract BulletShape CreateGroundPlaneShape(UInt32 id, float height, float collisionMargin);
-public abstract BulletShape CreateTerrainShape(UInt32 id, Vector3 size, float minHeight, float maxHeight, float[] heightMap,
+public abstract BulletShape CreateTerrainShape(UInt32 id, Vector3 size, float minHeight, float maxHeight, float[] heightMap,
float scaleFactor, float collisionMargin);
// =====================================================================================
@@ -388,7 +388,7 @@ public abstract BulletConstraint Create6DofConstraintToPoint(BulletWorld world,
bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies);
public abstract BulletConstraint Create6DofConstraintFixed(BulletWorld world, BulletBody obj1,
- Vector3 frameInBloc, Quaternion frameInBrot,
+ Vector3 frameInBloc, Quaternion frameInBrot,
bool useLinearReferenceFrameB, bool disableCollisionsBetweenLinkedBodies);
public abstract BulletConstraint Create6DofSpringConstraint(BulletWorld world, BulletBody obj1, BulletBody obj2,
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index e12fc8e..542f732 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -371,7 +371,7 @@ public sealed class BSCharacter : BSPhysObject
public override float Mass { get { return _mass; } }
// used when we only want this prim's mass and not the linkset thing
- public override float RawMass {
+ public override float RawMass {
get {return _mass; }
}
public override void UpdatePhysicalMassProperties(float physMass, bool inWorld)
@@ -586,7 +586,7 @@ public sealed class BSCharacter : BSPhysObject
}
public override float ForceBuoyancy {
get { return _buoyancy; }
- set {
+ set {
PhysScene.AssertInTaintTime("BSCharacter.ForceBuoyancy");
_buoyancy = value;
@@ -647,7 +647,7 @@ public sealed class BSCharacter : BSPhysObject
private OMV.Vector3 ComputeAvatarScale(OMV.Vector3 size)
{
OMV.Vector3 newScale;
-
+
// Bullet's capsule total height is the "passed height + radius * 2";
// The base capsule is 1 diameter and 2 height (passed radius=0.5, passed height = 1)
// The number we pass in for 'scaling' is the multiplier to get that base
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs
index 7714a03..ed89f63 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs
@@ -45,7 +45,7 @@ public sealed class BSConstraintHinge : BSConstraint
m_body1 = obj1;
m_body2 = obj2;
m_constraint = PhysicsScene.PE.CreateHingeConstraint(world, obj1, obj2,
- pivotInA, pivotInB, axisInA, axisInB,
+ pivotInA, pivotInB, axisInA, axisInB,
useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies);
m_enabled = true;
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 56d2415..f535e50 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1019,7 +1019,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
Vector3 origVelW = VehicleVelocity; // DEBUG DEBUG
VehicleVelocity /= VehicleVelocity.Length();
VehicleVelocity *= BSParam.VehicleMaxLinearVelocity;
- VDetailLog("{0}, MoveLinear,clampMax,origVelW={1},lenSq={2},maxVelSq={3},,newVelW={4}",
+ VDetailLog("{0}, MoveLinear,clampMax,origVelW={1},lenSq={2},maxVelSq={3},,newVelW={4}",
ControllingPrim.LocalID, origVelW, newVelocityLengthSq, BSParam.VehicleMaxLinearVelocitySquared, VehicleVelocity);
}
else if (newVelocityLengthSq < 0.001f)
@@ -1094,7 +1094,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
if (VehiclePosition.Z > m_VhoverTargetHeight)
m_VhoverTargetHeight = VehiclePosition.Z;
}
-
+
if ((m_flags & VehicleFlag.LOCK_HOVER_HEIGHT) != 0)
{
if (Math.Abs(VehiclePosition.Z - m_VhoverTargetHeight) > 0.2f)
@@ -1188,7 +1188,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
// used with conjunction with banking: the strength of the banking will decay when the
// vehicle no longer experiences collisions. The decay timescale is the same as
// VEHICLE_BANKING_TIMESCALE. This is to help prevent ground vehicles from steering
- // when they are in mid jump.
+ // when they are in mid jump.
// TODO: this code is wrong. Also, what should it do for boats (height from water)?
// This is just using the ground and a general collision check. Should really be using
// a downward raycast to find what is below.
@@ -1254,7 +1254,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
VehicleAddForce(appliedGravity);
- VDetailLog("{0}, MoveLinear,applyGravity,vehGrav={1},collid={2},fudge={3},mass={4},appliedForce={3}",
+ VDetailLog("{0}, MoveLinear,applyGravity,vehGrav={1},collid={2},fudge={3},mass={4},appliedForce={3}",
ControllingPrim.LocalID, m_VehicleGravity,
ControllingPrim.IsColliding, BSParam.VehicleGroundGravityFudge, m_vehicleMass, appliedGravity);
}
@@ -1330,7 +1330,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
// From http://wiki.secondlife.com/wiki/LlSetVehicleFlags :
// This flag prevents linear deflection parallel to world z-axis. This is useful
// for preventing ground vehicles with large linear deflection, like bumper cars,
- // from climbing their linear deflection into the sky.
+ // from climbing their linear deflection into the sky.
// That is, NO_DEFLECTION_UP says angular motion should not add any pitch or roll movement
// TODO: This is here because this is where ODE put it but documentation says it
// is a linear effect. Where should this check go?
@@ -1463,7 +1463,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
VehicleRotationalVelocity += (vertContributionV * VehicleOrientation);
VDetailLog("{0}, MoveAngular,verticalAttraction,,origRotVW={1},vertError={2},unscaledV={3},eff={4},ts={5},vertContribV={6}",
- Prim.LocalID, origRotVelW, verticalError, unscaledContribVerticalErrorV,
+ Prim.LocalID, origRotVelW, verticalError, unscaledContribVerticalErrorV,
m_verticalAttractionEfficiency, m_verticalAttractionTimescale, vertContributionV);
*/
}
@@ -1530,13 +1530,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
// produce a angular velocity around the yaw-axis, causing the vehicle to turn. The magnitude
// of the yaw effect will be proportional to the
// VEHICLE_BANKING_EFFICIENCY, the angle of the roll rotation, and sometimes the vehicle's
- // velocity along its preferred axis of motion.
+ // velocity along its preferred axis of motion.
// The VEHICLE_BANKING_EFFICIENCY can vary between -1 and +1. When it is positive then any
// positive rotation (by the right-hand rule) about the roll-axis will effect a
// (negative) torque around the yaw-axis, making it turn to the right--that is the
// vehicle will lean into the turn, which is how real airplanes and motorcycle's work.
// Negating the banking coefficient will make it so that the vehicle leans to the
- // outside of the turn (not very "physical" but might allow interesting vehicles so why not?).
+ // outside of the turn (not very "physical" but might allow interesting vehicles so why not?).
// The VEHICLE_BANKING_MIX is a fake (i.e. non-physical) parameter that is useful for making
// banking vehicles do what you want rather than what the laws of physics allow.
// For example, consider a real motorcycle...it must be moving forward in order for
@@ -1548,11 +1548,11 @@ namespace OpenSim.Region.Physics.BulletSPlugin
// totally static (0.0) and totally dynamic (1.0). By "static" we mean that the
// banking effect depends only on the vehicle's rotation about its roll-axis compared
// to "dynamic" where the banking is also proportional to its velocity along its
- // roll-axis. Finding the best value of the "mixture" will probably require trial and error.
+ // roll-axis. Finding the best value of the "mixture" will probably require trial and error.
// The time it takes for the banking behavior to defeat a preexisting angular velocity about the
// world z-axis is determined by the VEHICLE_BANKING_TIMESCALE. So if you want the vehicle to
// bank quickly then give it a banking timescale of about a second or less, otherwise you can
- // make a sluggish vehicle by giving it a timescale of several seconds.
+ // make a sluggish vehicle by giving it a timescale of several seconds.
public void ComputeAngularBanking()
{
if (enableAngularBanking && m_bankingEfficiency != 0 && m_verticalAttractionTimescale < m_verticalAttractionCutoff)
@@ -1581,7 +1581,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
//VehicleRotationalVelocity += bankingContributionV * VehicleOrientation;
VehicleRotationalVelocity += bankingContributionV;
-
+
VDetailLog("{0}, MoveAngular,Banking,rollComp={1},speed={2},rollComp={3},yAng={4},mYAng={5},ret={6}",
ControllingPrim.LocalID, rollComponents, VehicleForwardSpeed, rollComponents, yawAngle, mixedYawAngle, bankingContributionV);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 6d0d0eb..76c2187 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -214,7 +214,7 @@ public abstract class BSLinkset
// I am the root of a linkset and a new child is being added
// Called while LinkActivity is locked.
protected abstract void AddChildToLinkset(BSPrimLinkable child);
-
+
// I am the root of a linkset and one of my children is being removed.
// Safe to call even if the child is not really in my linkset.
protected abstract void RemoveChildFromLinkset(BSPrimLinkable child);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 01ada3f..1fd541f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -114,7 +114,7 @@ public sealed class BSLinksetCompound : BSLinkset
// Schedule a refresh to happen after all the other taint processing.
private void ScheduleRebuild(BSPrimLinkable requestor)
{
- DetailLog("{0},BSLinksetCompound.ScheduleRebuild,,rebuilding={1},hasChildren={2},actuallyScheduling={3}",
+ DetailLog("{0},BSLinksetCompound.ScheduleRebuild,,rebuilding={1},hasChildren={2},actuallyScheduling={3}",
requestor.LocalID, Rebuilding, HasAnyChildren, (!Rebuilding && HasAnyChildren));
// When rebuilding, it is possible to set properties that would normally require a rebuild.
// If already rebuilding, don't request another rebuild.
@@ -208,7 +208,7 @@ public sealed class BSLinksetCompound : BSLinkset
// and that is caused by us updating the object.
if ((whichUpdated & ~(UpdatedProperties.Position | UpdatedProperties.Orientation)) == 0)
{
- // Find the physical instance of the child
+ // Find the physical instance of the child
if (LinksetRoot.PhysShape.HasPhysicalShape && m_physicsScene.PE.IsCompound(LinksetRoot.PhysShape.physShapeInfo))
{
// It is possible that the linkset is still under construction and the child is not yet
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
index 9501e2d..0128d8d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
@@ -102,7 +102,7 @@ public class BSVMotor : BSMotor
return ErrorIsZero(LastError);
}
public virtual bool ErrorIsZero(Vector3 err)
- {
+ {
return (err == Vector3.Zero || err.ApproxEquals(Vector3.Zero, ErrorZeroThreshold));
}
@@ -115,7 +115,7 @@ public class BSVMotor : BSMotor
CurrentValue = TargetValue = Vector3.Zero;
ErrorZeroThreshold = 0.001f;
}
- public BSVMotor(string useName, float timeScale, float decayTimeScale, Vector3 frictionTimeScale, float efficiency)
+ public BSVMotor(string useName, float timeScale, float decayTimeScale, Vector3 frictionTimeScale, float efficiency)
: this(useName)
{
TimeScale = timeScale;
@@ -237,7 +237,7 @@ public class BSVMotor : BSMotor
MDetailLog("{0},BSVMotor.Test,{1},===================================== BEGIN Test Output", BSScene.DetailLogZero, UseName);
MDetailLog("{0},BSVMotor.Test,{1},timeScale={2},targDlyTS={3},frictTS={4},eff={5},curr={6},tgt={7}",
BSScene.DetailLogZero, UseName,
- TimeScale, TargetValueDecayTimeScale, FrictionTimescale, Efficiency,
+ TimeScale, TargetValueDecayTimeScale, FrictionTimescale, Efficiency,
CurrentValue, TargetValue);
LastError = BSMotor.InfiniteVector;
@@ -248,7 +248,7 @@ public class BSVMotor : BSMotor
BSScene.DetailLogZero, UseName, CurrentValue, TargetValue, LastError, lastStep);
}
MDetailLog("{0},BSVMotor.Test,{1},===================================== END Test Output", BSScene.DetailLogZero, UseName);
-
+
}
@@ -279,7 +279,7 @@ public class BSFMotor : BSMotor
return ErrorIsZero(LastError);
}
public virtual bool ErrorIsZero(float err)
- {
+ {
return (err >= -ErrorZeroThreshold && err <= ErrorZeroThreshold);
}
@@ -410,7 +410,7 @@ public class BSPIDVMotor : BSVMotor
// The factors are vectors for the three dimensions. This is the proportional of each
// that is applied. This could be multiplied through the actual factors but it
// is sometimes easier to manipulate the factors and their mix separately.
- // to
+ // to
public Vector3 FactorMix;
// Arbritrary factor range.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 980d405..5ebeace 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
{
public static class BSParam
{
- private static string LogHeader = "[BULLETSIM PARAMETERS]";
+ private static string LogHeader = "[BULLETSIM PARAMETERS]";
// Tuning notes:
// From: http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?t=6575
@@ -51,7 +51,7 @@ public static class BSParam
// This is separate/independent from the collision margin. The collision margin increases the object a bit
// to improve collision detection performance and accuracy.
// ===================
- // From:
+ // From:
// Level of Detail values kept as float because that's what the Meshmerizer wants
public static float MeshLOD { get; private set; }
@@ -636,7 +636,7 @@ public static class BSParam
new ParameterDefn("ShouldDisableContactPoolDynamicAllocation", "Enable to allow large changes in object count",
false,
(s) => { return ShouldDisableContactPoolDynamicAllocation; },
- (s,v) => { ShouldDisableContactPoolDynamicAllocation = v;
+ (s,v) => { ShouldDisableContactPoolDynamicAllocation = v;
s.UnmanagedParams[0].shouldDisableContactPoolDynamicAllocation = NumericBool(v); } ),
new ParameterDefn("ShouldForceUpdateAllAabbs", "Enable to recomputer AABBs every simulator step",
false,
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 6a3ada2..28d4bd7 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
* Class to wrap all objects.
* The rest of BulletSim doesn't need to keep checking for avatars or prims
* unless the difference is significant.
- *
+ *
* Variables in the physicsl objects are in three forms:
* VariableName: used by the simulator and performs taint operations, etc
* RawVariableName: direct reference to the BulletSim storage for the variable value
@@ -52,7 +52,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
* SOP.ApplyImpulse SOP.ApplyAngularImpulse SOP.SetAngularImpulse SOP.SetForce
* SOG.ApplyImpulse SOG.ApplyAngularImpulse SOG.SetAngularImpulse
* PA.AddForce PA.AddAngularForce PA.Torque = v PA.Force = v
- * BS.ApplyCentralForce BS.ApplyTorque
+ * BS.ApplyCentralForce BS.ApplyTorque
*/
// Flags used to denote which properties updates when making UpdateProperties calls to linksets, etc.
@@ -353,7 +353,7 @@ public abstract class BSPhysObject : PhysicsActor
}
public override bool CollidingObj {
get { return (CollidingObjectStep == PhysScene.SimulationStep); }
- set {
+ set {
if (value)
CollidingObjectStep = PhysScene.SimulationStep;
else
@@ -447,7 +447,7 @@ public abstract class BSPhysObject : PhysicsActor
// The CollisionCollection instance is passed around in the simulator.
// Make sure we don't have a handle to that one and that a new one is used for next time.
- // This fixes an interesting 'gotcha'. If we call CollisionCollection.Clear() here,
+ // This fixes an interesting 'gotcha'. If we call CollisionCollection.Clear() here,
// a race condition is created for the other users of this instance.
CollisionCollection = new CollisionEventUpdate();
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 0d45579..7e2af78 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -420,7 +420,7 @@ public class BSPrim : BSPhysObject
get { return _mass; }
}
// used when we only want this prim's mass and not the linkset thing
- public override float RawMass {
+ public override float RawMass {
get { return _mass; }
}
// Set the physical mass to the passed mass.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index bfc7ae7..5c58ad5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -142,7 +142,7 @@ public abstract class BSShape
// If the shape was successfully created, nothing more to do
if (newShape.HasPhysicalShape)
return newShape;
-
+
// VerifyMeshCreated is called after trying to create the mesh. If we think the asset had been
// fetched but we end up here again, the meshing of the asset must have failed.
// Prevent trying to keep fetching the mesh by declaring failure.
@@ -155,7 +155,7 @@ public abstract class BSShape
else
{
// If this mesh has an underlying asset and we have not failed getting it before, fetch the asset
- if (prim.BaseShape.SculptEntry
+ if (prim.BaseShape.SculptEntry
&& prim.PrimAssetState != BSPhysObject.PrimAssetCondition.Failed
&& prim.PrimAssetState != BSPhysObject.PrimAssetCondition.Waiting
&& prim.BaseShape.SculptTexture != OMV.UUID.Zero
@@ -164,7 +164,7 @@ public abstract class BSShape
physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,fetchAsset", prim.LocalID);
// Multiple requestors will know we're waiting for this asset
prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Waiting;
-
+
BSPhysObject xprim = prim;
Util.FireAndForget(delegate
{
@@ -245,8 +245,8 @@ public class BSShapeNative : BSShape
{
}
- public static BSShape GetReference(BSScene physicsScene, BSPhysObject prim,
- BSPhysicsShapeType shapeType, FixedShapeKey shapeKey)
+ public static BSShape GetReference(BSScene physicsScene, BSPhysObject prim,
+ BSPhysicsShapeType shapeType, FixedShapeKey shapeKey)
{
// Native shapes are not shared and are always built anew.
return new BSShapeNative(CreatePhysicalNativeShape(physicsScene, prim, shapeType, shapeKey));
@@ -379,7 +379,7 @@ public class BSShapeMesh : BSShape
{
BulletShape newShape = null;
- IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod,
+ IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod,
false, // say it is not physical so a bounding box is not built
false // do not cache the mesh and do not use previously built versions
);
@@ -671,8 +671,8 @@ public class BSShapeCompound : BSShape
public BSShapeCompound(BulletShape pShape) : base(pShape)
{
}
- public static BSShape GetReference(BSScene physicsScene, BSPhysObject prim)
- {
+ public static BSShape GetReference(BSScene physicsScene, BSPhysObject prim)
+ {
// Compound shapes are not shared so a new one is created every time.
return new BSShapeCompound(CreatePhysicalCompoundShape(physicsScene, prim));
}
@@ -750,8 +750,8 @@ public class BSShapeAvatar : BSShape
public BSShapeAvatar() : base()
{
}
- public static BSShape GetReference(BSPhysObject prim)
- {
+ public static BSShape GetReference(BSPhysObject prim)
+ {
return new BSShapeNull();
}
public override void Dereference(BSScene physicsScene) { }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
index 5a19797..c7deb4e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
@@ -68,7 +68,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
// This minCoords and maxCoords passed in give the size of the terrain (min and max Z
// are the high and low points of the heightmap).
- public BSTerrainHeightmap(BSScene physicsScene, Vector3 regionBase, uint id, float[] initialMap,
+ public BSTerrainHeightmap(BSScene physicsScene, Vector3 regionBase, uint id, float[] initialMap,
Vector3 minCoords, Vector3 maxCoords)
: base(physicsScene, regionBase, id)
{
@@ -92,7 +92,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
private void BuildHeightmapTerrain()
{
// Create the terrain shape from the mapInfo
- m_mapInfo.terrainShape = m_physicsScene.PE.CreateTerrainShape( m_mapInfo.ID,
+ m_mapInfo.terrainShape = m_physicsScene.PE.CreateTerrainShape( m_mapInfo.ID,
new Vector3(m_mapInfo.sizeX, m_mapInfo.sizeY, 0), m_mapInfo.minZ, m_mapInfo.maxZ,
m_mapInfo.heightMap, 1f, BSParam.TerrainCollisionMargin);
@@ -103,7 +103,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
centerPos.Y = m_mapInfo.minCoords.Y + (m_mapInfo.sizeY / 2f);
centerPos.Z = m_mapInfo.minZ + ((m_mapInfo.maxZ - m_mapInfo.minZ) / 2f);
- m_mapInfo.terrainBody = m_physicsScene.PE.CreateBodyWithDefaultMotionState(m_mapInfo.terrainShape,
+ m_mapInfo.terrainBody = m_physicsScene.PE.CreateBodyWithDefaultMotionState(m_mapInfo.terrainShape,
m_mapInfo.ID, centerPos, Quaternion.Identity);
// Set current terrain attributes
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
index 0d16eda..c4807c4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
@@ -135,7 +135,7 @@ public sealed class BSTerrainManager : IDisposable
DetailLog("{0},BSTerrainManager.CreateInitialGroundPlaneAndTerrain,region={1}", BSScene.DetailLogZero, m_physicsScene.RegionName);
// The ground plane is here to catch things that are trying to drop to negative infinity
BulletShape groundPlaneShape = m_physicsScene.PE.CreateGroundPlaneShape(BSScene.GROUNDPLANE_ID, 1f, BSParam.TerrainCollisionMargin);
- m_groundPlane = m_physicsScene.PE.CreateBodyWithDefaultMotionState(groundPlaneShape,
+ m_groundPlane = m_physicsScene.PE.CreateBodyWithDefaultMotionState(groundPlaneShape,
BSScene.GROUNDPLANE_ID, Vector3.Zero, Quaternion.Identity);
m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, m_groundPlane);
@@ -318,8 +318,8 @@ public sealed class BSTerrainManager : IDisposable
// TODO: redo terrain implementation selection to allow other base types than heightMap.
private BSTerrainPhys BuildPhysicalTerrain(Vector3 terrainRegionBase, uint id, float[] heightMap, Vector3 minCoords, Vector3 maxCoords)
{
- m_physicsScene.Logger.DebugFormat("{0} Terrain for {1}/{2} created with {3}",
- LogHeader, m_physicsScene.RegionName, terrainRegionBase,
+ m_physicsScene.Logger.DebugFormat("{0} Terrain for {1}/{2} created with {3}",
+ LogHeader, m_physicsScene.RegionName, terrainRegionBase,
(BSTerrainPhys.TerrainImplementation)BSParam.TerrainImplementation);
BSTerrainPhys newTerrainPhys = null;
switch ((int)BSParam.TerrainImplementation)
@@ -334,8 +334,8 @@ public sealed class BSTerrainManager : IDisposable
break;
default:
m_physicsScene.Logger.ErrorFormat("{0} Bad terrain implementation specified. Type={1}/{2},Region={3}/{4}",
- LogHeader,
- (int)BSParam.TerrainImplementation,
+ LogHeader,
+ (int)BSParam.TerrainImplementation,
BSParam.TerrainImplementation,
m_physicsScene.RegionName, terrainRegionBase);
break;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
index ee2a1f2..e4ca098 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
@@ -51,7 +51,7 @@ public sealed class BSTerrainMesh : BSTerrainPhys
BulletShape m_terrainShape;
BulletBody m_terrainBody;
- public BSTerrainMesh(BSScene physicsScene, Vector3 regionBase, uint id, Vector3 regionSize)
+ public BSTerrainMesh(BSScene physicsScene, Vector3 regionBase, uint id, Vector3 regionSize)
: base(physicsScene, regionBase, id)
{
}
@@ -62,7 +62,7 @@ public sealed class BSTerrainMesh : BSTerrainPhys
}
// Create terrain mesh from a heightmap.
- public BSTerrainMesh(BSScene physicsScene, Vector3 regionBase, uint id, float[] initialMap,
+ public BSTerrainMesh(BSScene physicsScene, Vector3 regionBase, uint id, float[] initialMap,
Vector3 minCoords, Vector3 maxCoords)
: base(physicsScene, regionBase, id)
{
@@ -104,7 +104,7 @@ public sealed class BSTerrainMesh : BSTerrainPhys
return;
}
- m_physicsScene.DetailLog("{0},BSTerrainMesh.create,meshed,id={1},indices={2},indSz={3},vertices={4},vertSz={5}",
+ m_physicsScene.DetailLog("{0},BSTerrainMesh.create,meshed,id={1},indices={2},indSz={3},vertices={4},vertSz={5}",
BSScene.DetailLogZero, ID, indicesCount, indices.Length, verticesCount, vertices.Length);
m_terrainShape = m_physicsScene.PE.CreateMeshShape(m_physicsScene.World, indicesCount, indices, verticesCount, vertices);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
index 906e4f9..d5060e3 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
@@ -224,42 +224,42 @@ public static class BulletSimData
// As mentioned above, don't use the CollisionFilterGroups definitions directly in the code
// but, instead, use references to this dictionary. Finding and debugging
// collision flag problems will be made easier.
-public static Dictionary CollisionTypeMasks
+public static Dictionary CollisionTypeMasks
= new Dictionary()
{
- { CollisionType.Avatar,
- new CollisionTypeFilterGroup(CollisionType.Avatar,
- (uint)CollisionFilterGroups.BCharacterGroup,
+ { CollisionType.Avatar,
+ new CollisionTypeFilterGroup(CollisionType.Avatar,
+ (uint)CollisionFilterGroups.BCharacterGroup,
(uint)CollisionFilterGroups.BAllGroup)
},
- { CollisionType.Groundplane,
- new CollisionTypeFilterGroup(CollisionType.Groundplane,
- (uint)CollisionFilterGroups.BGroundPlaneGroup,
+ { CollisionType.Groundplane,
+ new CollisionTypeFilterGroup(CollisionType.Groundplane,
+ (uint)CollisionFilterGroups.BGroundPlaneGroup,
(uint)CollisionFilterGroups.BAllGroup)
},
- { CollisionType.Terrain,
- new CollisionTypeFilterGroup(CollisionType.Terrain,
- (uint)CollisionFilterGroups.BTerrainGroup,
+ { CollisionType.Terrain,
+ new CollisionTypeFilterGroup(CollisionType.Terrain,
+ (uint)CollisionFilterGroups.BTerrainGroup,
(uint)(CollisionFilterGroups.BAllGroup & ~CollisionFilterGroups.BStaticGroup))
},
- { CollisionType.Static,
- new CollisionTypeFilterGroup(CollisionType.Static,
- (uint)CollisionFilterGroups.BStaticGroup,
+ { CollisionType.Static,
+ new CollisionTypeFilterGroup(CollisionType.Static,
+ (uint)CollisionFilterGroups.BStaticGroup,
(uint)(CollisionFilterGroups.BCharacterGroup | CollisionFilterGroups.BSolidGroup))
},
- { CollisionType.Dynamic,
- new CollisionTypeFilterGroup(CollisionType.Dynamic,
- (uint)CollisionFilterGroups.BSolidGroup,
+ { CollisionType.Dynamic,
+ new CollisionTypeFilterGroup(CollisionType.Dynamic,
+ (uint)CollisionFilterGroups.BSolidGroup,
(uint)(CollisionFilterGroups.BAllGroup))
},
- { CollisionType.VolumeDetect,
- new CollisionTypeFilterGroup(CollisionType.VolumeDetect,
- (uint)CollisionFilterGroups.BSensorTrigger,
+ { CollisionType.VolumeDetect,
+ new CollisionTypeFilterGroup(CollisionType.VolumeDetect,
+ (uint)CollisionFilterGroups.BSensorTrigger,
(uint)(~CollisionFilterGroups.BSensorTrigger))
},
{ CollisionType.LinksetChild,
- new CollisionTypeFilterGroup(CollisionType.LinksetChild,
- (uint)CollisionFilterGroups.BLinksetChildGroup,
+ new CollisionTypeFilterGroup(CollisionType.LinksetChild,
+ (uint)CollisionFilterGroups.BLinksetChildGroup,
(uint)(CollisionFilterGroups.BNoneGroup))
// (uint)(CollisionFilterGroups.BCharacterGroup | CollisionFilterGroups.BSolidGroup))
},
--
cgit v1.1
From 12054aaa9ff66cc785d2018526ff6f3e94f86915 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Apr 2013 17:14:44 +0100
Subject: Fix bug where an agent that declined an inventory offer and
subsequently emptied their trash would make the item invalid in the giver's
inventory
This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
---
.../Avatar/Inventory/Transfer/InventoryTransferModule.cs | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index bcb7f42..e1ada97 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -213,7 +213,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
user.ControllingClient.SendBulkUpdateInventory(folderCopy);
// HACK!!
- im.imSessionID = folderID.Guid;
+ // Insert the ID of the copied item into the IM so that we know which item to move to trash if it
+ // is rejected.
+ // XXX: This is probably a misuse of the session ID slot.
+ im.imSessionID = copyID.Guid;
}
else
{
@@ -243,7 +246,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
user.ControllingClient.SendBulkUpdateInventory(itemCopy);
// HACK!!
- im.imSessionID = itemID.Guid;
+ // Insert the ID of the copied item into the IM so that we know which item to move to trash if it
+ // is rejected.
+ // XXX: This is probably a misuse of the session ID slot.
+ im.imSessionID = copyID.Guid;
}
// Send the IM to the recipient. The item is already
--
cgit v1.1
From a7cbb9edc98fabc6d2705d69310f4356e84c7596 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Apr 2013 20:50:49 +0100
Subject: Add regression test for offer, accept and subsequent receiver delete
of an item offered via instant message.
---
.../Inventory/Transfer/InventoryTransferModule.cs | 83 +---------------------
OpenSim/Tests/Common/Mock/TestClient.cs | 12 ++++
2 files changed, 15 insertions(+), 80 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index e1ada97..c292700 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -47,10 +47,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
///
private List m_Scenelist = new List();
-// private Dictionary m_AgentRegions =
-// new Dictionary();
- private IMessageTransferModule m_TransferModule = null;
+ private IMessageTransferModule m_TransferModule;
private bool m_Enabled = true;
#region Region Module interface
@@ -81,9 +79,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
// scene.RegisterModuleInterface(this);
scene.EventManager.OnNewClient += OnNewClient;
-// scene.EventManager.OnClientClosed += ClientLoggedOut;
scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
-// scene.EventManager.OnSetRootAgentScene += OnSetRootAgentScene;
}
public void RegionLoaded(Scene scene)
@@ -96,11 +92,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
m_log.Error("[INVENTORY TRANSFER]: No Message transfer module found, transfers will be local only");
m_Enabled = false;
- m_Scenelist.Clear();
- scene.EventManager.OnNewClient -= OnNewClient;
-// scene.EventManager.OnClientClosed -= ClientLoggedOut;
+// m_Scenelist.Clear();
+// scene.EventManager.OnNewClient -= OnNewClient;
scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
-// scene.EventManager.OnSetRootAgentScene -= OnSetRootAgentScene;
}
}
}
@@ -108,9 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
public void RemoveRegion(Scene scene)
{
scene.EventManager.OnNewClient -= OnNewClient;
-// scene.EventManager.OnClientClosed -= ClientLoggedOut;
scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
-// scene.EventManager.OnSetRootAgentScene -= OnSetRootAgentScene;
m_Scenelist.Remove(scene);
}
@@ -139,11 +131,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
// Inventory giving is conducted via instant message
client.OnInstantMessage += OnInstantMessage;
}
-
-// protected void OnSetRootAgentScene(UUID id, Scene scene)
-// {
-// m_AgentRegions[id] = scene;
-// }
private Scene FindClientScene(UUID agentId)
{
@@ -460,70 +447,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
}
}
-// public bool NeedSceneCacheClear(UUID agentID, Scene scene)
-// {
-// if (!m_AgentRegions.ContainsKey(agentID))
-// {
-// // Since we can get here two ways, we need to scan
-// // the scenes here. This is somewhat more expensive
-// // but helps avoid a nasty bug
-// //
-//
-// foreach (Scene s in m_Scenelist)
-// {
-// ScenePresence presence;
-//
-// if (s.TryGetScenePresence(agentID, out presence))
-// {
-// // If the agent is in this scene, then we
-// // are being called twice in a single
-// // teleport. This is wasteful of cycles
-// // but harmless due to this 2nd level check
-// //
-// // If the agent is found in another scene
-// // then the list wasn't current
-// //
-// // If the agent is totally unknown, then what
-// // are we even doing here??
-// //
-// if (s == scene)
-// {
-// //m_log.Debug("[INVTRANSFERMOD]: s == scene. Returning true in " + scene.RegionInfo.RegionName);
-// return true;
-// }
-// else
-// {
-// //m_log.Debug("[INVTRANSFERMOD]: s != scene. Returning false in " + scene.RegionInfo.RegionName);
-// return false;
-// }
-// }
-// }
-// //m_log.Debug("[INVTRANSFERMOD]: agent not in scene. Returning true in " + scene.RegionInfo.RegionName);
-// return true;
-// }
-//
-// // The agent is left in current Scene, so we must be
-// // going to another instance
-// //
-// if (m_AgentRegions[agentID] == scene)
-// {
-// //m_log.Debug("[INVTRANSFERMOD]: m_AgentRegions[agentID] == scene. Returning true in " + scene.RegionInfo.RegionName);
-// m_AgentRegions.Remove(agentID);
-// return true;
-// }
-//
-// // Another region has claimed the agent
-// //
-// //m_log.Debug("[INVTRANSFERMOD]: last resort. Returning false in " + scene.RegionInfo.RegionName);
-// return false;
-// }
-//
-// public void ClientLoggedOut(UUID agentID, Scene scene)
-// {
-// if (m_AgentRegions.ContainsKey(agentID))
-// m_AgentRegions.Remove(agentID);
-// }
-
///
///
///
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index d26e3f7..b7a7463 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -484,6 +484,18 @@ namespace OpenSim.Tests.Common.Mock
OnCompleteMovementToRegion(this, true);
}
+ ///
+ /// Emulate sending an IM from the viewer to the simulator.
+ ///
+ ///
+ public void HandleImprovedInstantMessage(GridInstantMessage im)
+ {
+ ImprovedInstantMessage handlerInstantMessage = OnInstantMessage;
+
+ if (handlerInstantMessage != null)
+ handlerInstantMessage(this, im);
+ }
+
public virtual void ActivateGesture(UUID assetId, UUID gestureId)
{
}
--
cgit v1.1
From 0beccf23c0c2e7b2420f4f150d5f2566f0d63370 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Apr 2013 21:11:44 +0100
Subject: Add regression test for inventory item give, reject and subsequent
trash folder purge by receiver.
This commit also actually adds the InventoryTransferModuleTests file which I previously forgot
---
.../Transfer/Tests/InventoryTransferModuleTests.cs | 256 +++++++++++++++++++++
OpenSim/Tests/Common/Mock/TestClient.cs | 4 +-
2 files changed, 259 insertions(+), 1 deletion(-)
create mode 100644 OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
new file mode 100644
index 0000000..b07d38c
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
@@ -0,0 +1,256 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using log4net.Config;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenMetaverse.Assets;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Avatar.Inventory.Transfer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
+{
+ [TestFixture]
+ public class InventoryTransferModuleTests : OpenSimTestCase
+ {
+ protected TestScene m_scene;
+
+ [SetUp]
+ public override void SetUp()
+ {
+ base.SetUp();
+
+ IConfigSource config = new IniConfigSource();
+ config.AddConfig("Messaging");
+ config.Configs["Messaging"].Set("InventoryTransferModule", "InventoryTransferModule");
+
+ m_scene = new SceneHelpers().SetupScene();
+ SceneHelpers.SetupSceneModules(m_scene, config, new InventoryTransferModule());
+ }
+
+ [Test]
+ public void TestAcceptGivenItem()
+ {
+// TestHelpers.EnableLogging();
+
+ UUID initialSessionId = TestHelpers.ParseTail(0x10);
+ UUID itemId = TestHelpers.ParseTail(0x100);
+ UUID assetId = TestHelpers.ParseTail(0x200);
+
+ UserAccount ua1
+ = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
+ UserAccount ua2
+ = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
+
+ ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
+ TestClient giverClient = (TestClient)giverSp.ControllingClient;
+
+ ScenePresence receiverSp = SceneHelpers.AddScenePresence(m_scene, ua2);
+ TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
+
+ // Create the object to test give
+ InventoryItemBase originalItem
+ = UserInventoryHelpers.CreateInventoryItem(
+ m_scene, "givenObj", itemId, assetId, giverSp.UUID, InventoryType.Object);
+
+ byte[] giveImBinaryBucket = new byte[17];
+ byte[] itemIdBytes = itemId.GetBytes();
+ Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
+
+ GridInstantMessage giveIm
+ = new GridInstantMessage(
+ m_scene,
+ giverSp.UUID,
+ giverSp.Name,
+ receiverSp.UUID,
+ (byte)InstantMessageDialog.InventoryOffered,
+ false,
+ "inventory offered msg",
+ initialSessionId,
+ false,
+ Vector3.Zero,
+ giveImBinaryBucket,
+ true);
+
+ giverClient.HandleImprovedInstantMessage(giveIm);
+
+ // These details might not all be correct.
+ GridInstantMessage acceptIm
+ = new GridInstantMessage(
+ m_scene,
+ receiverSp.UUID,
+ receiverSp.Name,
+ giverSp.UUID,
+ (byte)InstantMessageDialog.InventoryAccepted,
+ false,
+ "inventory accepted msg",
+ initialSessionId,
+ false,
+ Vector3.Zero,
+ null,
+ true);
+
+ receiverClient.HandleImprovedInstantMessage(acceptIm);
+
+ // Test for item remaining in the giver's inventory (here we assume a copy item)
+ // TODO: Test no-copy items.
+ InventoryItemBase originalItemAfterGive
+ = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, giverSp.UUID, "Objects/givenObj");
+
+ Assert.That(originalItemAfterGive, Is.Not.Null);
+ Assert.That(originalItemAfterGive.ID, Is.EqualTo(originalItem.ID));
+
+ // Test for item successfully making it into the receiver's inventory
+ InventoryItemBase receivedItem
+ = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, receiverSp.UUID, "Objects/givenObj");
+
+ Assert.That(receivedItem, Is.Not.Null);
+ Assert.That(receivedItem.ID, Is.Not.EqualTo(originalItem.ID));
+
+ // Test that on a delete, item still exists and is accessible for the giver.
+ m_scene.InventoryService.DeleteItems(receiverSp.UUID, new List() { receivedItem.ID });
+
+ InventoryItemBase originalItemAfterDelete
+ = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, giverSp.UUID, "Objects/givenObj");
+
+ Assert.That(originalItemAfterDelete, Is.Not.Null);
+
+ // TODO: Test scenario where giver deletes their item first.
+ }
+
+ ///
+ /// Test user rejection of a given item.
+ ///
+ ///
+ /// A rejected item still ends up in the user's trash folder.
+ ///
+ [Test]
+ public void TestRejectGivenItem()
+ {
+// TestHelpers.EnableLogging();
+
+ UUID initialSessionId = TestHelpers.ParseTail(0x10);
+ UUID itemId = TestHelpers.ParseTail(0x100);
+ UUID assetId = TestHelpers.ParseTail(0x200);
+
+ UserAccount ua1
+ = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
+ UserAccount ua2
+ = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
+
+ ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
+ TestClient giverClient = (TestClient)giverSp.ControllingClient;
+
+ ScenePresence receiverSp = SceneHelpers.AddScenePresence(m_scene, ua2);
+ TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
+
+ // Create the object to test give
+ InventoryItemBase originalItem
+ = UserInventoryHelpers.CreateInventoryItem(
+ m_scene, "givenObj", itemId, assetId, giverSp.UUID, InventoryType.Object);
+
+ GridInstantMessage receivedIm = null;
+ receiverClient.OnReceivedInstantMessage += im => receivedIm = im;
+
+ byte[] giveImBinaryBucket = new byte[17];
+ byte[] itemIdBytes = itemId.GetBytes();
+ Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
+
+ GridInstantMessage giveIm
+ = new GridInstantMessage(
+ m_scene,
+ giverSp.UUID,
+ giverSp.Name,
+ receiverSp.UUID,
+ (byte)InstantMessageDialog.InventoryOffered,
+ false,
+ "inventory offered msg",
+ initialSessionId,
+ false,
+ Vector3.Zero,
+ giveImBinaryBucket,
+ true);
+
+ giverClient.HandleImprovedInstantMessage(giveIm);
+
+ // These details might not all be correct.
+ // Session ID is now the created item ID (!)
+ GridInstantMessage rejectIm
+ = new GridInstantMessage(
+ m_scene,
+ receiverSp.UUID,
+ receiverSp.Name,
+ giverSp.UUID,
+ (byte)InstantMessageDialog.InventoryDeclined,
+ false,
+ "inventory declined msg",
+ new UUID(receivedIm.imSessionID),
+ false,
+ Vector3.Zero,
+ null,
+ true);
+
+ receiverClient.HandleImprovedInstantMessage(rejectIm);
+
+ // Test for item remaining in the giver's inventory (here we assume a copy item)
+ // TODO: Test no-copy items.
+ InventoryItemBase originalItemAfterGive
+ = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, giverSp.UUID, "Objects/givenObj");
+
+ Assert.That(originalItemAfterGive, Is.Not.Null);
+ Assert.That(originalItemAfterGive.ID, Is.EqualTo(originalItem.ID));
+
+ // Test for item successfully making it into the receiver's inventory
+ InventoryItemBase receivedItem
+ = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, receiverSp.UUID, "Trash/givenObj");
+
+ InventoryFolderBase trashFolder
+ = m_scene.InventoryService.GetFolderForType(receiverSp.UUID, AssetType.TrashFolder);
+
+ Assert.That(receivedItem, Is.Not.Null);
+ Assert.That(receivedItem.ID, Is.Not.EqualTo(originalItem.ID));
+ Assert.That(receivedItem.Folder, Is.EqualTo(trashFolder.ID));
+
+ // Test that on a delete, item still exists and is accessible for the giver.
+ m_scene.InventoryService.PurgeFolder(trashFolder);
+
+ InventoryItemBase originalItemAfterDelete
+ = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, giverSp.UUID, "Objects/givenObj");
+
+ Assert.That(originalItemAfterDelete, Is.Not.Null);
+ }
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index b7a7463..41402a4 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -61,6 +61,7 @@ namespace OpenSim.Tests.Common.Mock
// Test client specific events - for use by tests to implement some IClientAPI behaviour.
public event Action OnReceivedMoveAgentIntoRegion;
public event Action OnTestClientInformClientOfNeighbour;
+ public event Action OnReceivedInstantMessage;
// disable warning: public events, part of the public API
#pragma warning disable 67
@@ -550,7 +551,8 @@ namespace OpenSim.Tests.Common.Mock
public void SendInstantMessage(GridInstantMessage im)
{
-
+ if (OnReceivedInstantMessage != null)
+ OnReceivedInstantMessage(im);
}
public void SendGenericMessage(string method, UUID invoice, List message)
--
cgit v1.1
From 67789201c3ae40bd4697f3479eb183599baa3658 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Apr 2013 22:14:13 +0100
Subject: Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression
tests
---
.../Inventory/Transfer/InventoryTransferModule.cs | 10 +-
.../Transfer/Tests/InventoryTransferModuleTests.cs | 193 +++++++++++++++++++++
.../Tests/Common/Helpers/UserInventoryHelpers.cs | 41 ++++-
.../Tests/Common/Mock/TestXInventoryDataPlugin.cs | 28 ++-
4 files changed, 262 insertions(+), 10 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index c292700..1417a19 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -175,9 +175,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
{
UUID folderID = new UUID(im.binaryBucket, 1);
- m_log.DebugFormat("[INVENTORY TRANSFER]: Inserting original folder {0} "+
- "into agent {1}'s inventory",
- folderID, new UUID(im.toAgentID));
+ m_log.DebugFormat(
+ "[INVENTORY TRANSFER]: Inserting original folder {0} into agent {1}'s inventory",
+ folderID, new UUID(im.toAgentID));
InventoryFolderBase folderCopy
= scene.GiveInventoryFolder(receipientID, client.AgentId, folderID, UUID.Zero);
@@ -200,7 +200,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
user.ControllingClient.SendBulkUpdateInventory(folderCopy);
// HACK!!
- // Insert the ID of the copied item into the IM so that we know which item to move to trash if it
+ // Insert the ID of the copied folder into the IM so that we know which item to move to trash if it
// is rejected.
// XXX: This is probably a misuse of the session ID slot.
im.imSessionID = copyID.Guid;
@@ -396,7 +396,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
{
folder = new InventoryFolderBase(inventoryID, client.AgentId);
folder = invService.GetFolder(folder);
-
+
if (folder != null & trashFolder != null)
{
previousParentFolderID = folder.ParentID;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
index b07d38c..162a0c3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
@@ -252,5 +252,198 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
Assert.That(originalItemAfterDelete, Is.Not.Null);
}
+
+ [Test]
+ public void TestAcceptGivenFolder()
+ {
+ TestHelpers.InMethod();
+// TestHelpers.EnableLogging();
+
+ UUID initialSessionId = TestHelpers.ParseTail(0x10);
+ UUID folderId = TestHelpers.ParseTail(0x100);
+
+ UserAccount ua1
+ = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
+ UserAccount ua2
+ = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
+
+ ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
+ TestClient giverClient = (TestClient)giverSp.ControllingClient;
+
+ ScenePresence receiverSp = SceneHelpers.AddScenePresence(m_scene, ua2);
+ TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
+
+ InventoryFolderBase originalFolder
+ = UserInventoryHelpers.CreateInventoryFolder(
+ m_scene.InventoryService, giverSp.UUID, folderId, "f1", true);
+
+ byte[] giveImBinaryBucket = new byte[17];
+ giveImBinaryBucket[0] = (byte)AssetType.Folder;
+ byte[] itemIdBytes = folderId.GetBytes();
+ Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
+
+ GridInstantMessage giveIm
+ = new GridInstantMessage(
+ m_scene,
+ giverSp.UUID,
+ giverSp.Name,
+ receiverSp.UUID,
+ (byte)InstantMessageDialog.InventoryOffered,
+ false,
+ "inventory offered msg",
+ initialSessionId,
+ false,
+ Vector3.Zero,
+ giveImBinaryBucket,
+ true);
+
+ giverClient.HandleImprovedInstantMessage(giveIm);
+
+ // These details might not all be correct.
+ GridInstantMessage acceptIm
+ = new GridInstantMessage(
+ m_scene,
+ receiverSp.UUID,
+ receiverSp.Name,
+ giverSp.UUID,
+ (byte)InstantMessageDialog.InventoryAccepted,
+ false,
+ "inventory accepted msg",
+ initialSessionId,
+ false,
+ Vector3.Zero,
+ null,
+ true);
+
+ receiverClient.HandleImprovedInstantMessage(acceptIm);
+
+ // Test for item remaining in the giver's inventory (here we assume a copy item)
+ // TODO: Test no-copy items.
+ InventoryFolderBase originalFolderAfterGive
+ = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, giverSp.UUID, "f1");
+
+ Assert.That(originalFolderAfterGive, Is.Not.Null);
+ Assert.That(originalFolderAfterGive.ID, Is.EqualTo(originalFolder.ID));
+
+ // Test for item successfully making it into the receiver's inventory
+ InventoryFolderBase receivedFolder
+ = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, receiverSp.UUID, "f1");
+
+ Assert.That(receivedFolder, Is.Not.Null);
+ Assert.That(receivedFolder.ID, Is.Not.EqualTo(originalFolder.ID));
+
+ // Test that on a delete, item still exists and is accessible for the giver.
+ m_scene.InventoryService.DeleteFolders(receiverSp.UUID, new List() { receivedFolder.ID });
+
+ InventoryFolderBase originalFolderAfterDelete
+ = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, giverSp.UUID, "f1");
+
+ Assert.That(originalFolderAfterDelete, Is.Not.Null);
+
+ // TODO: Test scenario where giver deletes their item first.
+ }
+
+ ///
+ /// Test user rejection of a given item.
+ ///
+ ///
+ /// A rejected item still ends up in the user's trash folder.
+ ///
+ [Test]
+ public void TestRejectGivenFolder()
+ {
+ TestHelpers.InMethod();
+// TestHelpers.EnableLogging();
+
+ UUID initialSessionId = TestHelpers.ParseTail(0x10);
+ UUID folderId = TestHelpers.ParseTail(0x100);
+
+ UserAccount ua1
+ = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
+ UserAccount ua2
+ = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
+
+ ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
+ TestClient giverClient = (TestClient)giverSp.ControllingClient;
+
+ ScenePresence receiverSp = SceneHelpers.AddScenePresence(m_scene, ua2);
+ TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
+
+ // Create the folder to test give
+ InventoryFolderBase originalFolder
+ = UserInventoryHelpers.CreateInventoryFolder(
+ m_scene.InventoryService, giverSp.UUID, folderId, "f1", true);
+
+ GridInstantMessage receivedIm = null;
+ receiverClient.OnReceivedInstantMessage += im => receivedIm = im;
+
+ byte[] giveImBinaryBucket = new byte[17];
+ giveImBinaryBucket[0] = (byte)AssetType.Folder;
+ byte[] itemIdBytes = folderId.GetBytes();
+ Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
+
+ GridInstantMessage giveIm
+ = new GridInstantMessage(
+ m_scene,
+ giverSp.UUID,
+ giverSp.Name,
+ receiverSp.UUID,
+ (byte)InstantMessageDialog.InventoryOffered,
+ false,
+ "inventory offered msg",
+ initialSessionId,
+ false,
+ Vector3.Zero,
+ giveImBinaryBucket,
+ true);
+
+ giverClient.HandleImprovedInstantMessage(giveIm);
+
+ // These details might not all be correct.
+ // Session ID is now the created item ID (!)
+ GridInstantMessage rejectIm
+ = new GridInstantMessage(
+ m_scene,
+ receiverSp.UUID,
+ receiverSp.Name,
+ giverSp.UUID,
+ (byte)InstantMessageDialog.InventoryDeclined,
+ false,
+ "inventory declined msg",
+ new UUID(receivedIm.imSessionID),
+ false,
+ Vector3.Zero,
+ null,
+ true);
+
+ receiverClient.HandleImprovedInstantMessage(rejectIm);
+
+ // Test for item remaining in the giver's inventory (here we assume a copy item)
+ // TODO: Test no-copy items.
+ InventoryFolderBase originalFolderAfterGive
+ = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, giverSp.UUID, "f1");
+
+ Assert.That(originalFolderAfterGive, Is.Not.Null);
+ Assert.That(originalFolderAfterGive.ID, Is.EqualTo(originalFolder.ID));
+
+ // Test for folder successfully making it into the receiver's inventory
+ InventoryFolderBase receivedFolder
+ = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, receiverSp.UUID, "Trash/f1");
+
+ InventoryFolderBase trashFolder
+ = m_scene.InventoryService.GetFolderForType(receiverSp.UUID, AssetType.TrashFolder);
+
+ Assert.That(receivedFolder, Is.Not.Null);
+ Assert.That(receivedFolder.ID, Is.Not.EqualTo(originalFolder.ID));
+ Assert.That(receivedFolder.ParentID, Is.EqualTo(trashFolder.ID));
+
+ // Test that on a delete, item still exists and is accessible for the giver.
+ m_scene.InventoryService.PurgeFolder(trashFolder);
+
+ InventoryFolderBase originalFolderAfterDelete
+ = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, giverSp.UUID, "f1");
+
+ Assert.That(originalFolderAfterDelete, Is.Not.Null);
+ }
}
}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
index a1794c9..b3b75af 100644
--- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
@@ -218,12 +218,37 @@ namespace OpenSim.Tests.Common
public static InventoryFolderBase CreateInventoryFolder(
IInventoryService inventoryService, UUID userId, string path, bool useExistingFolders)
{
+ return CreateInventoryFolder(inventoryService, userId, UUID.Random(), path, useExistingFolders);
+ }
+
+ ///
+ /// Create inventory folders starting from the user's root folder.
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// The folders to create. Multiple folders can be specified on a path delimited by the PATH_DELIMITER
+ ///
+ ///
+ /// If true, then folders in the path which already the same name are
+ /// used. This applies to the terminal folder as well.
+ /// If false, then all folders in the path are created, even if there is already a folder at a particular
+ /// level with the same name.
+ ///
+ ///
+ /// The folder created. If the path contains multiple folders then the last one created is returned.
+ /// Will return null if the root folder could not be found.
+ ///
+ public static InventoryFolderBase CreateInventoryFolder(
+ IInventoryService inventoryService, UUID userId, UUID folderId, string path, bool useExistingFolders)
+ {
InventoryFolderBase rootFolder = inventoryService.GetRootFolder(userId);
if (null == rootFolder)
return null;
- return CreateInventoryFolder(inventoryService, rootFolder, path, useExistingFolders);
+ return CreateInventoryFolder(inventoryService, folderId, rootFolder, path, useExistingFolders);
}
///
@@ -235,6 +260,7 @@ namespace OpenSim.Tests.Common
/// TODO: May need to make it an option to create duplicate folders.
///
///
+ /// ID of the folder to create
///
///
/// The folder to create.
@@ -249,7 +275,7 @@ namespace OpenSim.Tests.Common
/// The folder created. If the path contains multiple folders then the last one created is returned.
///
public static InventoryFolderBase CreateInventoryFolder(
- IInventoryService inventoryService, InventoryFolderBase parentFolder, string path, bool useExistingFolders)
+ IInventoryService inventoryService, UUID folderId, InventoryFolderBase parentFolder, string path, bool useExistingFolders)
{
string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None);
@@ -262,9 +288,16 @@ namespace OpenSim.Tests.Common
{
// Console.WriteLine("Creating folder {0} at {1}", components[0], parentFolder.Name);
+ UUID folderIdForCreate;
+
+ if (components.Length > 1)
+ folderIdForCreate = UUID.Random();
+ else
+ folderIdForCreate = folderId;
+
folder
= new InventoryFolderBase(
- UUID.Random(), components[0], parentFolder.Owner, (short)AssetType.Unknown, parentFolder.ID, 0);
+ folderIdForCreate, components[0], parentFolder.Owner, (short)AssetType.Unknown, parentFolder.ID, 0);
inventoryService.AddFolder(folder);
}
@@ -274,7 +307,7 @@ namespace OpenSim.Tests.Common
// }
if (components.Length > 1)
- return CreateInventoryFolder(inventoryService, folder, components[1], useExistingFolders);
+ return CreateInventoryFolder(inventoryService, folderId, folder, components[1], useExistingFolders);
else
return folder;
}
diff --git a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
index ccbdf81..30b1f38 100644
--- a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
@@ -53,6 +53,9 @@ namespace OpenSim.Tests.Common.Mock
public XInventoryFolder[] GetFolders(string[] fields, string[] vals)
{
+// Console.WriteLine(
+// "Requesting folders, fields {0}, vals {1}", string.Join(",", fields), string.Join(",", vals));
+
List origFolders
= Get(fields, vals, m_allFolders.Values.ToList());
@@ -104,7 +107,30 @@ namespace OpenSim.Tests.Common.Mock
}
public bool MoveItem(string id, string newParent) { throw new NotImplementedException(); }
- public bool MoveFolder(string id, string newParent) { throw new NotImplementedException(); }
+
+ public bool MoveFolder(string id, string newParent)
+ {
+ // Don't use GetFolders() here - it takes a clone!
+ XInventoryFolder folder = m_allFolders[new UUID(id)];
+
+ if (folder == null)
+ return false;
+
+ folder.parentFolderID = new UUID(newParent);
+
+ XInventoryFolder[] newParentFolders
+ = GetFolders(new string[] { "folderID" }, new string[] { folder.parentFolderID.ToString() });
+
+// Console.WriteLine(
+// "Moved folder {0} {1}, to {2} {3}",
+// folder.folderName, folder.folderID, newParentFolders[0].folderName, folder.parentFolderID);
+
+ // TODO: Really need to implement folder version incrementing, though this should be common code anyway,
+ // not reimplemented in each db plugin.
+
+ return true;
+ }
+
public XInventoryItem[] GetActiveGestures(UUID principalID) { throw new NotImplementedException(); }
public int GetAssetPermissions(UUID principalID, UUID assetID) { throw new NotImplementedException(); }
}
--
cgit v1.1
From 537b243360a69f63210003371d1e6ef9f9c3716c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Apr 2013 22:18:11 +0100
Subject: minor: Eliminate warning in LLimageManagerTests by properly calling
through to OpenSimTestCase.SetUp()
---
OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs | 2 ++
1 file changed, 2 insertions(+)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
index 7d9f581..a0e0078 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
@@ -75,6 +75,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
[SetUp]
public void SetUp()
{
+ base.SetUp();
+
UUID userId = TestHelpers.ParseTail(0x3);
J2KDecoderModule j2kdm = new J2KDecoderModule();
--
cgit v1.1
From 3ce198165c3533d416148a9f4ffa056bf22c602d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Apr 2013 22:21:57 +0100
Subject: minor: remove some mono compiler warnings in ServicesServerBase
---
OpenSim/Server/Base/ServicesServerBase.cs | 5 -----
1 file changed, 5 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 7c8e6b7..b13c87d 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -171,11 +171,6 @@ namespace OpenSim.Server.Base
m_console = MainConsole.Instance;
- // Configure the appenders for log4net
- //
- OpenSimAppender consoleAppender = null;
- FileAppender fileAppender = null;
-
if (logConfig != null)
{
FileInfo cfg = new FileInfo(logConfig);
--
cgit v1.1
From 15a3f80e2eb82c5e4726d5cd93cfed32da5d6768 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 29 Apr 2013 17:30:38 -0700
Subject: BulletSim: LinksetCompound work to disable collision for root and
child prims so compound shape can do all collisions. Don't try to build a
compound linkset for non-physical linksets. Remove and replace root body when
compound shape is added so collision cache is rebuilt.
---
.../Physics/BulletSPlugin/BSLinksetCompound.cs | 44 +++++++++++++++-------
1 file changed, 30 insertions(+), 14 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 1fd541f..e967dfc 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -143,19 +143,18 @@ public sealed class BSLinksetCompound : BSLinkset
// The root is going dynamic. Rebuild the linkset so parts and mass get computed properly.
ScheduleRebuild(LinksetRoot);
}
- else
- {
- // The origional prims are removed from the world as the shape of the root compound
- // shape takes over.
- m_physicsScene.PE.AddToCollisionFlags(child.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
- m_physicsScene.PE.ForceActivationState(child.PhysBody, ActivationState.DISABLE_SIMULATION);
- // We don't want collisions from the old linkset children.
- m_physicsScene.PE.RemoveFromCollisionFlags(child.PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
- child.PhysBody.collisionType = CollisionType.LinksetChild;
+ // The origional prims are removed from the world as the shape of the root compound
+ // shape takes over.
+ m_physicsScene.PE.AddToCollisionFlags(child.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
+ m_physicsScene.PE.ForceActivationState(child.PhysBody, ActivationState.DISABLE_SIMULATION);
+ // We don't want collisions from the old linkset children.
+ m_physicsScene.PE.RemoveFromCollisionFlags(child.PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
+
+ child.PhysBody.collisionType = CollisionType.LinksetChild;
+
+ ret = true;
- ret = true;
- }
return ret;
}
@@ -190,6 +189,13 @@ public sealed class BSLinksetCompound : BSLinkset
// Called at taint-time.
public override void UpdateProperties(UpdatedProperties whichUpdated, BSPrimLinkable updated)
{
+ if (!LinksetRoot.IsPhysicallyActive)
+ {
+ // No reason to do this physical stuff for static linksets.
+ DetailLog("{0},BSLinksetCompound.UpdateProperties,notPhysical", LinksetRoot.LocalID);
+ return;
+ }
+
// The user moving a child around requires the rebuilding of the linkset compound shape
// One problem is this happens when a border is crossed -- the simulator implementation
// stores the position into the group which causes the move of the object
@@ -392,6 +398,13 @@ public sealed class BSLinksetCompound : BSLinkset
private bool disableCOM = true; // DEBUG DEBUG: disable until we get this debugged
private void RecomputeLinksetCompound()
{
+ if (!LinksetRoot.IsPhysicallyActive)
+ {
+ // There is no reason to build all this physical stuff for a non-physical linkset
+ DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,notPhysical", LinksetRoot.LocalID);
+ return;
+ }
+
try
{
// This replaces the physical shape of the root prim with a compound shape made up of the root
@@ -403,7 +416,8 @@ public sealed class BSLinksetCompound : BSLinkset
// Free up any shape we'd previously built.
LinksetShape.Dereference(m_physicsScene);
- LinksetShape = BSShapeCompound.GetReference(m_physicsScene, LinksetRoot);
+ // Get a new compound shape to build the linkset shape in.
+ LinksetShape = BSShapeCompound.GetReference(m_physicsScene);
// The center of mass for the linkset is the geometric center of the group.
// Compute a displacement for each component so it is relative to the center-of-mass.
@@ -431,8 +445,7 @@ public sealed class BSLinksetCompound : BSLinkset
cPrim.LinksetChildIndex = memberIndex;
}
- BSShape childShape = cPrim.PhysShape;
- childShape.IncrementReference();
+ BSShape childShape = cPrim.PhysShape.GetReference(m_physicsScene, cPrim);
OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacement;
OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
m_physicsScene.PE.AddChildShapeToCompoundShape(LinksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
@@ -446,7 +459,10 @@ public sealed class BSLinksetCompound : BSLinkset
// Sneak the built compound shape in as the shape of the root prim.
// Note this doesn't touch the root prim's PhysShape so be sure the manage the difference.
+ // Object removed and added to world to get collision cache rebuilt for new shape.
+ m_physicsScene.PE.RemoveObjectFromWorld(m_physicsScene.World, LinksetRoot.PhysBody);
m_physicsScene.PE.SetCollisionShape(m_physicsScene.World, LinksetRoot.PhysBody, LinksetShape.physShapeInfo);
+ m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, LinksetRoot.PhysBody);
// With all of the linkset packed into the root prim, it has the mass of everyone.
LinksetMass = ComputeLinksetMass();
--
cgit v1.1
From d322625f9062d7748a1a896b6fd37c51f7f41435 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 29 Apr 2013 17:30:54 -0700
Subject: BulletSim: Add non-static BSShape.GetReference for getting another
reference to an existing shape instance. BSShapeNative rebuilds shape for all
references. BSShapeCompound returns another reference copy if the compound
shape already exists (for linksets).
---
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 125 +++++++++++++++------
.../Region/Physics/BulletSPlugin/BulletSimTODO.txt | 9 ++
2 files changed, 102 insertions(+), 32 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 5c58ad5..f0c9fd5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -47,26 +47,31 @@ public abstract class BSShape
public BSShape()
{
- referenceCount = 0;
+ referenceCount = 1;
lastReferenced = DateTime.Now;
physShapeInfo = new BulletShape();
}
public BSShape(BulletShape pShape)
{
- referenceCount = 0;
+ referenceCount = 1;
lastReferenced = DateTime.Now;
physShapeInfo = pShape;
}
+ // Get another reference to this shape.
+ public abstract BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim);
+
// Called when this shape is being used again.
- public virtual void IncrementReference()
+ // Used internally. External callers should call instance.GetReference() to properly copy/reference
+ // the shape.
+ protected virtual void IncrementReference()
{
referenceCount++;
lastReferenced = DateTime.Now;
}
// Called when this shape is being used again.
- public virtual void DecrementReference()
+ protected virtual void DecrementReference()
{
referenceCount--;
lastReferenced = DateTime.Now;
@@ -99,12 +104,19 @@ public abstract class BSShape
// Returns a string for debugging that uniquily identifies the memory used by this instance
public virtual string AddrString
{
- get { return "unknown"; }
+ get
+ {
+ if (physShapeInfo != null)
+ return physShapeInfo.AddrString;
+ return "unknown";
+ }
}
public override string ToString()
{
StringBuilder buff = new StringBuilder();
+ buff.Append(" m_hulls;
private BulletShape CreatePhysicalHull(BSScene physicsScene, BSPhysObject prim, System.UInt64 newHullKey,
@@ -520,7 +562,7 @@ public class BSShapeHull : BSShape
physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,hullFromMesh,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
}
// Now done with the mesh shape.
- meshShape.DecrementReference();
+ meshShape.Dereference(physicsScene);
physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
}
if (!newShape.HasPhysicalShape)
@@ -671,37 +713,52 @@ public class BSShapeCompound : BSShape
public BSShapeCompound(BulletShape pShape) : base(pShape)
{
}
- public static BSShape GetReference(BSScene physicsScene, BSPhysObject prim)
+ public static BSShape GetReference(BSScene physicsScene)
+ {
+ // Base compound shapes are not shared so this returns a raw shape.
+ // A built compound shape can be reused in linksets.
+ return new BSShapeCompound(CreatePhysicalCompoundShape(physicsScene));
+ }
+ public override BSShape GetReference(BSScene physicsScene, BSPhysObject prim)
{
- // Compound shapes are not shared so a new one is created every time.
- return new BSShapeCompound(CreatePhysicalCompoundShape(physicsScene, prim));
+ // Calling this reference means we want another handle to an existing compound shape
+ // (usually linksets) so return this copy.
+ IncrementReference();
+ return this;
}
// Dereferencing a compound shape releases the hold on all the child shapes.
public override void Dereference(BSScene physicsScene)
{
- if (!physicsScene.PE.IsCompound(physShapeInfo))
+ lock (physShapeInfo)
{
- // Failed the sanity check!!
- physicsScene.Logger.ErrorFormat("{0} Attempt to free a compound shape that is not compound!! type={1}, ptr={2}",
- LogHeader, physShapeInfo.shapeType, physShapeInfo.AddrString);
- physicsScene.DetailLog("{0},BSShapeCollection.DereferenceCompound,notACompoundShape,type={1},ptr={2}",
- BSScene.DetailLogZero, physShapeInfo.shapeType, physShapeInfo.AddrString);
- return;
- }
+ Dereference(physicsScene);
+ if (referenceCount <= 0)
+ {
+ if (!physicsScene.PE.IsCompound(physShapeInfo))
+ {
+ // Failed the sanity check!!
+ physicsScene.Logger.ErrorFormat("{0} Attempt to free a compound shape that is not compound!! type={1}, ptr={2}",
+ LogHeader, physShapeInfo.shapeType, physShapeInfo.AddrString);
+ physicsScene.DetailLog("{0},BSShapeCollection.DereferenceCompound,notACompoundShape,type={1},ptr={2}",
+ BSScene.DetailLogZero, physShapeInfo.shapeType, physShapeInfo.AddrString);
+ return;
+ }
- int numChildren = physicsScene.PE.GetNumberOfCompoundChildren(physShapeInfo);
- physicsScene.DetailLog("{0},BSShapeCollection.DereferenceCompound,shape={1},children={2}",
- BSScene.DetailLogZero, physShapeInfo, numChildren);
+ int numChildren = physicsScene.PE.GetNumberOfCompoundChildren(physShapeInfo);
+ physicsScene.DetailLog("{0},BSShapeCollection.DereferenceCompound,shape={1},children={2}",
+ BSScene.DetailLogZero, physShapeInfo, numChildren);
- // Loop through all the children dereferencing each.
- for (int ii = numChildren - 1; ii >= 0; ii--)
- {
- BulletShape childShape = physicsScene.PE.RemoveChildShapeFromCompoundShapeIndex(physShapeInfo, ii);
- DereferenceAnonCollisionShape(physicsScene, childShape);
+ // Loop through all the children dereferencing each.
+ for (int ii = numChildren - 1; ii >= 0; ii--)
+ {
+ BulletShape childShape = physicsScene.PE.RemoveChildShapeFromCompoundShapeIndex(physShapeInfo, ii);
+ DereferenceAnonCollisionShape(physicsScene, childShape);
+ }
+ physicsScene.PE.DeleteCollisionShape(physicsScene.World, physShapeInfo);
+ }
}
- physicsScene.PE.DeleteCollisionShape(physicsScene.World, physShapeInfo);
}
- private static BulletShape CreatePhysicalCompoundShape(BSScene physicsScene, BSPhysObject prim)
+ private static BulletShape CreatePhysicalCompoundShape(BSScene physicsScene)
{
BulletShape cShape = physicsScene.PE.CreateCompoundShape(physicsScene.World, false);
return cShape;
@@ -754,6 +811,10 @@ public class BSShapeAvatar : BSShape
{
return new BSShapeNull();
}
+ public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
+ {
+ return new BSShapeNull();
+ }
public override void Dereference(BSScene physicsScene) { }
// From the front:
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
index c67081a..559a73f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
@@ -1,3 +1,12 @@
+PROBLEMS TO LOOK INTO
+=================================================
+Nebadon vehicle ride, get up, ride again. Second time vehicle does not act correctly.
+ Have to rez new vehicle and delete the old to fix situation.
+Hitting RESET on Nebadon's vehicle while riding causes vehicle to get into odd
+ position state where it will not settle onto ground properly, etc
+Two of Nebadon vehicles in a sim max the CPU. This is new.
+A sitting, active vehicle bobs up and down a small amount.
+
CURRENT PRIORITIES
=================================================
Use the HACD convex hull routine in Bullet rather than the C# version.
--
cgit v1.1
From 7cdb07b386ffe88749fcc6cabadd9851f254699d Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 30 Apr 2013 11:42:11 -0700
Subject: BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all
working yet.
---
.../Physics/BulletSPlugin/BSLinksetCompound.cs | 37 ++++++++++++++++------
.../Region/Physics/BulletSPlugin/BSPhysObject.cs | 3 +-
.../Physics/BulletSPlugin/BSPrimDisplaced.cs | 22 ++++++++++---
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 2 +-
.../Region/Physics/BulletSPlugin/BulletSimTODO.txt | 3 ++
5 files changed, 50 insertions(+), 17 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index e967dfc..e3ce7fb 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -395,7 +395,8 @@ public sealed class BSLinksetCompound : BSLinkset
// Constraint linksets are rebuilt every time.
// Note that this works for rebuilding just the root after a linkset is taken apart.
// Called at taint time!!
- private bool disableCOM = true; // DEBUG DEBUG: disable until we get this debugged
+ private bool UseBulletSimRootOffsetHack = false;
+ private bool disableCOM = true; // For basic linkset debugging, turn off the center-of-mass setting
private void RecomputeLinksetCompound()
{
if (!LinksetRoot.IsPhysicallyActive)
@@ -428,11 +429,19 @@ public sealed class BSLinksetCompound : BSLinkset
// 'centerDisplacement' is the value to subtract from children to give physical offset position
OMV.Vector3 centerDisplacement = (centerOfMassW - LinksetRoot.RawPosition) * invRootOrientation;
- LinksetRoot.SetEffectiveCenterOfMassW(centerDisplacement);
-
- // TODO: add phantom root shape to be the center-of-mass
+ if (UseBulletSimRootOffsetHack || disableCOM)
+ {
+ centerDisplacement = OMV.Vector3.Zero;
+ LinksetRoot.ClearDisplacement();
+ }
+ else
+ {
+ LinksetRoot.SetEffectiveCenterOfMassDisplacement(centerDisplacement);
+ }
+ DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,COM,rootPos={1},com={2},comDisp={3}",
+ LinksetRoot.LocalID, LinksetRoot.RawPosition, centerOfMassW, centerDisplacement);
- // Add a shape for each of the other children in the linkset
+ // Add the shapes of all the components of the linkset
int memberIndex = 1;
ForEachMember(delegate(BSPrimLinkable cPrim)
{
@@ -449,8 +458,8 @@ public sealed class BSLinksetCompound : BSLinkset
OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacement;
OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
m_physicsScene.PE.AddChildShapeToCompoundShape(LinksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
- DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChild,indx={1},rShape={2},cShape={3},offPos={4},offRot={5}",
- LinksetRoot.LocalID, memberIndex, LinksetRoot.PhysShape, cPrim.PhysShape, offsetPos, offsetRot);
+ DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChild,indx={1}cShape={2},offPos={3},offRot={4}",
+ LinksetRoot.LocalID, memberIndex, cPrim.PhysShape, offsetPos, offsetRot);
memberIndex++;
@@ -463,13 +472,21 @@ public sealed class BSLinksetCompound : BSLinkset
m_physicsScene.PE.RemoveObjectFromWorld(m_physicsScene.World, LinksetRoot.PhysBody);
m_physicsScene.PE.SetCollisionShape(m_physicsScene.World, LinksetRoot.PhysBody, LinksetShape.physShapeInfo);
m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, LinksetRoot.PhysBody);
+ DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addBody,body={1},shape={2}",
+ LinksetRoot.LocalID, LinksetRoot.PhysBody, LinksetShape);
// With all of the linkset packed into the root prim, it has the mass of everyone.
LinksetMass = ComputeLinksetMass();
LinksetRoot.UpdatePhysicalMassProperties(LinksetMass, true);
- // Enable the physical position updator to return the position and rotation of the root shape
- m_physicsScene.PE.AddToCollisionFlags(LinksetRoot.PhysBody, CollisionFlags.BS_RETURN_ROOT_COMPOUND_SHAPE);
+ if (UseBulletSimRootOffsetHack)
+ {
+ // Enable the physical position updator to return the position and rotation of the root shape.
+ // This enables a feature in the C++ code to return the world coordinates of the first shape in the
+ // compound shape. This eleviates the need to offset the returned physical position by the
+ // center-of-mass offset.
+ m_physicsScene.PE.AddToCollisionFlags(LinksetRoot.PhysBody, CollisionFlags.BS_RETURN_ROOT_COMPOUND_SHAPE);
+ }
}
finally
{
@@ -477,7 +494,7 @@ public sealed class BSLinksetCompound : BSLinkset
}
// See that the Aabb surrounds the new shape
- m_physicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetRoot.PhysShape.physShapeInfo);
+ m_physicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetShape.physShapeInfo);
}
}
}
\ No newline at end of file
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 28d4bd7..7eba851 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -259,7 +259,8 @@ public abstract class BSPhysObject : PhysicsActor
// The user can optionally set the center of mass. The user's setting will override any
// computed center-of-mass (like in linksets).
- public OMV.Vector3? UserSetCenterOfMass { get; set; }
+ // Note this is a displacement from the root's coordinates. Zero means use the root prim as center-of-mass.
+ public OMV.Vector3? UserSetCenterOfMassDisplacement { get; set; }
public OMV.Vector3 LockedAxis { get; set; } // zero means locked. one means free.
public readonly OMV.Vector3 LockedAxisFree = new OMV.Vector3(1f, 1f, 1f); // All axis are free
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
index f1c3b5c..f5ee671 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
@@ -78,14 +78,16 @@ public class BSPrimDisplaced : BSPrim
// Set this sets and computes the displacement from the passed prim to the center-of-mass.
// A user set value for center-of-mass overrides whatever might be passed in here.
// The displacement is in local coordinates (relative to root prim in linkset oriented coordinates).
- public virtual void SetEffectiveCenterOfMassW(Vector3 centerOfMassDisplacement)
+ public virtual void SetEffectiveCenterOfMassDisplacement(Vector3 centerOfMassDisplacement)
{
Vector3 comDisp;
- if (UserSetCenterOfMass.HasValue)
- comDisp = (OMV.Vector3)UserSetCenterOfMass;
+ if (UserSetCenterOfMassDisplacement.HasValue)
+ comDisp = (OMV.Vector3)UserSetCenterOfMassDisplacement;
else
comDisp = centerOfMassDisplacement;
+ DetailLog("{0},BSPrimDisplaced.SetEffectiveCenterOfMassDisplacement,userSet={1},comDisp={2}",
+ LocalID, UserSetCenterOfMassDisplacement.HasValue, comDisp);
if (comDisp == Vector3.Zero)
{
// If there is no diplacement. Things get reset.
@@ -107,9 +109,15 @@ public class BSPrimDisplaced : BSPrim
set
{
if (PositionDisplacement != OMV.Vector3.Zero)
- base.ForcePosition = value - (PositionDisplacement * RawOrientation);
+ {
+ OMV.Vector3 displacedPos = value - (PositionDisplacement * RawOrientation);
+ DetailLog("{0},BSPrimDisplaced.ForcePosition,val={1},disp={2},newPos={3}", LocalID, value, PositionDisplacement, displacedPos);
+ base.ForcePosition = displacedPos;
+ }
else
+ {
base.ForcePosition = value;
+ }
}
}
@@ -118,6 +126,7 @@ public class BSPrimDisplaced : BSPrim
get { return base.ForceOrientation; }
set
{
+ // TODO:
base.ForceOrientation = value;
}
}
@@ -143,7 +152,10 @@ public class BSPrimDisplaced : BSPrim
{
// Correct for any rotation around the center-of-mass
// TODO!!!
- entprop.Position = entprop.Position + (PositionDisplacement * entprop.Rotation);
+
+ OMV.Vector3 displacedPos = entprop.Position + (PositionDisplacement * entprop.Rotation);
+ DetailLog("{0},BSPrimDisplaced.ForcePosition,physPos={1},disp={2},newPos={3}", LocalID, entprop.Position, PositionDisplacement, displacedPos);
+ entprop.Position = displacedPos;
// entprop.Rotation = something;
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index f0c9fd5..3faa484 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -117,7 +117,7 @@ public abstract class BSShape
StringBuilder buff = new StringBuilder();
buff.Append("
/// If true, then exclude the seed cap.
- public Hashtable GetCapsDetails(bool excludeSeed)
+ public Hashtable GetCapsDetails(bool excludeSeed, List requestedCaps)
{
Hashtable caps = new Hashtable();
string protocol = "http://";
@@ -175,6 +175,9 @@ namespace OpenSim.Framework.Capabilities
if (excludeSeed && "SEED" == capsName)
continue;
+ if (requestedCaps != null && !requestedCaps.Contains(capsName))
+ continue;
+
caps[capsName] = baseUrl + m_capsHandlers[capsName].Path;
}
}
@@ -182,4 +185,4 @@ namespace OpenSim.Framework.Capabilities
return caps;
}
}
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 8752404..a46c24a 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -273,11 +273,22 @@ namespace OpenSim.Region.ClientStack.Linden
return string.Empty;
}
- Hashtable caps = m_HostCapsObj.CapsHandlers.GetCapsDetails(true);
+ OSDArray capsRequested = (OSDArray)OSDParser.DeserializeLLSDXml(request);
+ List validCaps = new List();
+
+ foreach (OSD c in capsRequested)
+ validCaps.Add(c.AsString());
+
+ Hashtable caps = m_HostCapsObj.CapsHandlers.GetCapsDetails(true, validCaps);
// Add the external too
foreach (KeyValuePair kvp in m_HostCapsObj.ExternalCapsHandlers)
+ {
+ if (!validCaps.Contains(kvp.Key))
+ continue;
+
caps[kvp.Key] = kvp.Value;
+ }
string result = LLSDHelpers.SerialiseLLSDReply(caps);
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index 8329af0..6ae9448 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.Framework
{
caps.AppendFormat("** User {0}:\n", kvp.Key);
- for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.GetCapsDetails(false).GetEnumerator(); kvp2.MoveNext(); )
+ for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.GetCapsDetails(false, null).GetEnumerator(); kvp2.MoveNext(); )
{
Uri uri = new Uri(kvp2.Value.ToString());
caps.AppendFormat(m_showCapsCommandFormat, kvp2.Key, uri.PathAndQuery);
--
cgit v1.1
From 206fb306a7820cf593570e35ddfa8e7c5a10e449 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 1 May 2013 19:01:43 +0100
Subject: Update SmartThreadPool to latest version 2.2.3 with a major and minor
change.
SmartThreadPool code comes from http://www.codeproject.com/Articles/7933/Smart-Thread-Pool
This version implements thread abort (via WorkItem.Cancel(true)), threadpool naming, max thread stack, etc. so we no longer need to manually patch those.
However, two changes have been made to stock 2.2.3.
Major change: WorkItem.Cancel(bool abortExecution) in our version does not succeed if the work item was in progress and thread abort was not specified.
This is to match previous behaviour where we handle co-operative termination via another mechanism rather than checking WorkItem.IsCanceled.
Minor change: Did not add STP's StopWatch implementation as this is only used WinCE and Silverlight and causes a build clash with System.Diagnostics.StopWatch
The reason for updating is to see if this improves http://opensimulator.org/mantis/view.php?id=6557 and http://opensimulator.org/mantis/view.php?id=6586
---
OpenSim/Framework/Util.cs | 20 ++++++++++----------
.../ScriptEngine/Interfaces/IScriptInstance.cs | 2 +-
.../ScriptEngine/Shared/Instance/ScriptInstance.cs | 9 ++++++---
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 4 ++--
OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs | 6 +++---
5 files changed, 22 insertions(+), 19 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index bde4673..a3602e9 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1840,7 +1840,7 @@ namespace OpenSim.Framework
case FireAndForgetMethod.SmartThreadPool:
if (m_ThreadPool == null)
InitThreadPool(15);
- m_ThreadPool.QueueWorkItem(SmartThreadPoolCallback, new object[] { realCallback, obj });
+ m_ThreadPool.QueueWorkItem((cb, o) => cb(o), realCallback, obj);
break;
case FireAndForgetMethod.Thread:
Thread thread = new Thread(delegate(object o) { realCallback(o); });
@@ -1910,15 +1910,15 @@ namespace OpenSim.Framework
return sb.ToString();
}
- private static object SmartThreadPoolCallback(object o)
- {
- object[] array = (object[])o;
- WaitCallback callback = (WaitCallback)array[0];
- object obj = array[1];
-
- callback(obj);
- return null;
- }
+// private static object SmartThreadPoolCallback(object o)
+// {
+// object[] array = (object[])o;
+// WaitCallback callback = (WaitCallback)array[0];
+// object obj = array[1];
+//
+// callback(obj);
+// return null;
+// }
#endregion FireAndForget Threading Pattern
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index 35ae44c..b9a217b 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
public interface IScriptWorkItem
{
bool Cancel();
- void Abort();
+ bool Abort();
///
/// Wait for the work item to complete.
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 1e6db43..f9d3afc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -564,9 +564,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
public bool Stop(int timeout)
{
-// m_log.DebugFormat(
-// "[SCRIPT INSTANCE]: Stopping script {0} {1} in {2} {3} with timeout {4} {5} {6}",
-// ScriptName, ItemID, PrimName, ObjectID, timeout, m_InSelfDelete, DateTime.Now.Ticks);
+ if (DebugLevel >= 1)
+ m_log.DebugFormat(
+ "[SCRIPT INSTANCE]: Stopping script {0} {1} in {2} {3} with timeout {4} {5} {6}",
+ ScriptName, ItemID, PrimName, ObjectID, timeout, m_InSelfDelete, DateTime.Now.Ticks);
IScriptWorkItem workItem;
@@ -627,6 +628,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
}
}
+ Console.WriteLine("Here9");
+
lock (EventQueue)
{
workItem = m_CurrentWorkItem;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 0d9babb..5804aa8 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -483,7 +483,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
///
/// Basis on which to sort output. Can be null if no sort needs to take place
private void HandleScriptsAction(
- string[] cmdparams, Action action, Func keySelector)
+ string[] cmdparams, Action action, System.Func keySelector)
{
if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_Scene))
return;
@@ -1517,7 +1517,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
startInfo.MaxWorkerThreads = maxThreads;
startInfo.MinWorkerThreads = minThreads;
startInfo.ThreadPriority = threadPriority;;
- startInfo.StackSize = stackSize;
+ startInfo.MaxStackSize = stackSize;
startInfo.StartSuspended = true;
m_ThreadPool = new SmartThreadPool(startInfo);
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs b/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs
index 8dd7677..9d9dee1 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs
@@ -52,16 +52,16 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return wr.Cancel();
}
- public void Abort()
+ public bool Abort()
{
- wr.Abort();
+ return wr.Cancel(true);
}
public bool Wait(int t)
{
// We use the integer version of WaitAll because the current version of SmartThreadPool has a bug with the
// TimeSpan version. The number of milliseconds in TimeSpan is an int64 so when STP casts it down to an
- // int (32-bit) we can end up with bad values. This occurs on Windows though curious not on Mono 2.10.8
+ // int (32-bit) we can end up with bad values. This occurs on Windows though curiously not on Mono 2.10.8
// (or very likely other versions of Mono at least up until 3.0.3).
return SmartThreadPool.WaitAll(new IWorkItemResult[] {wr}, t, false);
}
--
cgit v1.1
From 81a90e30c637f84e6ef5d1cf7c188c1f6db12eb3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 1 May 2013 19:29:46 +0100
Subject: Add in-code exaplanation for the change in cancellation signalling in
STP 2.2.3. Remove left in Console.WriteLine accidentally inserted in recent
206fb306
---
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 --
1 file changed, 2 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index f9d3afc..887a317 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -628,8 +628,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
}
}
- Console.WriteLine("Here9");
-
lock (EventQueue)
{
workItem = m_CurrentWorkItem;
--
cgit v1.1
From b26276c8c48a8cf4edb468b2fd428815034a6320 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 1 May 2013 21:35:50 +0100
Subject: Fix the long standing bug of items being delivered to lost and found
or trash when takig copy. This bug was recently aggravated through the perms
changes required for the export permission.
---
.../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index e0009bb..eb37626 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -646,11 +646,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
}
else
{
- if (remoteClient == null || so.OwnerID != remoteClient.AgentId)
+ if (remoteClient == null || so.RootPart.OwnerID != remoteClient.AgentId)
{
// Taking copy of another person's item. Take to
// Objects folder.
folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
+ so.FromFolderID = UUID.Zero;
}
else
{
@@ -666,7 +667,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
//
if (action == DeRezAction.Take || action == DeRezAction.TakeCopy)
{
- if (so.FromFolderID != UUID.Zero && userID == remoteClient.AgentId)
+ if (so.FromFolderID != UUID.Zero && so.RootPart.OwnerID == remoteClient.AgentId)
{
InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID);
folder = m_Scene.InventoryService.GetFolder(f);
--
cgit v1.1
From e3d9d5566a799fdbb4261010b97b8b04dbd7da1e Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 1 May 2013 18:46:57 -0400
Subject: Fix inventory issue
Fix issue where objects rezzed from Trash or Lost And Found then be placed back in the respective folder when taking the object or a copy back into inventory.
---
.../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index eb37626..e6d6cbf 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -671,6 +671,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
{
InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID);
folder = m_Scene.InventoryService.GetFolder(f);
+
+ if(folder.Type == 14 || folder.Type == 16)
+ {
+ // folder.Type = 6;
+ folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
+ }
}
}
--
cgit v1.1
From 0378baed350b846132b2f501c74bd39a2675e41d Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 1 May 2013 17:15:54 -0700
Subject: BulletSim: rework LinksetCompound to work with new BSShape system.
Not all working yet.
---
.../Physics/BulletSPlugin/BSLinksetCompound.cs | 146 ++++++---------------
1 file changed, 40 insertions(+), 106 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index e3ce7fb..20eb871 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -35,6 +35,7 @@ using OMV = OpenMetaverse;
namespace OpenSim.Region.Physics.BulletSPlugin
{
+ /*
// When a child is linked, the relationship position of the child to the parent
// is remembered so the child's world position can be recomputed when it is
// removed from the linkset.
@@ -88,17 +89,15 @@ sealed class BSLinksetCompoundInfo : BSLinksetInfo
return buff.ToString();
}
};
+ */
public sealed class BSLinksetCompound : BSLinkset
{
private static string LogHeader = "[BULLETSIM LINKSET COMPOUND]";
- private BSShape LinksetShape;
-
public BSLinksetCompound(BSScene scene, BSPrimLinkable parent)
: base(scene, parent)
{
- LinksetShape = new BSShapeNull();
}
// When physical properties are changed the linkset needs to recalculate
@@ -143,25 +142,11 @@ public sealed class BSLinksetCompound : BSLinkset
// The root is going dynamic. Rebuild the linkset so parts and mass get computed properly.
ScheduleRebuild(LinksetRoot);
}
-
- // The origional prims are removed from the world as the shape of the root compound
- // shape takes over.
- m_physicsScene.PE.AddToCollisionFlags(child.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
- m_physicsScene.PE.ForceActivationState(child.PhysBody, ActivationState.DISABLE_SIMULATION);
- // We don't want collisions from the old linkset children.
- m_physicsScene.PE.RemoveFromCollisionFlags(child.PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
-
- child.PhysBody.collisionType = CollisionType.LinksetChild;
-
- ret = true;
-
return ret;
}
- // The object is going static (non-physical). Do any setup necessary for a static linkset.
+ // The object is going static (non-physical). We do not do anything for static linksets.
// Return 'true' if any properties updated on the passed object.
- // This doesn't normally happen -- OpenSim removes the objects from the physical
- // world if it is a static linkset.
// Called at taint-time!
public override bool MakeStatic(BSPrimLinkable child)
{
@@ -169,19 +154,9 @@ public sealed class BSLinksetCompound : BSLinkset
DetailLog("{0},BSLinksetCompound.MakeStatic,call,IsRoot={1}", child.LocalID, IsRoot(child));
if (IsRoot(child))
{
+ // Schedule a rebuild to verify that the root shape is set to the real shape.
ScheduleRebuild(LinksetRoot);
}
- else
- {
- // The non-physical children can come back to life.
- m_physicsScene.PE.RemoveFromCollisionFlags(child.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
-
- child.PhysBody.collisionType = CollisionType.LinksetChild;
-
- // Don't force activation so setting of DISABLE_SIMULATION can stay if used.
- m_physicsScene.PE.Activate(child.PhysBody, false);
- ret = true;
- }
return ret;
}
@@ -283,9 +258,6 @@ public sealed class BSLinksetCompound : BSLinkset
if (!IsRoot(child))
{
- // Because it is a convenient time, recompute child world position and rotation based on
- // its position in the linkset.
- RecomputeChildWorldPosition(child, true /* inTaintTime */);
child.LinksetInfo = null;
}
@@ -296,50 +268,6 @@ public sealed class BSLinksetCompound : BSLinkset
return ret;
}
- // When the linkset is built, the child shape is added to the compound shape relative to the
- // root shape. The linkset then moves around but this does not move the actual child
- // prim. The child prim's location must be recomputed based on the location of the root shape.
- private void RecomputeChildWorldPosition(BSPrimLinkable child, bool inTaintTime)
- {
- // For the moment (20130201), disable this computation (converting the child physical addr back to
- // a region address) until we have a good handle on center-of-mass offsets and what the physics
- // engine moving a child actually means.
- // The simulator keeps track of where children should be as the linkset moves. Setting
- // the pos/rot here does not effect that knowledge as there is no good way for the
- // physics engine to send the simulator an update for a child.
-
- /*
- BSLinksetCompoundInfo lci = child.LinksetInfo as BSLinksetCompoundInfo;
- if (lci != null)
- {
- if (inTaintTime)
- {
- OMV.Vector3 oldPos = child.RawPosition;
- child.ForcePosition = LinksetRoot.RawPosition + lci.OffsetFromRoot;
- child.ForceOrientation = LinksetRoot.RawOrientation * lci.OffsetRot;
- DetailLog("{0},BSLinksetCompound.RecomputeChildWorldPosition,oldPos={1},lci={2},newPos={3}",
- child.LocalID, oldPos, lci, child.RawPosition);
- }
- else
- {
- // TaintedObject is not used here so the raw position is set now and not at taint-time.
- child.Position = LinksetRoot.RawPosition + lci.OffsetFromRoot;
- child.Orientation = LinksetRoot.RawOrientation * lci.OffsetRot;
- }
- }
- else
- {
- // This happens when children have been added to the linkset but the linkset
- // has not been constructed yet. So like, at taint time, adding children to a linkset
- // and then changing properties of the children (makePhysical, for instance)
- // but the post-print action of actually rebuilding the linkset has not yet happened.
- // PhysicsScene.Logger.WarnFormat("{0} Restoring linkset child position failed because of no relative position computed. ID={1}",
- // LogHeader, child.LocalID);
- DetailLog("{0},BSLinksetCompound.recomputeChildWorldPosition,noRelativePositonInfo", child.LocalID);
- }
- */
- }
-
// ================================================================
// Add a new child to the linkset.
@@ -372,7 +300,6 @@ public sealed class BSLinksetCompound : BSLinkset
child.LocalID, child.PhysBody.AddrString);
// Cause the child's body to be rebuilt and thus restored to normal operation
- RecomputeChildWorldPosition(child, false);
child.LinksetInfo = null;
child.ForceBodyShapeRebuild(false);
@@ -399,26 +326,27 @@ public sealed class BSLinksetCompound : BSLinkset
private bool disableCOM = true; // For basic linkset debugging, turn off the center-of-mass setting
private void RecomputeLinksetCompound()
{
- if (!LinksetRoot.IsPhysicallyActive)
- {
- // There is no reason to build all this physical stuff for a non-physical linkset
- DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,notPhysical", LinksetRoot.LocalID);
- return;
- }
-
try
{
- // This replaces the physical shape of the root prim with a compound shape made up of the root
- // shape and all the children.
+ Rebuilding = true;
+
+ // No matter what is being done, force the root prim's PhysBody and PhysShape to get set
+ // to what they should be as if the root was not in a linkset.
+ // Not that bad since we only get into this routine if there are children in the linkset and
+ // something has been updated/changed.
+ LinksetRoot.ForceBodyShapeRebuild(true);
- // RootPrim.PhysShape is the shape of the root prim.
- // Here we build the compound shape made up of all the children.
+ // There is no reason to build all this physical stuff for a non-physical linkset.
+ if (!LinksetRoot.IsPhysicallyActive)
+ {
+ // Clean up any old linkset shape and make sure the root shape is set to the root object.
+ DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,notPhysical", LinksetRoot.LocalID);
- // Free up any shape we'd previously built.
- LinksetShape.Dereference(m_physicsScene);
+ return; // Note the 'finally' clause at the botton which will get executed.
+ }
// Get a new compound shape to build the linkset shape in.
- LinksetShape = BSShapeCompound.GetReference(m_physicsScene);
+ BSShape linksetShape = BSShapeCompound.GetReference(m_physicsScene);
// The center of mass for the linkset is the geometric center of the group.
// Compute a displacement for each component so it is relative to the center-of-mass.
@@ -445,35 +373,41 @@ public sealed class BSLinksetCompound : BSLinkset
int memberIndex = 1;
ForEachMember(delegate(BSPrimLinkable cPrim)
{
- if (IsRoot(cPrim))
- {
- cPrim.LinksetChildIndex = 0;
- }
- else
- {
- cPrim.LinksetChildIndex = memberIndex;
- }
+ // Root shape is always index zero.
+ cPrim.LinksetChildIndex = IsRoot(cPrim) ? 0 : memberIndex;
+ // Get a reference to the shape of the child and add that shape to the linkset compound shape
BSShape childShape = cPrim.PhysShape.GetReference(m_physicsScene, cPrim);
OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacement;
OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
- m_physicsScene.PE.AddChildShapeToCompoundShape(LinksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
- DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChild,indx={1}cShape={2},offPos={3},offRot={4}",
+ m_physicsScene.PE.AddChildShapeToCompoundShape(linksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
+ DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChild,indx={1},cShape={2},offPos={3},offRot={4}",
LinksetRoot.LocalID, memberIndex, cPrim.PhysShape, offsetPos, offsetRot);
+ // Since we are borrowing the shape of the child, disable the origional child body
+ if (!IsRoot(cPrim))
+ {
+ m_physicsScene.PE.AddToCollisionFlags(cPrim.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
+ m_physicsScene.PE.ForceActivationState(cPrim.PhysBody, ActivationState.DISABLE_SIMULATION);
+ // We don't want collisions from the old linkset children.
+ m_physicsScene.PE.RemoveFromCollisionFlags(cPrim.PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
+ cPrim.PhysBody.collisionType = CollisionType.LinksetChild;
+ }
+
memberIndex++;
return false; // 'false' says to move onto the next child in the list
});
- // Sneak the built compound shape in as the shape of the root prim.
- // Note this doesn't touch the root prim's PhysShape so be sure the manage the difference.
+ // Replace the root shape with the built compound shape.
// Object removed and added to world to get collision cache rebuilt for new shape.
+ LinksetRoot.PhysShape.Dereference(m_physicsScene);
+ LinksetRoot.PhysShape = linksetShape;
m_physicsScene.PE.RemoveObjectFromWorld(m_physicsScene.World, LinksetRoot.PhysBody);
- m_physicsScene.PE.SetCollisionShape(m_physicsScene.World, LinksetRoot.PhysBody, LinksetShape.physShapeInfo);
+ m_physicsScene.PE.SetCollisionShape(m_physicsScene.World, LinksetRoot.PhysBody, linksetShape.physShapeInfo);
m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, LinksetRoot.PhysBody);
DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addBody,body={1},shape={2}",
- LinksetRoot.LocalID, LinksetRoot.PhysBody, LinksetShape);
+ LinksetRoot.LocalID, LinksetRoot.PhysBody, linksetShape);
// With all of the linkset packed into the root prim, it has the mass of everyone.
LinksetMass = ComputeLinksetMass();
@@ -494,7 +428,7 @@ public sealed class BSLinksetCompound : BSLinkset
}
// See that the Aabb surrounds the new shape
- m_physicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetShape.physShapeInfo);
+ m_physicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetRoot.PhysShape.physShapeInfo);
}
}
}
\ No newline at end of file
--
cgit v1.1
From ed46b42feae4659653ba54a9290dddede6f24f2e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 1 May 2013 17:16:46 -0700
Subject: BulletSim: fix crash when mesh asset wasn't available when meshing
the first time. Debugging added for mesh/hull asset fetch.
---
.../Physics/BulletSPlugin/BSShapeCollection.cs | 1 +
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 28 ++++++++++++++--------
2 files changed, 19 insertions(+), 10 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 19855da..a4250be 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -132,6 +132,7 @@ public sealed class BSShapeCollection : IDisposable
PrimitiveBaseShape pbs = prim.BaseShape;
// Kludge to create the capsule for the avatar.
+ // TDOD: Remove/redo this when BSShapeAvatar is working!!
BSCharacter theChar = prim as BSCharacter;
if (theChar != null)
{
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 3faa484..2962249 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -164,6 +164,8 @@ public abstract class BSShape
prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
physicsScene.Logger.WarnFormat("{0} Fetched asset would not mesh. {1}, texture={2}",
LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
+ physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,setFailed,objNam={1},tex={2}",
+ prim.LocalID, prim.PhysObjectName, prim.BaseShape.SculptTexture);
}
else
{
@@ -174,29 +176,33 @@ public abstract class BSShape
&& prim.BaseShape.SculptTexture != OMV.UUID.Zero
)
{
- physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,fetchAsset", prim.LocalID);
+ physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,fetchAsset,objNam={1},tex={2}",
+ prim.LocalID, prim.PhysObjectName, prim.BaseShape.SculptTexture);
// Multiple requestors will know we're waiting for this asset
prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Waiting;
BSPhysObject xprim = prim;
Util.FireAndForget(delegate
{
+ physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,inFireAndForget", xprim.LocalID);
RequestAssetDelegate assetProvider = physicsScene.RequestAssetMethod;
if (assetProvider != null)
{
BSPhysObject yprim = xprim; // probably not necessary, but, just in case.
assetProvider(yprim.BaseShape.SculptTexture, delegate(AssetBase asset)
{
+ physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,assetProviderCallback", xprim.LocalID);
bool assetFound = false;
string mismatchIDs = String.Empty; // DEBUG DEBUG
if (asset != null && yprim.BaseShape.SculptEntry)
{
if (yprim.BaseShape.SculptTexture.ToString() == asset.ID)
{
- yprim.BaseShape.SculptData = asset.Data;
+ yprim.BaseShape.SculptData = (byte[])asset.Data.Clone();
// This will cause the prim to see that the filler shape is not the right
// one and try again to build the object.
// No race condition with the normal shape setting since the rebuild is at taint time.
+ yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Fetched;
yprim.ForceBodyShapeRebuild(false /* inTaintTime */);
assetFound = true;
}
@@ -205,11 +211,11 @@ public abstract class BSShape
mismatchIDs = yprim.BaseShape.SculptTexture.ToString() + "/" + asset.ID;
}
}
- if (assetFound)
- yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Fetched;
- else
+ if (!assetFound)
+ {
yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
- physicsScene.DetailLog("{0},BSShape,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
+ }
+ physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
yprim.LocalID, assetFound, yprim.BaseShape.SculptEntry, mismatchIDs );
});
}
@@ -227,6 +233,8 @@ public abstract class BSShape
{
physicsScene.Logger.WarnFormat("{0} Mesh failed to fetch asset. obj={1}, texture={2}",
LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
+ physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,wasFailed,objNam={1},tex={2}",
+ prim.LocalID, prim.PhysObjectName, prim.BaseShape.SculptTexture);
}
}
}
@@ -359,7 +367,7 @@ public class BSShapeMesh : BSShape
// Check to see if mesh was created (might require an asset).
newShape = VerifyMeshCreated(physicsScene, newShape, prim);
- if (newShape.shapeType == BSPhysicsShapeType.SHAPE_MESH)
+ if (!newShape.isNativeShape)
{
// If a mesh was what was created, remember the built shape for later sharing.
Meshes.Add(newMeshKey, retMesh);
@@ -408,7 +416,7 @@ public class BSShapeMesh : BSShape
private BulletShape CreatePhysicalMesh(BSScene physicsScene, BSPhysObject prim, System.UInt64 newMeshKey,
PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
{
- BulletShape newShape = null;
+ BulletShape newShape = new BulletShape();
IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod,
false, // say it is not physical so a bounding box is not built
@@ -507,7 +515,7 @@ public class BSShapeHull : BSShape
// Check to see if hull was created (might require an asset).
newShape = VerifyMeshCreated(physicsScene, newShape, prim);
- if (newShape.shapeType == BSPhysicsShapeType.SHAPE_HULL)
+ if (!newShape.isNativeShape)
{
// If a mesh was what was created, remember the built shape for later sharing.
Hulls.Add(newHullKey, retHull);
@@ -731,7 +739,7 @@ public class BSShapeCompound : BSShape
{
lock (physShapeInfo)
{
- Dereference(physicsScene);
+ this.DecrementReference();
if (referenceCount <= 0)
{
if (!physicsScene.PE.IsCompound(physShapeInfo))
--
cgit v1.1
From d9c3947824feccd3522c70a72b75c72a84bab3e0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 2 May 2013 10:06:12 -0700
Subject: BulletSim: Rebuild physical body if physical shape changes for mesh
and hull. Properly rebuilds collision caches. Release asset data fetched when
building mesh or hulls.
---
OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 1 +
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 2 +-
.../Physics/BulletSPlugin/BSShapeCollection.cs | 35 +++++++++++--
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 59 +++++++++++++++-------
4 files changed, 73 insertions(+), 24 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index f535e50..b9bd909 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -596,6 +596,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
public override void Refresh()
{
// If asking for a refresh, reset the physical parameters before the next simulation step.
+ // Called whether active or not since the active state may be updated before the next step.
m_physicsScene.PostTaintObject("BSDynamics.Refresh", ControllingPrim.LocalID, delegate()
{
SetPhysicalParameters();
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 7e2af78..3d68d7f 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -767,7 +767,7 @@ public class BSPrim : BSPhysObject
if (!PhysBody.HasPhysicalBody)
{
// This would only happen if updates are called for during initialization when the body is not set up yet.
- DetailLog("{0},BSPrim.UpdatePhysicalParameters,taint,calledWithNoPhysBody", LocalID);
+ // DetailLog("{0},BSPrim.UpdatePhysicalParameters,taint,calledWithNoPhysBody", LocalID);
return;
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index a4250be..809435d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -227,16 +227,41 @@ public sealed class BSShapeCollection : IDisposable
if (prim.IsPhysical && BSParam.ShouldUseHullsForPhysicalObjects)
{
// Update prim.BSShape to reference a hull of this shape.
- DereferenceExistingShape(prim, shapeCallback);
- prim.PhysShape = BSShapeMesh.GetReference(m_physicsScene, false /*forceRebuild*/, prim);
+ BSShape potentialHull = BSShapeHull.GetReference(m_physicsScene, false /*forceRebuild*/, prim);
+ // If the current shape is not what is on the prim at the moment, time to change.
+ if (!prim.PhysShape.HasPhysicalShape
+ || potentialHull.ShapeType != prim.PhysShape.ShapeType
+ || potentialHull.physShapeInfo.shapeKey != prim.PhysShape.physShapeInfo.shapeKey)
+ {
+ DereferenceExistingShape(prim, shapeCallback);
+ prim.PhysShape = potentialHull;
+ ret = true;
+ }
+ else
+ {
+ potentialHull.Dereference(m_physicsScene);
+ }
if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,hull,shape={1},key={2}",
prim.LocalID, prim.PhysShape, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"));
}
else
{
// Update prim.BSShape to reference a mesh of this shape.
- DereferenceExistingShape(prim, shapeCallback);
- prim.PhysShape = BSShapeHull.GetReference(m_physicsScene, false /*forceRebuild*/, prim);
+ BSShape potentialMesh = BSShapeMesh.GetReference(m_physicsScene, false /*forceRebuild*/, prim);
+ // If the current shape is not what is on the prim at the moment, time to change.
+ if (!prim.PhysShape.HasPhysicalShape
+ || potentialMesh.ShapeType != prim.PhysShape.ShapeType
+ || potentialMesh.physShapeInfo.shapeKey != prim.PhysShape.physShapeInfo.shapeKey)
+ {
+ DereferenceExistingShape(prim, shapeCallback);
+ prim.PhysShape = potentialMesh;
+ ret = true;
+ }
+ else
+ {
+ // We don't need this reference to the mesh that is already being using.
+ potentialMesh.Dereference(m_physicsScene);
+ }
if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,mesh,shape={1},key={2}",
prim.LocalID, prim.PhysShape, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"));
}
@@ -320,7 +345,7 @@ public sealed class BSShapeCollection : IDisposable
if (prim.IsSolid)
{
aBody = m_physicsScene.PE.CreateBodyFromShape(sim, prim.PhysShape.physShapeInfo, prim.LocalID, prim.RawPosition, prim.RawOrientation);
- if (DDetail) DetailLog("{0},BSShapeCollection.CreateBody,mesh,body={1}", prim.LocalID, aBody);
+ if (DDetail) DetailLog("{0},BSShapeCollection.CreateBody,rigid,body={1}", prim.LocalID, aBody);
}
else
{
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 2962249..3346626 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -115,10 +115,15 @@ public abstract class BSShape
public override string ToString()
{
StringBuilder buff = new StringBuilder();
- buff.Append("");
@@ -184,21 +189,21 @@ public abstract class BSShape
BSPhysObject xprim = prim;
Util.FireAndForget(delegate
{
- physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,inFireAndForget", xprim.LocalID);
+ // physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,inFireAndForget", xprim.LocalID);
RequestAssetDelegate assetProvider = physicsScene.RequestAssetMethod;
if (assetProvider != null)
{
BSPhysObject yprim = xprim; // probably not necessary, but, just in case.
assetProvider(yprim.BaseShape.SculptTexture, delegate(AssetBase asset)
{
- physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,assetProviderCallback", xprim.LocalID);
+ // physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,assetProviderCallback", xprim.LocalID);
bool assetFound = false;
string mismatchIDs = String.Empty; // DEBUG DEBUG
if (asset != null && yprim.BaseShape.SculptEntry)
{
if (yprim.BaseShape.SculptTexture.ToString() == asset.ID)
{
- yprim.BaseShape.SculptData = (byte[])asset.Data.Clone();
+ yprim.BaseShape.SculptData = asset.Data;
// This will cause the prim to see that the filler shape is not the right
// one and try again to build the object.
// No race condition with the normal shape setting since the rebuild is at taint time.
@@ -290,7 +295,7 @@ public class BSShapeNative : BSShape
{
if (physShapeInfo.HasPhysicalShape)
{
- physicsScene.DetailLog("{0},BSShapeNative.DereferenceShape,deleteNativeShape,shape={1}", BSScene.DetailLogZero, this);
+ physicsScene.DetailLog("{0},BSShapeNative.Dereference,deleteNativeShape,shape={1}", BSScene.DetailLogZero, this);
physicsScene.PE.DeleteCollisionShape(physicsScene.World, physShapeInfo);
}
physShapeInfo.Clear();
@@ -347,9 +352,8 @@ public class BSShapeMesh : BSShape
float lod;
System.UInt64 newMeshKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
- physicsScene.DetailLog("{0},BSShapeMesh,getReference,oldKey={1},newKey={2},size={3},lod={4}",
- prim.LocalID, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"),
- newMeshKey.ToString("X"), prim.Size, lod);
+ physicsScene.DetailLog("{0},BSShapeMesh,getReference,newKey={1},size={2},lod={3}",
+ prim.LocalID, newMeshKey.ToString("X"), prim.Size, lod);
BSShapeMesh retMesh = null;
lock (Meshes)
@@ -389,6 +393,7 @@ public class BSShapeMesh : BSShape
lock (Meshes)
{
this.DecrementReference();
+ physicsScene.DetailLog("{0},BSShapeMesh.Dereference,shape={1}", BSScene.DetailLogZero, this);
// TODO: schedule aging and destruction of unused meshes.
}
}
@@ -425,6 +430,12 @@ public class BSShapeMesh : BSShape
if (meshData != null)
{
+ if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
+ {
+ // Release the fetched asset data once it has been used.
+ pbs.SculptData = new byte[0];
+ prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Unknown;
+ }
int[] indices = meshData.getIndexListAsInt();
int realIndicesIndex = indices.Length;
@@ -462,8 +473,8 @@ public class BSShapeMesh : BSShape
}
}
}
- physicsScene.DetailLog("{0},BSShapeMesh.CreatePhysicalMesh,origTri={1},realTri={2},numVerts={3}",
- BSScene.DetailLogZero, indices.Length / 3, realIndicesIndex / 3, verticesAsFloats.Length / 3);
+ physicsScene.DetailLog("{0},BSShapeMesh.CreatePhysicalMesh,key={1},origTri={2},realTri={3},numVerts={4}",
+ BSScene.DetailLogZero, newMeshKey.ToString("X"), indices.Length / 3, realIndicesIndex / 3, verticesAsFloats.Length / 3);
if (realIndicesIndex != 0)
{
@@ -496,8 +507,8 @@ public class BSShapeHull : BSShape
float lod;
System.UInt64 newHullKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
- physicsScene.DetailLog("{0},BSShapeHull,getReference,oldKey={1},newKey={2},size={3},lod={4}",
- prim.LocalID, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"), newHullKey.ToString("X"), prim.Size, lod);
+ physicsScene.DetailLog("{0},BSShapeHull,getReference,newKey={1},size={2},lod={3}",
+ prim.LocalID, newHullKey.ToString("X"), prim.Size, lod);
BSShapeHull retHull = null;
lock (Hulls)
@@ -537,6 +548,7 @@ public class BSShapeHull : BSShape
lock (Hulls)
{
this.DecrementReference();
+ physicsScene.DetailLog("{0},BSShapeHull.Dereference,shape={1}", BSScene.DetailLogZero, this);
// TODO: schedule aging and destruction of unused meshes.
}
}
@@ -549,6 +561,8 @@ public class BSShapeHull : BSShape
if (BSParam.ShouldUseBulletHACD)
{
+ // Build the hull shape from an existing mesh shape.
+ // The mesh should have already been created in Bullet.
physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,shouldUseBulletHACD,entry", prim.LocalID);
BSShape meshShape = BSShapeMesh.GetReference(physicsScene, true, prim);
@@ -568,18 +582,26 @@ public class BSShapeHull : BSShape
physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,hullFromMesh,beforeCall", prim.LocalID, newShape.HasPhysicalShape);
newShape = physicsScene.PE.BuildHullShapeFromMesh(physicsScene.World, meshShape.physShapeInfo, parms);
physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,hullFromMesh,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
+
+ // Now done with the mesh shape.
+ meshShape.Dereference(physicsScene);
}
- // Now done with the mesh shape.
- meshShape.Dereference(physicsScene);
physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
}
if (!newShape.HasPhysicalShape)
{
- // Build a new hull in the physical world.
+ // Build a new hull in the physical world using the C# HACD algorigthm.
// Pass true for physicalness as this prevents the creation of bounding box which is not needed
IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
if (meshData != null)
{
+ if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
+ {
+ // Release the fetched asset data once it has been used.
+ pbs.SculptData = new byte[0];
+ prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Unknown;
+ }
+
int[] indices = meshData.getIndexListAsInt();
List vertices = meshData.getVertexList();
@@ -740,6 +762,7 @@ public class BSShapeCompound : BSShape
lock (physShapeInfo)
{
this.DecrementReference();
+ physicsScene.DetailLog("{0},BSShapeCompound.Dereference,shape={1}", BSScene.DetailLogZero, this);
if (referenceCount <= 0)
{
if (!physicsScene.PE.IsCompound(physShapeInfo))
--
cgit v1.1
From 4042c82a7293c40955a14d04d9e5ae05d35ef7cf Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 2 May 2013 12:27:30 -0700
Subject: BulletSim: prims with no cuts created with single convex hull shape.
Parameter added to enable/disable this feature.
---
OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 5 ++
OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 3 +
.../Physics/BulletSPlugin/BSShapeCollection.cs | 19 +++++-
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 74 ++++++++++++++++++++++
4 files changed, 99 insertions(+), 2 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 5ebeace..2ac68e3 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -87,6 +87,7 @@ public static class BSParam
public static bool ShouldUseHullsForPhysicalObjects { get; private set; } // 'true' if should create hulls for physical objects
public static bool ShouldRemoveZeroWidthTriangles { get; private set; }
public static bool ShouldUseBulletHACD { get; set; }
+ public static bool ShouldUseSingleConvexHullForPrims { get; set; }
public static float TerrainImplementation { get; private set; }
public static int TerrainMeshMagnification { get; private set; }
@@ -342,6 +343,10 @@ public static class BSParam
false,
(s) => { return ShouldUseBulletHACD; },
(s,v) => { ShouldUseBulletHACD = v; } ),
+ new ParameterDefn("ShouldUseSingleConvexHullForPrims", "If true, use a single convex hull shape for physical prims",
+ true,
+ (s) => { return ShouldUseSingleConvexHullForPrims; },
+ (s,v) => { ShouldUseSingleConvexHullForPrims = v; } ),
new ParameterDefn("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions",
5,
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 8e05b58..a4a8794 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -316,7 +316,10 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
break;
case "bulletxna":
ret = new BSAPIXNA(engineName, this);
+ // Disable some features that are not implemented in BulletXNA
+ m_log.InfoFormat("{0} Disabling some physics features not implemented by BulletXNA", LogHeader);
BSParam.ShouldUseBulletHACD = false;
+ BSParam.ShouldUseSingleConvexHullForPrims = false;
break;
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 809435d..794857c 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -226,8 +226,23 @@ public sealed class BSShapeCollection : IDisposable
// made. Native shapes work in either case.
if (prim.IsPhysical && BSParam.ShouldUseHullsForPhysicalObjects)
{
- // Update prim.BSShape to reference a hull of this shape.
- BSShape potentialHull = BSShapeHull.GetReference(m_physicsScene, false /*forceRebuild*/, prim);
+ // Use a simple, single mesh convex hull shape if the object is simple enough
+ BSShape potentialHull = null;
+
+ PrimitiveBaseShape pbs = prim.BaseShape;
+ if (BSParam.ShouldUseSingleConvexHullForPrims
+ && pbs != null
+ && !pbs.SculptEntry
+ && PrimHasNoCuts(pbs)
+ )
+ {
+ potentialHull = BSShapeConvexHull.GetReference(m_physicsScene, false /* forceRebuild */, prim);
+ }
+ else
+ {
+ potentialHull = BSShapeHull.GetReference(m_physicsScene, false /*forceRebuild*/, prim);
+ }
+
// If the current shape is not what is on the prim at the moment, time to change.
if (!prim.PhysShape.HasPhysicalShape
|| potentialHull.ShapeType != prim.PhysShape.ShapeType
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 3346626..9ef2923 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -832,6 +832,80 @@ public class BSShapeCompound : BSShape
}
// ============================================================================================================
+public class BSShapeConvexHull : BSShape
+{
+ private static string LogHeader = "[BULLETSIM SHAPE CONVEX HULL]";
+ public static Dictionary ConvexHulls = new Dictionary();
+
+ public BSShapeConvexHull(BulletShape pShape) : base(pShape)
+ {
+ }
+ public static BSShape GetReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
+ {
+ float lod;
+ System.UInt64 newMeshKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
+
+ physicsScene.DetailLog("{0},BSShapeMesh,getReference,newKey={1},size={2},lod={3}",
+ prim.LocalID, newMeshKey.ToString("X"), prim.Size, lod);
+
+ BSShapeConvexHull retConvexHull = null;
+ lock (ConvexHulls)
+ {
+ if (ConvexHulls.TryGetValue(newMeshKey, out retConvexHull))
+ {
+ // The mesh has already been created. Return a new reference to same.
+ retConvexHull.IncrementReference();
+ }
+ else
+ {
+ retConvexHull = new BSShapeConvexHull(new BulletShape());
+ BulletShape convexShape = null;
+
+ // Get a handle to a mesh to build the hull from
+ BSShape baseMesh = BSShapeMesh.GetReference(physicsScene, false /* forceRebuild */, prim);
+ if (baseMesh.physShapeInfo.isNativeShape)
+ {
+ // We get here if the mesh was not creatable. Could be waiting for an asset from the disk.
+ // In the short term, we return the native shape and a later ForceBodyShapeRebuild should
+ // get back to this code with a buildable mesh.
+ // TODO: not sure the temp native shape is freed when the mesh is rebuilt. When does this get freed?
+ convexShape = baseMesh.physShapeInfo;
+ }
+ else
+ {
+ convexShape = physicsScene.PE.BuildConvexHullShapeFromMesh(physicsScene.World, baseMesh.physShapeInfo);
+ convexShape.shapeKey = newMeshKey;
+ ConvexHulls.Add(convexShape.shapeKey, retConvexHull);
+ }
+
+ // Done with the base mesh
+ baseMesh.Dereference(physicsScene);
+
+ retConvexHull.physShapeInfo = convexShape;
+ }
+ }
+ return retConvexHull;
+ }
+ public override BSShape GetReference(BSScene physicsScene, BSPhysObject prim)
+ {
+ // Calling this reference means we want another handle to an existing shape
+ // (usually linksets) so return this copy.
+ IncrementReference();
+ return this;
+ }
+ // Dereferencing a compound shape releases the hold on all the child shapes.
+ public override void Dereference(BSScene physicsScene)
+ {
+ lock (ConvexHulls)
+ {
+ this.DecrementReference();
+ physicsScene.DetailLog("{0},BSShapeConvexHull.Dereference,shape={1}", BSScene.DetailLogZero, this);
+ // TODO: schedule aging and destruction of unused meshes.
+ }
+ }
+}
+
+// ============================================================================================================
public class BSShapeAvatar : BSShape
{
private static string LogHeader = "[BULLETSIM SHAPE AVATAR]";
--
cgit v1.1
From 304c5d4a8b8a1137bac18f7f6443ea85cec86184 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 3 May 2013 18:48:50 +0100
Subject: On startup, start scenes after we're set up all local scenes, rather
than starting scenes before others have been created.
This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created.
http://opensimulator.org/mantis/view.php?id=6618
---
.../LoadRegions/LoadRegionsPlugin.cs | 23 ++++++++++++++--------
.../RemoteController/RemoteAdminPlugin.cs | 1 +
OpenSim/Framework/IScene.cs | 7 ++++++-
OpenSim/Region/Application/OpenSimBase.cs | 4 +---
OpenSim/Region/Framework/Scenes/Scene.cs | 16 +++++++++++++--
OpenSim/Region/Framework/Scenes/SceneBase.cs | 4 ++++
6 files changed, 41 insertions(+), 14 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index fcb6991..1d63d26 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -115,6 +115,8 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
Environment.Exit(1);
}
+ List createdScenes = new List();
+
for (int i = 0; i < regionsToLoad.Length; i++)
{
IScene scene;
@@ -123,17 +125,22 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
")");
bool changed = m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
+
m_openSim.CreateRegion(regionsToLoad[i], true, out scene);
+ createdScenes.Add(scene);
+
if (changed)
- regionsToLoad[i].EstateSettings.Save();
-
- if (scene != null)
+ regionsToLoad[i].EstateSettings.Save();
+ }
+
+ foreach (IScene scene in createdScenes)
+ {
+ scene.Start();
+
+ m_newRegionCreatedHandler = OnNewRegionCreated;
+ if (m_newRegionCreatedHandler != null)
{
- m_newRegionCreatedHandler = OnNewRegionCreated;
- if (m_newRegionCreatedHandler != null)
- {
- m_newRegionCreatedHandler(scene);
- }
+ m_newRegionCreatedHandler(scene);
}
}
}
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index d19b8b6..355f7b3 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -700,6 +700,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
IScene newScene;
m_application.CreateRegion(region, out newScene);
+ newScene.Start();
// If an access specification was provided, use it.
// Otherwise accept the default.
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 87ec99e..8164f41 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -136,5 +136,10 @@ namespace OpenSim.Framework
ISceneObject DeserializeObject(string representation);
bool CheckClient(UUID agentID, System.Net.IPEndPoint ep);
+
+ ///
+ /// Start the scene and associated scripts within it.
+ ///
+ void Start();
}
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index d86eefe..f9e0cf1 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -425,9 +425,6 @@ namespace OpenSim
mscene = scene;
- scene.Start();
- scene.StartScripts();
-
return clientServers;
}
@@ -751,6 +748,7 @@ namespace OpenSim
ShutdownClientServer(whichRegion);
IScene scene;
CreateRegion(whichRegion, true, out scene);
+ scene.Start();
}
# region Setup methods
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 829a7e9..4f674a3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -389,10 +389,12 @@ namespace OpenSim.Region.Framework.Scenes
if (value)
{
if (!m_active)
- Start();
+ Start(false);
}
else
{
+ // This appears assymetric with Start() above but is not - setting m_active = false stops the loops
+ // XXX: Possibly this should be in an explicit Stop() method for symmetry.
m_active = false;
}
}
@@ -1331,10 +1333,18 @@ namespace OpenSim.Region.Framework.Scenes
}
}
+ public override void Start()
+ {
+ Start(true);
+ }
+
///
/// Start the scene
///
- public void Start()
+ ///
+ /// Start the scripts within the scene.
+ ///
+ public void Start(bool startScripts)
{
m_active = true;
@@ -1353,6 +1363,8 @@ namespace OpenSim.Region.Framework.Scenes
m_heartbeatThread
= Watchdog.StartThread(
Heartbeat, string.Format("Heartbeat ({0})", RegionInfo.RegionName), ThreadPriority.Normal, false, false);
+
+ StartScripts();
}
///
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index d3e968e..d2097ea 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -561,6 +561,10 @@ namespace OpenSim.Region.Framework.Scenes
get { return false; }
}
+ public virtual void Start()
+ {
+ }
+
public void Restart()
{
// This has to be here to fire the event
--
cgit v1.1
From 5d93c99e8cf188b29b4c5265619eb4a4d3eeacf6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 3 May 2013 18:56:58 +0100
Subject: Fix possible race condition with local region cache if a region was
added after startup.
---
.../Grid/LocalGridServiceConnector.cs | 43 ++++++++++++++--------
1 file changed, 28 insertions(+), 15 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index c0c2ca7..c32820e 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -142,10 +142,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
scene.RegisterModuleInterface(this);
- if (m_LocalCache.ContainsKey(scene.RegionInfo.RegionID))
- m_log.ErrorFormat("[LOCAL GRID SERVICE CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!");
- else
- m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene));
+ lock (m_LocalCache)
+ {
+ if (m_LocalCache.ContainsKey(scene.RegionInfo.RegionID))
+ m_log.ErrorFormat("[LOCAL GRID SERVICE CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!");
+ else
+ m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene));
+ }
}
public void RemoveRegion(Scene scene)
@@ -153,8 +156,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
if (!m_Enabled)
return;
- m_LocalCache[scene.RegionInfo.RegionID].Clear();
- m_LocalCache.Remove(scene.RegionInfo.RegionID);
+ lock (m_LocalCache)
+ {
+ m_LocalCache[scene.RegionInfo.RegionID].Clear();
+ m_LocalCache.Remove(scene.RegionInfo.RegionID);
+ }
}
public void RegionLoaded(Scene scene)
@@ -191,12 +197,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
// First see if it's a neighbour, even if it isn't on this sim.
// Neighbour data is cached in memory, so this is fast
- foreach (RegionCache rcache in m_LocalCache.Values)
+
+ lock (m_LocalCache)
{
- region = rcache.GetRegionByPosition(x, y);
- if (region != null)
+ foreach (RegionCache rcache in m_LocalCache.Values)
{
- return region;
+ region = rcache.GetRegionByPosition(x, y);
+ if (region != null)
+ {
+ return region;
+ }
}
}
@@ -245,12 +255,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
{
System.Text.StringBuilder caps = new System.Text.StringBuilder();
- foreach (KeyValuePair kvp in m_LocalCache)
+ lock (m_LocalCache)
{
- caps.AppendFormat("*** Neighbours of {0} ({1}) ***\n", kvp.Value.RegionName, kvp.Key);
- List regions = kvp.Value.GetNeighbours();
- foreach (GridRegion r in regions)
- caps.AppendFormat(" {0} @ {1}-{2}\n", r.RegionName, r.RegionLocX / Constants.RegionSize, r.RegionLocY / Constants.RegionSize);
+ foreach (KeyValuePair kvp in m_LocalCache)
+ {
+ caps.AppendFormat("*** Neighbours of {0} ({1}) ***\n", kvp.Value.RegionName, kvp.Key);
+ List regions = kvp.Value.GetNeighbours();
+ foreach (GridRegion r in regions)
+ caps.AppendFormat(" {0} @ {1}-{2}\n", r.RegionName, r.RegionLocX / Constants.RegionSize, r.RegionLocY / Constants.RegionSize);
+ }
}
MainConsole.Instance.Output(caps.ToString());
--
cgit v1.1
From 5d25bb3084937d266375cba61b3a2c802bd57717 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 3 May 2013 14:23:53 -0700
Subject: BulletSim: zero vehicle motion when changing vehicle type. Rebuild
compound linkset of any child in the linkset changes shape. Comments and
better detailed logging messages.
---
OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 6 +++---
.../Region/Physics/BulletSPlugin/BSLinksetCompound.cs | 16 +++++-----------
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 2 +-
OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 4 ++++
.../Region/Physics/BulletSPlugin/BSShapeCollection.cs | 7 +++----
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 9 ++-------
6 files changed, 18 insertions(+), 26 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index b9bd909..c5bee6d 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -559,9 +559,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
break;
}
- // Update any physical parameters based on this type.
- Refresh();
-
m_linearMotor = new BSVMotor("LinearMotor", m_linearMotorTimescale,
m_linearMotorDecayTimescale, m_linearFrictionTimescale,
1f);
@@ -589,6 +586,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin
{
RegisterForSceneEvents();
}
+
+ // Update any physical parameters based on this type.
+ Refresh();
}
#endregion // Vehicle parameter setting
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 20eb871..1f16cc8 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -246,7 +246,8 @@ public sealed class BSLinksetCompound : BSLinkset
}
// Routine called when rebuilding the body of some member of the linkset.
- // Since we don't keep in world relationships, do nothing unless it's a child changing.
+ // If one of the bodies is being changed, the linkset needs rebuilding.
+ // For instance, a linkset is built and then a mesh asset is read in and the mesh is recreated.
// Returns 'true' of something was actually removed and would need restoring
// Called at taint-time!!
public override bool RemoveDependencies(BSPrimLinkable child)
@@ -256,14 +257,7 @@ public sealed class BSLinksetCompound : BSLinkset
DetailLog("{0},BSLinksetCompound.RemoveBodyDependencies,refreshIfChild,rID={1},rBody={2},isRoot={3}",
child.LocalID, LinksetRoot.LocalID, LinksetRoot.PhysBody, IsRoot(child));
- if (!IsRoot(child))
- {
- child.LinksetInfo = null;
- }
-
- // Cannot schedule a refresh/rebuild here because this routine is called when
- // the linkset is being rebuilt.
- // InternalRefresh(LinksetRoot);
+ ScheduleRebuild(child);
return ret;
}
@@ -322,7 +316,7 @@ public sealed class BSLinksetCompound : BSLinkset
// Constraint linksets are rebuilt every time.
// Note that this works for rebuilding just the root after a linkset is taken apart.
// Called at taint time!!
- private bool UseBulletSimRootOffsetHack = false;
+ private bool UseBulletSimRootOffsetHack = false; // Attempt to have Bullet track the coords of root compound shape
private bool disableCOM = true; // For basic linkset debugging, turn off the center-of-mass setting
private void RecomputeLinksetCompound()
{
@@ -382,7 +376,7 @@ public sealed class BSLinksetCompound : BSLinkset
OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
m_physicsScene.PE.AddChildShapeToCompoundShape(linksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChild,indx={1},cShape={2},offPos={3},offRot={4}",
- LinksetRoot.LocalID, memberIndex, cPrim.PhysShape, offsetPos, offsetRot);
+ LinksetRoot.LocalID, memberIndex, childShape, offsetPos, offsetRot);
// Since we are borrowing the shape of the child, disable the origional child body
if (!IsRoot(cPrim))
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 3d68d7f..d3f3475 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -511,7 +511,7 @@ public class BSPrim : BSPhysObject
PhysScene.TaintedObject("setVehicleType", delegate()
{
- // Vehicle code changes the parameters for this vehicle type.
+ ZeroMotion(true /* inTaintTime */);
VehicleActor.ProcessTypeChange(type);
ActivateIfPhysical(false);
});
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 5236909..235da78 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -182,6 +182,10 @@ public class BSPrimLinkable : BSPrimDisplaced
{
return false;
}
+
+ // TODO: handle collisions of other objects with with children of linkset.
+ // This is a problem for LinksetCompound since the children are packed into the root.
+
return base.Collide(collidingWith, collidee, contactPoint, contactNormal, pentrationDepth);
}
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 794857c..64aaa15 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -254,10 +254,10 @@ public sealed class BSShapeCollection : IDisposable
}
else
{
+ // The current shape on the prim is the correct one. We don't need the potential reference.
potentialHull.Dereference(m_physicsScene);
}
- if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,hull,shape={1},key={2}",
- prim.LocalID, prim.PhysShape, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"));
+ if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,hull,shape={1}", prim.LocalID, prim.PhysShape);
}
else
{
@@ -277,8 +277,7 @@ public sealed class BSShapeCollection : IDisposable
// We don't need this reference to the mesh that is already being using.
potentialMesh.Dereference(m_physicsScene);
}
- if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,mesh,shape={1},key={2}",
- prim.LocalID, prim.PhysShape, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"));
+ if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,mesh,shape={1}", prim.LocalID, prim.PhysShape);
}
return ret;
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 9ef2923..3e4ee5a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -352,9 +352,6 @@ public class BSShapeMesh : BSShape
float lod;
System.UInt64 newMeshKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
- physicsScene.DetailLog("{0},BSShapeMesh,getReference,newKey={1},size={2},lod={3}",
- prim.LocalID, newMeshKey.ToString("X"), prim.Size, lod);
-
BSShapeMesh retMesh = null;
lock (Meshes)
{
@@ -380,6 +377,7 @@ public class BSShapeMesh : BSShape
retMesh.physShapeInfo = newShape;
}
}
+ physicsScene.DetailLog("{0},BSShapeMesh,getReference,mesh={1},size={2},lod={3}", prim.LocalID, retMesh, prim.Size, lod);
return retMesh;
}
public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
@@ -507,9 +505,6 @@ public class BSShapeHull : BSShape
float lod;
System.UInt64 newHullKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
- physicsScene.DetailLog("{0},BSShapeHull,getReference,newKey={1},size={2},lod={3}",
- prim.LocalID, newHullKey.ToString("X"), prim.Size, lod);
-
BSShapeHull retHull = null;
lock (Hulls)
{
@@ -531,10 +526,10 @@ public class BSShapeHull : BSShape
// If a mesh was what was created, remember the built shape for later sharing.
Hulls.Add(newHullKey, retHull);
}
-
retHull.physShapeInfo = newShape;
}
}
+ physicsScene.DetailLog("{0},BSShapeHull,getReference,hull={1},size={2},lod={3}", prim.LocalID, retHull, prim.Size, lod);
return retHull;
}
public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
--
cgit v1.1
From ad00466483c0bcdb5d05759130f35870c6a7a177 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 6 May 2013 09:17:54 -0700
Subject: Minor reordering of operations on NewUserConnection. The agent
circuit needs to be added earlier for some of the checks to work correctly.
---
OpenSim/Region/Framework/Scenes/Scene.cs | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 69fe137..ff7e5ed 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3687,14 +3687,21 @@ namespace OpenSim.Region.Framework.Scenes
sp.ControllingClient.Close(true);
sp = null;
}
-
+
+ // Optimistic: add or update the circuit data with the new agent circuit data and teleport flags.
+ // We need the circuit data here for some of the subsequent checks. (groups, for example)
+ // If the checks fail, we remove the circuit.
+ agent.teleportFlags = teleportFlags;
+ m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
+
land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
- //On login test land permisions
+ // On login test land permisions
if (vialogin)
{
if (land != null && !TestLandRestrictions(agent, land, out reason))
{
+ m_authenticateHandler.RemoveCircuit(agent.circuitcode);
return false;
}
}
@@ -3706,13 +3713,17 @@ namespace OpenSim.Region.Framework.Scenes
try
{
if (!VerifyUserPresence(agent, out reason))
+ {
+ m_authenticateHandler.RemoveCircuit(agent.circuitcode);
return false;
+ }
}
catch (Exception e)
{
m_log.ErrorFormat(
"[SCENE]: Exception verifying presence {0}{1}", e.Message, e.StackTrace);
+ m_authenticateHandler.RemoveCircuit(agent.circuitcode);
return false;
}
}
@@ -3720,13 +3731,17 @@ namespace OpenSim.Region.Framework.Scenes
try
{
if (!AuthorizeUser(agent, out reason))
+ {
+ m_authenticateHandler.RemoveCircuit(agent.circuitcode);
return false;
+ }
}
catch (Exception e)
{
m_log.ErrorFormat(
"[SCENE]: Exception authorizing user {0}{1}", e.Message, e.StackTrace);
+ m_authenticateHandler.RemoveCircuit(agent.circuitcode);
return false;
}
@@ -3761,9 +3776,6 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- // In all cases, add or update the circuit data with the new agent circuit data and teleport flags
- agent.teleportFlags = teleportFlags;
- m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
if (vialogin)
{
--
cgit v1.1
From 90f03ccd42a045bb30f33ed866feb38677ed7780 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 6 May 2013 11:47:55 -0700
Subject: Added new method to Remote Admin for reloading the estate settings.
This is meant to be called when some other program has changed the data on
the backend.
---
.../RemoteController/RemoteAdminPlugin.cs | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
(limited to 'OpenSim')
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 355f7b3..ad683b8 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -157,6 +157,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
availableMethods["admin_acl_add"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListAdd);
availableMethods["admin_acl_remove"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListRemove);
availableMethods["admin_acl_list"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListList);
+ availableMethods["admin_estate_reload"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcEstateReload);
// Either enable full remote functionality or just selected features
string enabledMethods = m_config.GetString("enabled_methods", "all");
@@ -1762,6 +1763,22 @@ namespace OpenSim.ApplicationPlugins.RemoteController
m_log.Info("[RADMIN]: Access List List Request complete");
}
+ private void XmlRpcEstateReload(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
+ {
+ m_log.Info("[RADMIN]: Received Estate Reload Request");
+
+ Hashtable responseData = (Hashtable)response.Value;
+ Hashtable requestData = (Hashtable)request.Params[0];
+
+ m_application.SceneManager.ForEachScene(s =>
+ s.RegionInfo.EstateSettings = m_application.EstateDataService.LoadEstateSettings(s.RegionInfo.RegionID, false)
+ );
+
+ responseData["success"] = true;
+
+ m_log.Info("[RADMIN]: Estate Reload Request complete");
+ }
+
private void XmlRpcGetAgentsMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
{
Hashtable responseData = (Hashtable)response.Value;
--
cgit v1.1
From f9fb1484aa00f8bfadead06ce71d004502fb564e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 3 May 2013 15:46:35 -0700
Subject: BulletSim: extend BSActorLockAxis to allow locking linear movement in
addition to angular movement. Not enabled by anything yet.
---
.../Physics/BulletSPlugin/BSActorLockAxis.cs | 25 +++++++++++++++++-----
.../Region/Physics/BulletSPlugin/BSPhysObject.cs | 9 +++++---
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 4 ++--
3 files changed, 28 insertions(+), 10 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
index 7801d8e..8b0fdeb 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
@@ -64,9 +64,9 @@ public class BSActorLockAxis : BSActor
public override void Refresh()
{
m_physicsScene.DetailLog("{0},BSActorLockAxis,refresh,lockedAxis={1},enabled={2},pActive={3}",
- m_controllingPrim.LocalID, m_controllingPrim.LockedAxis, Enabled, m_controllingPrim.IsPhysicallyActive);
+ m_controllingPrim.LocalID, m_controllingPrim.LockedAngularAxis, Enabled, m_controllingPrim.IsPhysicallyActive);
// If all the axis are free, we don't need to exist
- if (m_controllingPrim.LockedAxis == m_controllingPrim.LockedAxisFree)
+ if (m_controllingPrim.LockedAngularAxis == m_controllingPrim.LockedAxisFree)
{
Enabled = false;
}
@@ -123,23 +123,38 @@ public class BSActorLockAxis : BSActor
// Free to move linearly in the region
OMV.Vector3 linearLow = OMV.Vector3.Zero;
OMV.Vector3 linearHigh = m_physicsScene.TerrainManager.DefaultRegionSize;
+ if (m_controllingPrim.LockedLinearAxis.X != BSPhysObject.FreeAxis)
+ {
+ linearLow.X = m_controllingPrim.RawPosition.X;
+ linearHigh.X = m_controllingPrim.RawPosition.X;
+ }
+ if (m_controllingPrim.LockedLinearAxis.Y != BSPhysObject.FreeAxis)
+ {
+ linearLow.Y = m_controllingPrim.RawPosition.Y;
+ linearHigh.Y = m_controllingPrim.RawPosition.Y;
+ }
+ if (m_controllingPrim.LockedLinearAxis.Z != BSPhysObject.FreeAxis)
+ {
+ linearLow.Z = m_controllingPrim.RawPosition.Z;
+ linearHigh.Z = m_controllingPrim.RawPosition.Z;
+ }
axisConstrainer.SetLinearLimits(linearLow, linearHigh);
// Angular with some axis locked
float fPI = (float)Math.PI;
OMV.Vector3 angularLow = new OMV.Vector3(-fPI, -fPI, -fPI);
OMV.Vector3 angularHigh = new OMV.Vector3(fPI, fPI, fPI);
- if (m_controllingPrim.LockedAxis.X != 1f)
+ if (m_controllingPrim.LockedAngularAxis.X != BSPhysObject.FreeAxis)
{
angularLow.X = 0f;
angularHigh.X = 0f;
}
- if (m_controllingPrim.LockedAxis.Y != 1f)
+ if (m_controllingPrim.LockedAngularAxis.Y != BSPhysObject.FreeAxis)
{
angularLow.Y = 0f;
angularHigh.Y = 0f;
}
- if (m_controllingPrim.LockedAxis.Z != 1f)
+ if (m_controllingPrim.LockedAngularAxis.Z != BSPhysObject.FreeAxis)
{
angularLow.Z = 0f;
angularHigh.Z = 0f;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index e796804..cca887a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -108,7 +108,8 @@ public abstract class BSPhysObject : PhysicsActor
CollisionScore = 0;
// All axis free.
- LockedAxis = LockedAxisFree;
+ LockedLinearAxis = LockedAxisFree;
+ LockedAngularAxis = LockedAxisFree;
}
// Tell the object to clean up.
@@ -265,8 +266,10 @@ public abstract class BSPhysObject : PhysicsActor
// Note this is a displacement from the root's coordinates. Zero means use the root prim as center-of-mass.
public OMV.Vector3? UserSetCenterOfMassDisplacement { get; set; }
- public OMV.Vector3 LockedAxis { get; set; } // zero means locked. one means free.
- public readonly OMV.Vector3 LockedAxisFree = new OMV.Vector3(1f, 1f, 1f); // All axis are free
+ public OMV.Vector3 LockedLinearAxis { get; set; } // zero means locked. one means free.
+ public OMV.Vector3 LockedAngularAxis { get; set; } // zero means locked. one means free.
+ public const float FreeAxis = 1f;
+ public readonly OMV.Vector3 LockedAxisFree = new OMV.Vector3(FreeAxis, FreeAxis, FreeAxis); // All axis are free
// Enable physical actions. Bullet will keep sleeping non-moving physical objects so
// they need waking up when parameters are changed.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index d3f3475..f5b0361 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -256,9 +256,9 @@ public class BSPrim : BSPhysObject
if (axis.X != 1) locking.X = 0f;
if (axis.Y != 1) locking.Y = 0f;
if (axis.Z != 1) locking.Z = 0f;
- LockedAxis = locking;
+ LockedAngularAxis = locking;
- EnableActor(LockedAxis != LockedAxisFree, LockedAxisActorName, delegate()
+ EnableActor(LockedAngularAxis != LockedAxisFree, LockedAxisActorName, delegate()
{
return new BSActorLockAxis(PhysScene, this, LockedAxisActorName);
});
--
cgit v1.1
From bf318969836bf38dbd0325f24fa3d1bd12f34d77 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 3 May 2013 17:14:31 -0700
Subject: BulletSim: simplify parameter specification by reducing the number of
specifications required for simple properties with defaults.
---
OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 2 +-
OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 283 +++++++--------------
2 files changed, 94 insertions(+), 191 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index c5bee6d..0dd2aa5 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
enableAngularVerticalAttraction = true;
enableAngularDeflection = false;
enableAngularBanking = true;
- if (BSParam.VehicleDebuggingEnabled)
+ if (BSParam.VehicleDebuggingEnable)
{
enableAngularVerticalAttraction = true;
enableAngularDeflection = false;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 2ac68e3..3ca7e16 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -26,6 +26,7 @@
*/
using System;
using System.Collections.Generic;
+using System.Reflection;
using System.Text;
using OpenSim.Region.Physics.Manager;
@@ -144,7 +145,7 @@ public static class BSParam
public static Vector3 VehicleAngularFactor { get; private set; }
public static float VehicleGroundGravityFudge { get; private set; }
public static float VehicleAngularBankingTimescaleFudge { get; private set; }
- public static bool VehicleDebuggingEnabled { get; private set; }
+ public static bool VehicleDebuggingEnable { get; private set; }
// Convex Hulls
public static int CSHullMaxDepthSplit { get; private set; }
@@ -236,17 +237,41 @@ public static class BSParam
getter = pGetter;
objectSet = pObjSetter;
}
- /* Wish I could simplify using this definition but CLR doesn't store references so closure around delegates of references won't work
- * TODO: Maybe use reflection and the name of the variable to create a reference for the getter/setter.
- public ParameterDefn(string pName, string pDesc, T pDefault, ref T loc)
+ // Simple parameter variable where property name is the same as the INI file name
+ // and the value is only a simple get and set.
+ public ParameterDefn(string pName, string pDesc, T pDefault)
: base(pName, pDesc)
{
defaultValue = pDefault;
- setter = (s, v) => { loc = v; };
- getter = (s) => { return loc; };
+ setter = (s, v) => { SetValueByName(s, name, v); };
+ getter = (s) => { return GetValueByName(s, name); };
objectSet = null;
}
- */
+ // Use reflection to find the property named 'pName' in BSParam and assign 'val' to same.
+ private void SetValueByName(BSScene s, string pName, T val)
+ {
+ PropertyInfo prop = typeof(BSParam).GetProperty(pName, BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy);
+ if (prop == null)
+ {
+ // This should only be output when someone adds a new INI parameter and misspells the name.
+ s.Logger.ErrorFormat("{0} SetValueByName: did not find '{1}'. Verify specified property name is the same as the given INI parameters name.", LogHeader, pName);
+ }
+ else
+ {
+ prop.SetValue(null, val, null);
+ }
+ }
+ // Use reflection to find the property named 'pName' in BSParam and return the value in same.
+ private T GetValueByName(BSScene s, string pName)
+ {
+ PropertyInfo prop = typeof(BSParam).GetProperty(pName, BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy);
+ if (prop == null)
+ {
+ // This should only be output when someone adds a new INI parameter and misspells the name.
+ s.Logger.ErrorFormat("{0} GetValueByName: did not find '{1}'. Verify specified property name is the same as the given INI parameter name.", LogHeader, pName);
+ }
+ return (T)prop.GetValue(null, null);
+ }
public override void AssignDefault(BSScene s)
{
setter(s, defaultValue);
@@ -336,26 +361,16 @@ public static class BSParam
(s) => { return ShouldUseHullsForPhysicalObjects; },
(s,v) => { ShouldUseHullsForPhysicalObjects = v; } ),
new ParameterDefn("ShouldRemoveZeroWidthTriangles", "If true, remove degenerate triangles from meshes",
- true,
- (s) => { return ShouldRemoveZeroWidthTriangles; },
- (s,v) => { ShouldRemoveZeroWidthTriangles = v; } ),
+ true ),
new ParameterDefn("ShouldUseBulletHACD", "If true, use the Bullet version of HACD",
- false,
- (s) => { return ShouldUseBulletHACD; },
- (s,v) => { ShouldUseBulletHACD = v; } ),
+ false ),
new ParameterDefn("ShouldUseSingleConvexHullForPrims", "If true, use a single convex hull shape for physical prims",
- true,
- (s) => { return ShouldUseSingleConvexHullForPrims; },
- (s,v) => { ShouldUseSingleConvexHullForPrims = v; } ),
+ true ),
new ParameterDefn("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions",
- 5,
- (s) => { return CrossingFailuresBeforeOutOfBounds; },
- (s,v) => { CrossingFailuresBeforeOutOfBounds = v; } ),
+ 5 ),
new ParameterDefn("UpdateVelocityChangeThreshold", "Change in updated velocity required before reporting change to simulator",
- 0.1f,
- (s) => { return UpdateVelocityChangeThreshold; },
- (s,v) => { UpdateVelocityChangeThreshold = v; } ),
+ 0.1f ),
new ParameterDefn("MeshLevelOfDetail", "Level of detail to render meshes (32, 16, 8 or 4. 32=most detailed)",
32f,
@@ -422,18 +437,12 @@ public static class BSParam
(s,v) => { MaxAddForceMagnitude = v; MaxAddForceMagnitudeSquared = v * v; } ),
// Density is passed around as 100kg/m3. This scales that to 1kg/m3.
new ParameterDefn("DensityScaleFactor", "Conversion for simulator/viewer density (100kg/m3) to physical density (1kg/m3)",
- 0.01f,
- (s) => { return DensityScaleFactor; },
- (s,v) => { DensityScaleFactor = v; } ),
+ 0.01f ),
new ParameterDefn("PID_D", "Derivitive factor for motion smoothing",
- 2200f,
- (s) => { return (float)PID_D; },
- (s,v) => { PID_D = v; } ),
+ 2200f ),
new ParameterDefn("PID_P", "Parameteric factor for motion smoothing",
- 900f,
- (s) => { return (float)PID_P; },
- (s,v) => { PID_P = v; } ),
+ 900f ),
new ParameterDefn("DefaultFriction", "Friction factor used on new objects",
0.2f,
@@ -500,94 +509,50 @@ public static class BSParam
(s,o) => { s.PE.SetContactProcessingThreshold(o.PhysBody, ContactProcessingThreshold); } ),
new ParameterDefn("TerrainImplementation", "Type of shape to use for terrain (0=heightmap, 1=mesh)",
- (float)BSTerrainPhys.TerrainImplementation.Mesh,
- (s) => { return TerrainImplementation; },
- (s,v) => { TerrainImplementation = v; } ),
+ (float)BSTerrainPhys.TerrainImplementation.Mesh ),
new ParameterDefn("TerrainMeshMagnification", "Number of times the 256x256 heightmap is multiplied to create the terrain mesh" ,
- 2,
- (s) => { return TerrainMeshMagnification; },
- (s,v) => { TerrainMeshMagnification = v; } ),
+ 2 ),
new ParameterDefn("TerrainFriction", "Factor to reduce movement against terrain surface" ,
- 0.3f,
- (s) => { return TerrainFriction; },
- (s,v) => { TerrainFriction = v; /* TODO: set on real terrain */} ),
+ 0.3f ),
new ParameterDefn("TerrainHitFraction", "Distance to measure hit collisions" ,
- 0.8f,
- (s) => { return TerrainHitFraction; },
- (s,v) => { TerrainHitFraction = v; /* TODO: set on real terrain */ } ),
+ 0.8f ),
new ParameterDefn("TerrainRestitution", "Bouncyness" ,
- 0f,
- (s) => { return TerrainRestitution; },
- (s,v) => { TerrainRestitution = v; /* TODO: set on real terrain */ } ),
+ 0f ),
new ParameterDefn("TerrainContactProcessingThreshold", "Distance from terrain to stop processing collisions" ,
- 0.0f,
- (s) => { return TerrainContactProcessingThreshold; },
- (s,v) => { TerrainContactProcessingThreshold = v; /* TODO: set on real terrain */ } ),
+ 0.0f ),
new ParameterDefn("TerrainCollisionMargin", "Margin where collision checking starts" ,
- 0.08f,
- (s) => { return TerrainCollisionMargin; },
- (s,v) => { TerrainCollisionMargin = v; /* TODO: set on real terrain */ } ),
+ 0.08f ),
new ParameterDefn("AvatarFriction", "Factor to reduce movement against an avatar. Changed on avatar recreation.",
- 0.2f,
- (s) => { return AvatarFriction; },
- (s,v) => { AvatarFriction = v; } ),
+ 0.2f ),
new ParameterDefn("AvatarStandingFriction", "Avatar friction when standing. Changed on avatar recreation.",
- 0.95f,
- (s) => { return AvatarStandingFriction; },
- (s,v) => { AvatarStandingFriction = v; } ),
+ 0.95f ),
new ParameterDefn("AvatarAlwaysRunFactor", "Speed multiplier if avatar is set to always run",
- 1.3f,
- (s) => { return AvatarAlwaysRunFactor; },
- (s,v) => { AvatarAlwaysRunFactor = v; } ),
+ 1.3f ),
new ParameterDefn("AvatarDensity", "Density of an avatar. Changed on avatar recreation.",
- 3.5f,
- (s) => { return AvatarDensity; },
- (s,v) => { AvatarDensity = v; } ),
+ 3.5f) ,
new ParameterDefn("AvatarRestitution", "Bouncyness. Changed on avatar recreation.",
- 0f,
- (s) => { return AvatarRestitution; },
- (s,v) => { AvatarRestitution = v; } ),
+ 0f ),
new ParameterDefn("AvatarCapsuleWidth", "The distance between the sides of the avatar capsule",
- 0.6f,
- (s) => { return AvatarCapsuleWidth; },
- (s,v) => { AvatarCapsuleWidth = v; } ),
+ 0.6f ) ,
new ParameterDefn("AvatarCapsuleDepth", "The distance between the front and back of the avatar capsule",
- 0.45f,
- (s) => { return AvatarCapsuleDepth; },
- (s,v) => { AvatarCapsuleDepth = v; } ),
+ 0.45f ),
new ParameterDefn("AvatarCapsuleHeight", "Default height of space around avatar",
- 1.5f,
- (s) => { return AvatarCapsuleHeight; },
- (s,v) => { AvatarCapsuleHeight = v; } ),
+ 1.5f ),
new ParameterDefn("AvatarContactProcessingThreshold", "Distance from capsule to check for collisions",
- 0.1f,
- (s) => { return AvatarContactProcessingThreshold; },
- (s,v) => { AvatarContactProcessingThreshold = v; } ),
+ 0.1f ),
new ParameterDefn("AvatarBelowGroundUpCorrectionMeters", "Meters to move avatar up if it seems to be below ground",
- 1.0f,
- (s) => { return AvatarBelowGroundUpCorrectionMeters; },
- (s,v) => { AvatarBelowGroundUpCorrectionMeters = v; } ),
+ 1.0f ),
new ParameterDefn("AvatarStepHeight", "Height of a step obstacle to consider step correction",
- 0.6f,
- (s) => { return AvatarStepHeight; },
- (s,v) => { AvatarStepHeight = v; } ),
+ 0.6f ) ,
new ParameterDefn("AvatarStepApproachFactor", "Factor to control angle of approach to step (0=straight on)",
- 0.6f,
- (s) => { return AvatarStepApproachFactor; },
- (s,v) => { AvatarStepApproachFactor = v; } ),
+ 0.6f ),
new ParameterDefn("AvatarStepForceFactor", "Controls the amount of force up applied to step up onto a step",
- 1.0f,
- (s) => { return AvatarStepForceFactor; },
- (s,v) => { AvatarStepForceFactor = v; } ),
+ 1.0f ),
new ParameterDefn("AvatarStepUpCorrectionFactor", "Multiplied by height of step collision to create up movement at step",
- 1.0f,
- (s) => { return AvatarStepUpCorrectionFactor; },
- (s,v) => { AvatarStepUpCorrectionFactor = v; } ),
+ 1.0f ),
new ParameterDefn("AvatarStepSmoothingSteps", "Number of frames after a step collision that we continue walking up stairs",
- 2,
- (s) => { return AvatarStepSmoothingSteps; },
- (s,v) => { AvatarStepSmoothingSteps = v; } ),
+ 2 ),
new ParameterDefn("VehicleMaxLinearVelocity", "Maximum velocity magnitude that can be assigned to a vehicle",
1000.0f,
@@ -598,37 +563,21 @@ public static class BSParam
(s) => { return (float)VehicleMaxAngularVelocity; },
(s,v) => { VehicleMaxAngularVelocity = v; VehicleMaxAngularVelocitySq = v * v; } ),
new ParameterDefn("VehicleAngularDamping", "Factor to damp vehicle angular movement per second (0.0 - 1.0)",
- 0.0f,
- (s) => { return VehicleAngularDamping; },
- (s,v) => { VehicleAngularDamping = v; } ),
+ 0.0f ),
new ParameterDefn("VehicleLinearFactor", "Fraction of physical linear changes applied to vehicle (<0,0,0> to <1,1,1>)",
- new Vector3(1f, 1f, 1f),
- (s) => { return VehicleLinearFactor; },
- (s,v) => { VehicleLinearFactor = v; } ),
+ new Vector3(1f, 1f, 1f) ),
new ParameterDefn("VehicleAngularFactor", "Fraction of physical angular changes applied to vehicle (<0,0,0> to <1,1,1>)",
- new Vector3(1f, 1f, 1f),
- (s) => { return VehicleAngularFactor; },
- (s,v) => { VehicleAngularFactor = v; } ),
+ new Vector3(1f, 1f, 1f) ),
new ParameterDefn("VehicleFriction", "Friction of vehicle on the ground (0.0 - 1.0)",
- 0.0f,
- (s) => { return VehicleFriction; },
- (s,v) => { VehicleFriction = v; } ),
+ 0.0f ),
new ParameterDefn("VehicleRestitution", "Bouncyness factor for vehicles (0.0 - 1.0)",
- 0.0f,
- (s) => { return VehicleRestitution; },
- (s,v) => { VehicleRestitution = v; } ),
+ 0.0f ),
new ParameterDefn("VehicleGroundGravityFudge", "Factor to multiply gravity if a ground vehicle is probably on the ground (0.0 - 1.0)",
- 0.2f,
- (s) => { return VehicleGroundGravityFudge; },
- (s,v) => { VehicleGroundGravityFudge = v; } ),
+ 0.2f ),
new ParameterDefn("VehicleAngularBankingTimescaleFudge", "Factor to multiple angular banking timescale. Tune to increase realism.",
- 60.0f,
- (s) => { return VehicleAngularBankingTimescaleFudge; },
- (s,v) => { VehicleAngularBankingTimescaleFudge = v; } ),
+ 60.0f ),
new ParameterDefn("VehicleDebuggingEnable", "Turn on/off vehicle debugging",
- false,
- (s) => { return VehicleDebuggingEnabled; },
- (s,v) => { VehicleDebuggingEnabled = v; } ),
+ false ),
new ParameterDefn("MaxPersistantManifoldPoolSize", "Number of manifolds pooled (0 means default of 4096)",
0f,
@@ -673,99 +622,53 @@ public static class BSParam
(s,v) => { GlobalContactBreakingThreshold = v; s.UnmanagedParams[0].globalContactBreakingThreshold = v; } ),
new ParameterDefn("CSHullMaxDepthSplit", "CS impl: max depth to split for hull. 1-10 but > 7 is iffy",
- 7,
- (s) => { return CSHullMaxDepthSplit; },
- (s,v) => { CSHullMaxDepthSplit = v; } ),
+ 7 ),
new ParameterDefn("CSHullMaxDepthSplitForSimpleShapes", "CS impl: max depth setting for simple prim shapes",
- 2,
- (s) => { return CSHullMaxDepthSplitForSimpleShapes; },
- (s,v) => { CSHullMaxDepthSplitForSimpleShapes = v; } ),
+ 2 ),
new ParameterDefn("CSHullConcavityThresholdPercent", "CS impl: concavity threshold percent (0-20)",
- 5f,
- (s) => { return CSHullConcavityThresholdPercent; },
- (s,v) => { CSHullConcavityThresholdPercent = v; } ),
+ 5f ),
new ParameterDefn("CSHullVolumeConservationThresholdPercent", "percent volume conservation to collapse hulls (0-30)",
- 5f,
- (s) => { return CSHullVolumeConservationThresholdPercent; },
- (s,v) => { CSHullVolumeConservationThresholdPercent = v; } ),
+ 5f ),
new ParameterDefn("CSHullMaxVertices", "CS impl: maximum number of vertices in output hulls. Keep < 50.",
- 32,
- (s) => { return CSHullMaxVertices; },
- (s,v) => { CSHullMaxVertices = v; } ),
+ 32 ),
new ParameterDefn("CSHullMaxSkinWidth", "CS impl: skin width to apply to output hulls.",
- 0f,
- (s) => { return CSHullMaxSkinWidth; },
- (s,v) => { CSHullMaxSkinWidth = v; } ),
+ 0f ),
new ParameterDefn("BHullMaxVerticesPerHull", "Bullet impl: max number of vertices per created hull",
- 100f,
- (s) => { return BHullMaxVerticesPerHull; },
- (s,v) => { BHullMaxVerticesPerHull = v; } ),
+ 100f ),
new ParameterDefn("BHullMinClusters", "Bullet impl: minimum number of hulls to create per mesh",
- 2f,
- (s) => { return BHullMinClusters; },
- (s,v) => { BHullMinClusters = v; } ),
+ 2f ),
new ParameterDefn("BHullCompacityWeight", "Bullet impl: weight factor for how compact to make hulls",
- 2f,
- (s) => { return BHullCompacityWeight; },
- (s,v) => { BHullCompacityWeight = v; } ),
+ 0.1f ),
new ParameterDefn("BHullVolumeWeight", "Bullet impl: weight factor for volume in created hull",
- 0.1f,
- (s) => { return BHullVolumeWeight; },
- (s,v) => { BHullVolumeWeight = v; } ),
+ 0f ),
new ParameterDefn("BHullConcavity", "Bullet impl: weight factor for how convex a created hull can be",
- 100f,
- (s) => { return BHullConcavity; },
- (s,v) => { BHullConcavity = v; } ),
+ 100f ),
new ParameterDefn("BHullAddExtraDistPoints", "Bullet impl: whether to add extra vertices for long distance vectors",
- false,
- (s) => { return BHullAddExtraDistPoints; },
- (s,v) => { BHullAddExtraDistPoints = v; } ),
+ false ),
new ParameterDefn("BHullAddNeighboursDistPoints", "Bullet impl: whether to add extra vertices between neighbor hulls",
- false,
- (s) => { return BHullAddNeighboursDistPoints; },
- (s,v) => { BHullAddNeighboursDistPoints = v; } ),
+ false ),
new ParameterDefn("BHullAddFacesPoints", "Bullet impl: whether to add extra vertices to break up hull faces",
- false,
- (s) => { return BHullAddFacesPoints; },
- (s,v) => { BHullAddFacesPoints = v; } ),
+ false ),
new ParameterDefn("BHullShouldAdjustCollisionMargin", "Bullet impl: whether to shrink resulting hulls to account for collision margin",
- false,
- (s) => { return BHullShouldAdjustCollisionMargin; },
- (s,v) => { BHullShouldAdjustCollisionMargin = v; } ),
+ false ),
new ParameterDefn("LinksetImplementation", "Type of linkset implementation (0=Constraint, 1=Compound, 2=Manual)",
- (float)BSLinkset.LinksetImplementation.Compound,
- (s) => { return LinksetImplementation; },
- (s,v) => { LinksetImplementation = v; } ),
+ (float)BSLinkset.LinksetImplementation.Compound ),
new ParameterDefn("LinkConstraintUseFrameOffset", "For linksets built with constraints, enable frame offsetFor linksets built with constraints, enable frame offset.",
- false,
- (s) => { return LinkConstraintUseFrameOffset; },
- (s,v) => { LinkConstraintUseFrameOffset = v; } ),
+ false ),
new ParameterDefn("LinkConstraintEnableTransMotor", "Whether to enable translational motor on linkset constraints",
- true,
- (s) => { return LinkConstraintEnableTransMotor; },
- (s,v) => { LinkConstraintEnableTransMotor = v; } ),
+ true ),
new ParameterDefn("LinkConstraintTransMotorMaxVel", "Maximum velocity to be applied by translational motor in linkset constraints",
- 5.0f,
- (s) => { return LinkConstraintTransMotorMaxVel; },
- (s,v) => { LinkConstraintTransMotorMaxVel = v; } ),
+ 5.0f ),
new ParameterDefn("LinkConstraintTransMotorMaxForce", "Maximum force to be applied by translational motor in linkset constraints",
- 0.1f,
- (s) => { return LinkConstraintTransMotorMaxForce; },
- (s,v) => { LinkConstraintTransMotorMaxForce = v; } ),
+ 0.1f ),
new ParameterDefn("LinkConstraintCFM", "Amount constraint can be violated. 0=no violation, 1=infinite. Default=0.1",
- 0.1f,
- (s) => { return LinkConstraintCFM; },
- (s,v) => { LinkConstraintCFM = v; } ),
+ 0.1f ),
new ParameterDefn("LinkConstraintERP", "Amount constraint is corrected each tick. 0=none, 1=all. Default = 0.2",
- 0.1f,
- (s) => { return LinkConstraintERP; },
- (s,v) => { LinkConstraintERP = v; } ),
+ 0.1f ),
new ParameterDefn("LinkConstraintSolverIterations", "Number of solver iterations when computing constraint. (0 = Bullet default)",
- 40,
- (s) => { return LinkConstraintSolverIterations; },
- (s,v) => { LinkConstraintSolverIterations = v; } ),
+ 40 ),
new ParameterDefn("PhysicsMetricFrames", "Frames between outputting detailed phys metrics. (0 is off)",
0,
--
cgit v1.1
From 045aaa838ac0a6e129ff1d8ec65053508df1d51a Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 6 May 2013 13:29:19 -0700
Subject: BulletSim: remove friction calcuation from BSMotor and move linear
and angular friction computation into linear and angular movement code. The
friction wasn't being applied properly. This will make it so vehicles don't
drift as much and the drift is tunable by changing the friction timescales.
---
.../Physics/BulletSPlugin/BSActorAvatarMove.cs | 1 -
.../Region/Physics/BulletSPlugin/BSActorHover.cs | 1 -
.../Physics/BulletSPlugin/BSActorMoveToTarget.cs | 1 -
.../Physics/BulletSPlugin/BSActorSetForce.cs | 2 +-
.../Physics/BulletSPlugin/BSActorSetTorque.cs | 2 +-
OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 44 ++++++++++-----
OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs | 63 +++++-----------------
7 files changed, 47 insertions(+), 67 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index 4e067b5..ac8c30c 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -118,7 +118,6 @@ public class BSActorAvatarMove : BSActor
m_velocityMotor = new BSVMotor("BSCharacter.Velocity",
0.2f, // time scale
BSMotor.Infinite, // decay time scale
- BSMotor.InfiniteVector, // friction timescale
1f // efficiency
);
// _velocityMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG so motor will output detail log messages.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
index 3630ca8..8a79809 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
@@ -102,7 +102,6 @@ public class BSActorHover : BSActor
m_hoverMotor = new BSFMotor("BSActorHover",
m_controllingPrim.HoverTau, // timeScale
BSMotor.Infinite, // decay time scale
- BSMotor.Infinite, // friction timescale
1f // efficiency
);
m_hoverMotor.SetTarget(ComputeCurrentHoverHeight());
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
index 1b598fd..75ff24e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
@@ -105,7 +105,6 @@ public class BSActorMoveToTarget : BSActor
m_targetMotor = new BSVMotor("BSActorMoveToTargget.Activate",
m_controllingPrim.MoveToTargetTau, // timeScale
BSMotor.Infinite, // decay time scale
- BSMotor.InfiniteVector, // friction timescale
1f // efficiency
);
m_targetMotor.PhysicsScene = m_physicsScene; // DEBUG DEBUG so motor will output detail log messages.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
index c0f40fd..96fa0b6 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
@@ -101,7 +101,7 @@ public class BSActorSetForce : BSActor
if (m_forceMotor == null)
{
// A fake motor that might be used someday
- m_forceMotor = new BSFMotor("setForce", 1f, 1f, 1f, 1f);
+ m_forceMotor = new BSFMotor("setForce", 1f, 1f, 1f);
m_physicsScene.BeforeStep += Mover;
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
index b3806e1..65098e1 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
@@ -101,7 +101,7 @@ public class BSActorSetTorque : BSActor
if (m_torqueMotor == null)
{
// A fake motor that might be used someday
- m_torqueMotor = new BSFMotor("setTorque", 1f, 1f, 1f, 1f);
+ m_torqueMotor = new BSFMotor("setTorque", 1f, 1f, 1f);
m_physicsScene.BeforeStep += Mover;
}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 0dd2aa5..272a162 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -235,7 +235,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
// set all of the components to the same value
case Vehicle.ANGULAR_FRICTION_TIMESCALE:
m_angularFrictionTimescale = new Vector3(pValue, pValue, pValue);
- m_angularMotor.FrictionTimescale = m_angularFrictionTimescale;
break;
case Vehicle.ANGULAR_MOTOR_DIRECTION:
m_angularMotorDirection = new Vector3(pValue, pValue, pValue);
@@ -244,7 +243,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
break;
case Vehicle.LINEAR_FRICTION_TIMESCALE:
m_linearFrictionTimescale = new Vector3(pValue, pValue, pValue);
- m_linearMotor.FrictionTimescale = m_linearFrictionTimescale;
break;
case Vehicle.LINEAR_MOTOR_DIRECTION:
m_linearMotorDirection = new Vector3(pValue, pValue, pValue);
@@ -265,7 +263,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
{
case Vehicle.ANGULAR_FRICTION_TIMESCALE:
m_angularFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
- m_angularMotor.FrictionTimescale = m_angularFrictionTimescale;
break;
case Vehicle.ANGULAR_MOTOR_DIRECTION:
// Limit requested angular speed to 2 rps= 4 pi rads/sec
@@ -278,7 +275,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
break;
case Vehicle.LINEAR_FRICTION_TIMESCALE:
m_linearFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
- m_linearMotor.FrictionTimescale = m_linearFrictionTimescale;
break;
case Vehicle.LINEAR_MOTOR_DIRECTION:
m_linearMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
@@ -559,14 +555,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
break;
}
- m_linearMotor = new BSVMotor("LinearMotor", m_linearMotorTimescale,
- m_linearMotorDecayTimescale, m_linearFrictionTimescale,
- 1f);
+ m_linearMotor = new BSVMotor("LinearMotor", m_linearMotorTimescale, m_linearMotorDecayTimescale, 1f);
m_linearMotor.PhysicsScene = m_physicsScene; // DEBUG DEBUG DEBUG (enables detail logging)
- m_angularMotor = new BSVMotor("AngularMotor", m_angularMotorTimescale,
- m_angularMotorDecayTimescale, m_angularFrictionTimescale,
- 1f);
+ m_angularMotor = new BSVMotor("AngularMotor", m_angularMotorTimescale, m_angularMotorDecayTimescale, 1f);
m_angularMotor.PhysicsScene = m_physicsScene; // DEBUG DEBUG DEBUG (enables detail logging)
/* Not implemented
@@ -574,7 +566,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
BSMotor.Infinite, BSMotor.InfiniteVector,
m_verticalAttractionEfficiency);
// Z goes away and we keep X and Y
- m_verticalAttractionMotor.FrictionTimescale = new Vector3(BSMotor.Infinite, BSMotor.Infinite, 0.1f);
m_verticalAttractionMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG DEBUG (enables detail logging)
*/
@@ -1050,8 +1041,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
// Add this correction to the velocity to make it faster/slower.
VehicleVelocity += linearMotorVelocityW;
- VDetailLog("{0}, MoveLinear,velocity,origVelW={1},velV={2},correctV={3},correctW={4},newVelW={5}",
- ControllingPrim.LocalID, origVelW, currentVelV, linearMotorCorrectionV, linearMotorVelocityW, VehicleVelocity);
+ // Friction reduces vehicle motion
+ Vector3 frictionFactor = ComputeFrictionFactor(m_linearFrictionTimescale, pTimestep);
+ VehicleVelocity -= (VehicleVelocity * frictionFactor);
+
+ VDetailLog("{0}, MoveLinear,velocity,origVelW={1},velV={2},correctV={3},correctW={4},newVelW={5},fricFact={6}",
+ ControllingPrim.LocalID, origVelW, currentVelV, linearMotorCorrectionV,
+ linearMotorVelocityW, VehicleVelocity, frictionFactor);
}
public void ComputeLinearTerrainHeightCorrection(float pTimestep)
@@ -1342,6 +1338,11 @@ namespace OpenSim.Region.Physics.BulletSPlugin
// }
VehicleRotationalVelocity += angularMotorContributionV * VehicleOrientation;
+
+ // Reduce any velocity by friction.
+ Vector3 frictionFactor = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep);
+ VehicleRotationalVelocity -= (VehicleRotationalVelocity * frictionFactor);
+
VDetailLog("{0}, MoveAngular,angularTurning,angularMotorContrib={1}", ControllingPrim.LocalID, angularMotorContributionV);
}
@@ -1629,6 +1630,23 @@ namespace OpenSim.Region.Physics.BulletSPlugin
}
+ // Given a friction vector (reduction in seconds) and a timestep, return the factor to reduce
+ // some value by to apply this friction.
+ private Vector3 ComputeFrictionFactor(Vector3 friction, float pTimestep)
+ {
+ Vector3 frictionFactor = Vector3.Zero;
+ if (friction != BSMotor.InfiniteVector)
+ {
+ // frictionFactor = (Vector3.One / FrictionTimescale) * timeStep;
+ // Individual friction components can be 'infinite' so compute each separately.
+ frictionFactor.X = (friction.X == BSMotor.Infinite) ? 0f : (1f / friction.X);
+ frictionFactor.Y = (friction.Y == BSMotor.Infinite) ? 0f : (1f / friction.Y);
+ frictionFactor.Z = (friction.Z == BSMotor.Infinite) ? 0f : (1f / friction.Z);
+ frictionFactor *= pTimestep;
+ }
+ return frictionFactor;
+ }
+
private float ClampInRange(float low, float val, float high)
{
return Math.Max(low, Math.Min(val, high));
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
index 0128d8d..ef662b5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
@@ -65,13 +65,11 @@ public abstract class BSMotor
}
// Motor which moves CurrentValue to TargetValue over TimeScale seconds.
-// The TargetValue decays in TargetValueDecayTimeScale and
-// the CurrentValue will be held back by FrictionTimeScale.
+// The TargetValue decays in TargetValueDecayTimeScale.
// This motor will "zero itself" over time in that the targetValue will
// decay to zero and the currentValue will follow it to that zero.
// The overall effect is for the returned correction value to go from large
-// values (the total difference between current and target minus friction)
-// to small and eventually zero values.
+// values to small and eventually zero values.
// TimeScale and TargetDelayTimeScale may be 'infinite' which means no decay.
// For instance, if something is moving at speed X and the desired speed is Y,
@@ -88,7 +86,6 @@ public class BSVMotor : BSMotor
public virtual float TimeScale { get; set; }
public virtual float TargetValueDecayTimeScale { get; set; }
- public virtual Vector3 FrictionTimescale { get; set; }
public virtual float Efficiency { get; set; }
public virtual float ErrorZeroThreshold { get; set; }
@@ -111,16 +108,14 @@ public class BSVMotor : BSMotor
{
TimeScale = TargetValueDecayTimeScale = BSMotor.Infinite;
Efficiency = 1f;
- FrictionTimescale = BSMotor.InfiniteVector;
CurrentValue = TargetValue = Vector3.Zero;
ErrorZeroThreshold = 0.001f;
}
- public BSVMotor(string useName, float timeScale, float decayTimeScale, Vector3 frictionTimeScale, float efficiency)
+ public BSVMotor(string useName, float timeScale, float decayTimeScale, float efficiency)
: this(useName)
{
TimeScale = timeScale;
TargetValueDecayTimeScale = decayTimeScale;
- FrictionTimescale = frictionTimeScale;
Efficiency = efficiency;
CurrentValue = TargetValue = Vector3.Zero;
}
@@ -165,26 +160,11 @@ public class BSVMotor : BSMotor
TargetValue *= (1f - decayFactor);
}
- // The amount we can correct the error is reduced by the friction
- Vector3 frictionFactor = Vector3.Zero;
- if (FrictionTimescale != BSMotor.InfiniteVector)
- {
- // frictionFactor = (Vector3.One / FrictionTimescale) * timeStep;
- // Individual friction components can be 'infinite' so compute each separately.
- frictionFactor.X = (FrictionTimescale.X == BSMotor.Infinite) ? 0f : (1f / FrictionTimescale.X);
- frictionFactor.Y = (FrictionTimescale.Y == BSMotor.Infinite) ? 0f : (1f / FrictionTimescale.Y);
- frictionFactor.Z = (FrictionTimescale.Z == BSMotor.Infinite) ? 0f : (1f / FrictionTimescale.Z);
- frictionFactor *= timeStep;
- CurrentValue *= (Vector3.One - frictionFactor);
- }
-
MDetailLog("{0}, BSVMotor.Step,nonZero,{1},origCurr={2},origTarget={3},timeStep={4},err={5},corr={6}",
BSScene.DetailLogZero, UseName, origCurrVal, origTarget,
timeStep, error, correction);
- MDetailLog("{0}, BSVMotor.Step,nonZero,{1},tgtDecayTS={2},decayFact={3},frictTS={4},frictFact={5},tgt={6},curr={7}",
- BSScene.DetailLogZero, UseName,
- TargetValueDecayTimeScale, decayFactor, FrictionTimescale, frictionFactor,
- TargetValue, CurrentValue);
+ MDetailLog("{0}, BSVMotor.Step,nonZero,{1},tgtDecayTS={2},decayFact={3},tgt={4},curr={5}",
+ BSScene.DetailLogZero, UseName, TargetValueDecayTimeScale, decayFactor, TargetValue, CurrentValue);
}
else
{
@@ -235,9 +215,9 @@ public class BSVMotor : BSMotor
// maximum number of outputs to generate.
int maxOutput = 50;
MDetailLog("{0},BSVMotor.Test,{1},===================================== BEGIN Test Output", BSScene.DetailLogZero, UseName);
- MDetailLog("{0},BSVMotor.Test,{1},timeScale={2},targDlyTS={3},frictTS={4},eff={5},curr={6},tgt={7}",
+ MDetailLog("{0},BSVMotor.Test,{1},timeScale={2},targDlyTS={3},eff={4},curr={5},tgt={6}",
BSScene.DetailLogZero, UseName,
- TimeScale, TargetValueDecayTimeScale, FrictionTimescale, Efficiency,
+ TimeScale, TargetValueDecayTimeScale, Efficiency,
CurrentValue, TargetValue);
LastError = BSMotor.InfiniteVector;
@@ -254,8 +234,8 @@ public class BSVMotor : BSMotor
public override string ToString()
{
- return String.Format("<{0},curr={1},targ={2},lastErr={3},decayTS={4},frictTS={5}>",
- UseName, CurrentValue, TargetValue, LastError, TargetValueDecayTimeScale, FrictionTimescale);
+ return String.Format("<{0},curr={1},targ={2},lastErr={3},decayTS={4}>",
+ UseName, CurrentValue, TargetValue, LastError, TargetValueDecayTimeScale);
}
}
@@ -265,7 +245,6 @@ public class BSFMotor : BSMotor
{
public virtual float TimeScale { get; set; }
public virtual float TargetValueDecayTimeScale { get; set; }
- public virtual float FrictionTimescale { get; set; }
public virtual float Efficiency { get; set; }
public virtual float ErrorZeroThreshold { get; set; }
@@ -283,12 +262,11 @@ public class BSFMotor : BSMotor
return (err >= -ErrorZeroThreshold && err <= ErrorZeroThreshold);
}
- public BSFMotor(string useName, float timeScale, float decayTimescale, float friction, float efficiency)
+ public BSFMotor(string useName, float timeScale, float decayTimescale, float efficiency)
: base(useName)
{
TimeScale = TargetValueDecayTimeScale = BSMotor.Infinite;
Efficiency = 1f;
- FrictionTimescale = BSMotor.Infinite;
CurrentValue = TargetValue = 0f;
ErrorZeroThreshold = 0.01f;
}
@@ -331,24 +309,11 @@ public class BSFMotor : BSMotor
TargetValue *= (1f - decayFactor);
}
- // The amount we can correct the error is reduced by the friction
- float frictionFactor = 0f;
- if (FrictionTimescale != BSMotor.Infinite)
- {
- // frictionFactor = (Vector3.One / FrictionTimescale) * timeStep;
- // Individual friction components can be 'infinite' so compute each separately.
- frictionFactor = 1f / FrictionTimescale;
- frictionFactor *= timeStep;
- CurrentValue *= (1f - frictionFactor);
- }
-
MDetailLog("{0}, BSFMotor.Step,nonZero,{1},origCurr={2},origTarget={3},timeStep={4},err={5},corr={6}",
BSScene.DetailLogZero, UseName, origCurrVal, origTarget,
timeStep, error, correction);
- MDetailLog("{0}, BSFMotor.Step,nonZero,{1},tgtDecayTS={2},decayFact={3},frictTS={4},frictFact={5},tgt={6},curr={7}",
- BSScene.DetailLogZero, UseName,
- TargetValueDecayTimeScale, decayFactor, FrictionTimescale, frictionFactor,
- TargetValue, CurrentValue);
+ MDetailLog("{0}, BSFMotor.Step,nonZero,{1},tgtDecayTS={2},decayFact={3},tgt={4},curr={5}",
+ BSScene.DetailLogZero, UseName, TargetValueDecayTimeScale, decayFactor, TargetValue, CurrentValue);
}
else
{
@@ -390,8 +355,8 @@ public class BSFMotor : BSMotor
public override string ToString()
{
- return String.Format("<{0},curr={1},targ={2},lastErr={3},decayTS={4},frictTS={5}>",
- UseName, CurrentValue, TargetValue, LastError, TargetValueDecayTimeScale, FrictionTimescale);
+ return String.Format("<{0},curr={1},targ={2},lastErr={3},decayTS={4}>",
+ UseName, CurrentValue, TargetValue, LastError, TargetValueDecayTimeScale);
}
}
--
cgit v1.1
From 93e1986d690cda415c9cce639a2656bc773a9a29 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 6 May 2013 16:48:01 -0700
Subject: BulletSim: apply linear and angular friction in vehicle coordinates
and not world coordinates.
---
OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 272a162..04ea289 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1042,12 +1042,12 @@ namespace OpenSim.Region.Physics.BulletSPlugin
VehicleVelocity += linearMotorVelocityW;
// Friction reduces vehicle motion
- Vector3 frictionFactor = ComputeFrictionFactor(m_linearFrictionTimescale, pTimestep);
- VehicleVelocity -= (VehicleVelocity * frictionFactor);
+ Vector3 frictionFactorW = ComputeFrictionFactor(m_linearFrictionTimescale, pTimestep) * VehicleOrientation;
+ VehicleVelocity -= (VehicleVelocity * frictionFactorW);
VDetailLog("{0}, MoveLinear,velocity,origVelW={1},velV={2},correctV={3},correctW={4},newVelW={5},fricFact={6}",
ControllingPrim.LocalID, origVelW, currentVelV, linearMotorCorrectionV,
- linearMotorVelocityW, VehicleVelocity, frictionFactor);
+ linearMotorVelocityW, VehicleVelocity, frictionFactorW);
}
public void ComputeLinearTerrainHeightCorrection(float pTimestep)
@@ -1340,10 +1340,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
VehicleRotationalVelocity += angularMotorContributionV * VehicleOrientation;
// Reduce any velocity by friction.
- Vector3 frictionFactor = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep);
- VehicleRotationalVelocity -= (VehicleRotationalVelocity * frictionFactor);
+ Vector3 frictionFactorW = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep) * VehicleOrientation;
+ VehicleRotationalVelocity -= (VehicleRotationalVelocity * frictionFactorW);
- VDetailLog("{0}, MoveAngular,angularTurning,angularMotorContrib={1}", ControllingPrim.LocalID, angularMotorContributionV);
+ VDetailLog("{0}, MoveAngular,angularTurning,angContribV={1}", ControllingPrim.LocalID, angularMotorContributionV);
}
// From http://wiki.secondlife.com/wiki/Linden_Vehicle_Tutorial:
--
cgit v1.1
From 4c83b5e719ad288b1250fbed3f74698fa34eff21 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 7 May 2013 00:31:11 +0100
Subject: Step one of estate settings sharing - port the Avination Estate
module (complete module) as changes are too extensive to apply manually
---
.../EntityTransfer/EntityTransferModule.cs | 13 +++--
.../EntityTransfer/HGEntityTransferModule.cs | 21 +++++---
.../World/Estate/EstateManagementModule.cs | 57 +++++++++++++++++-----
.../Framework/Interfaces/IEntityTransferModule.cs | 2 +-
OpenSim/Region/Framework/Scenes/Scene.cs | 5 +-
5 files changed, 71 insertions(+), 27 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index ca0cef1..eac0da7 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
protected virtual void OnNewClient(IClientAPI client)
{
- client.OnTeleportHomeRequest += TeleportHome;
+ client.OnTeleportHomeRequest += TriggerTeleportHome;
client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
if (!DisableInterRegionTeleportCancellation)
@@ -1071,7 +1071,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
#region Teleport Home
- public virtual void TeleportHome(UUID id, IClientAPI client)
+ public virtual void TriggerTeleportHome(UUID id, IClientAPI client)
+ {
+ TeleportHome(id, client);
+ }
+
+ public virtual bool TeleportHome(UUID id, IClientAPI client)
{
m_log.DebugFormat(
"[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.Name, client.AgentId);
@@ -1086,7 +1091,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
{
// can't find the Home region: Tell viewer and abort
client.SendTeleportFailed("Your home region could not be found.");
- return;
+ return false;
}
m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Home region of {0} is {1} ({2}-{3})",
@@ -1096,6 +1101,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
((Scene)(client.Scene)).RequestTeleportLocation(
client, regionInfo.RegionHandle, uinfo.HomePosition, uinfo.HomeLookAt,
(uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
+ return true;
}
else
{
@@ -1103,6 +1109,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
"[ENTITY TRANSFER MODULE]: No grid user information found for {0} {1}. Cannot send home.",
client.Name, client.AgentId);
}
+ return false;
}
#endregion
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 33ea063..02ed1a0 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -184,7 +184,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
protected override void OnNewClient(IClientAPI client)
{
- client.OnTeleportHomeRequest += TeleportHome;
+ client.OnTeleportHomeRequest += TriggerTeleportHome;
client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
client.OnConnectionClosed += new Action(OnConnectionClosed);
}
@@ -409,7 +409,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
// return base.UpdateAgent(reg, finalDestination, agentData, sp);
//}
- public override void TeleportHome(UUID id, IClientAPI client)
+ public virtual void TriggerTeleportHome(UUID id, IClientAPI client)
+ {
+ TeleportHome(id, client);
+ }
+
+ public override bool TeleportHome(UUID id, IClientAPI client)
{
m_log.DebugFormat(
"[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.Name, client.AgentId);
@@ -420,8 +425,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
{
// local grid user
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: User is local");
- base.TeleportHome(id, client);
- return;
+ return base.TeleportHome(id, client);
}
// Foreign user wants to go home
@@ -431,7 +435,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
{
client.SendTeleportFailed("Your information has been lost");
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Unable to locate agent's gateway information");
- return;
+ return false;
}
IUserAgentService userAgentService = new UserAgentServiceConnector(aCircuit.ServiceURLs["HomeURI"].ToString());
@@ -441,7 +445,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
{
client.SendTeleportFailed("Your home region could not be found");
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent's home region not found");
- return;
+ return false;
}
ScenePresence sp = ((Scene)(client.Scene)).GetScenePresence(client.AgentId);
@@ -449,7 +453,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
{
client.SendTeleportFailed("Internal error");
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent not found in the scene where it is supposed to be");
- return;
+ return false;
}
GridRegion homeGatekeeper = MakeRegion(aCircuit);
@@ -460,6 +464,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
DoTeleport(
sp, homeGatekeeper, finalDestination,
position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
+ return true;
}
///
@@ -586,4 +591,4 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
return region;
}
}
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 60f6739..91f6501 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -32,6 +32,7 @@ using System.IO;
using System.Linq;
using System.Reflection;
using System.Security;
+using System.Timers;
using log4net;
using Mono.Addins;
using Nini.Config;
@@ -48,6 +49,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ private Timer m_regionChangeTimer = new Timer();
public Scene Scene { get; private set; }
public IUserManagement UserManager { get; private set; }
@@ -65,6 +67,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
public event ChangeDelegate OnEstateInfoChange;
public event MessageDelegate OnEstateMessage;
+ private int m_delayCount = 0;
+
#region Region Module interface
public string Name { get { return "EstateManagementModule"; } }
@@ -114,6 +118,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
#region Packet Data Responders
+ private void clientSendDetailedEstateData(IClientAPI remote_client, UUID invoice)
+ {
+ sendDetailedEstateData(remote_client, invoice);
+ sendEstateLists(remote_client, invoice);
+ }
+
private void sendDetailedEstateData(IClientAPI remote_client, UUID invoice)
{
uint sun = 0;
@@ -136,7 +146,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
(uint) Scene.RegionInfo.RegionSettings.CovenantChangedDateTime,
Scene.RegionInfo.EstateSettings.AbuseEmail,
estateOwner);
+ }
+ private void sendEstateLists(IClientAPI remote_client, UUID invoice)
+ {
remote_client.SendEstateList(invoice,
(int)Constants.EstateAccessCodex.EstateManagers,
Scene.RegionInfo.EstateSettings.EstateManagers,
@@ -330,7 +343,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
timeInSeconds -= 15;
}
- restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true);
+ restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), false);
m_log.InfoFormat(
"User {0} requested restart of region {1} in {2} seconds",
@@ -546,7 +559,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
{
if (!s.IsChildAgent)
{
- Scene.TeleportClientHome(user, s.ControllingClient);
+ if (!Scene.TeleportClientHome(user, s.ControllingClient))
+ {
+ s.ControllingClient.Kick("Your access to the region was revoked and TP home failed - you have been logged out.");
+ s.ControllingClient.Close();
+ }
}
}
@@ -555,7 +572,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
{
remote_client.SendAlertMessage("User is already on the region ban list");
}
- //m_scene.RegionInfo.regionBanlist.Add(Manager(user);
+ //Scene.RegionInfo.regionBanlist.Add(Manager(user);
remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID);
}
else
@@ -611,7 +628,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
remote_client.SendAlertMessage("User is not on the region ban list");
}
- //m_scene.RegionInfo.regionBanlist.Add(Manager(user);
+ //Scene.RegionInfo.regionBanlist.Add(Manager(user);
remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID);
}
else
@@ -777,7 +794,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
ScenePresence s = Scene.GetScenePresence(prey);
if (s != null)
{
- Scene.TeleportClientHome(prey, s.ControllingClient);
+ if (!Scene.TeleportClientHome(prey, s.ControllingClient))
+ {
+ s.ControllingClient.Kick("You were teleported home by the region owner, but the TP failed - you have been logged out.");
+ s.ControllingClient.Close();
+ }
}
}
}
@@ -795,7 +816,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
// Also make sure they are actually in the region
ScenePresence p;
if(Scene.TryGetScenePresence(client.AgentId, out p))
- Scene.TeleportClientHome(p.UUID, p.ControllingClient);
+ {
+ if (!Scene.TeleportClientHome(p.UUID, p.ControllingClient))
+ {
+ p.ControllingClient.Kick("You were teleported home by the region owner, but the TP failed - you have been logged out.");
+ p.ControllingClient.Close();
+ }
+ }
}
});
}
@@ -1170,7 +1197,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
private void EventManager_OnNewClient(IClientAPI client)
{
- client.OnDetailedEstateDataRequest += sendDetailedEstateData;
+ client.OnDetailedEstateDataRequest += clientSendDetailedEstateData;
client.OnSetEstateFlagsRequest += estateSetRegionInfoHandler;
// client.OnSetEstateTerrainBaseTexture += setEstateTerrainBaseTexture;
client.OnSetEstateTerrainDetailTexture += setEstateTerrainBaseTexture;
@@ -1218,8 +1245,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
flags |= RegionFlags.NoFly;
if (Scene.RegionInfo.RegionSettings.RestrictPushing)
flags |= RegionFlags.RestrictPushObject;
- if (Scene.RegionInfo.RegionSettings.AllowLandJoinDivide)
- flags |= RegionFlags.AllowParcelChanges;
if (Scene.RegionInfo.RegionSettings.BlockShowInSearch)
flags |= RegionFlags.BlockParcelSearch;
@@ -1229,11 +1254,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
flags |= RegionFlags.Sandbox;
if (Scene.RegionInfo.EstateSettings.AllowVoice)
flags |= RegionFlags.AllowVoice;
+ if (Scene.RegionInfo.EstateSettings.BlockDwell)
+ flags |= RegionFlags.BlockDwell;
+ if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
+ flags |= RegionFlags.ResetHomeOnTeleport;
- // Fudge these to always on, so the menu options activate
- //
- flags |= RegionFlags.AllowLandmark;
- flags |= RegionFlags.AllowSetHome;
// TODO: SkipUpdateInterestList
@@ -1294,6 +1319,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
public void TriggerRegionInfoChange()
{
+ m_regionChangeTimer.Stop();
+ m_regionChangeTimer.Start();
+ }
+
+ protected void RaiseRegionInfoChange(object sender, ElapsedEventArgs e)
+ {
ChangeDelegate change = OnRegionInfoChange;
if (change != null)
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 69be83e..1c43a25 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.Framework.Interfaces
///
///
///
- void TeleportHome(UUID id, IClientAPI client);
+ bool TeleportHome(UUID id, IClientAPI client);
///
/// Show whether the given agent is being teleported.
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 8fe2d72..2aba2dd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3230,17 +3230,18 @@ namespace OpenSim.Region.Framework.Scenes
///
/// The avatar's Unique ID
/// The IClientAPI for the client
- public virtual void TeleportClientHome(UUID agentId, IClientAPI client)
+ public virtual bool TeleportClientHome(UUID agentId, IClientAPI client)
{
if (EntityTransferModule != null)
{
- EntityTransferModule.TeleportHome(agentId, client);
+ return EntityTransferModule.TeleportHome(agentId, client);
}
else
{
m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active");
client.SendTeleportFailed("Unable to perform teleports on this simulator.");
}
+ return false;
}
///
--
cgit v1.1
From 5d5edde4290030345bc25841a25d23552e533972 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 7 May 2013 00:37:45 +0100
Subject: Step 2: commit the IEstateModuleInterface changes needed
---
OpenSim/Region/Framework/Interfaces/IEstateModule.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index 1983984..d49b24e 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -40,11 +40,12 @@ namespace OpenSim.Region.Framework.Interfaces
uint GetRegionFlags();
bool IsManager(UUID avatarID);
-
+
///
/// Tell all clients about the current state of the region (terrain textures, water height, etc.).
///
void sendRegionHandshakeToAll();
+ void TriggerEstateInfoChange();
///
/// Fires the OnRegionInfoChange event.
--
cgit v1.1
From 1c6b8293d7b9e312c5b1fb544a1de7fd3b145670 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 7 May 2013 00:52:40 +0100
Subject: Step 3: Commit the Avination XEstate estate comms handler This adds
estate-wide Teleport Home and Teleport All User Home as well
---
.../CoreModules/World/Estate/XEstateConnector.cs | 215 +++++++++++++++
.../CoreModules/World/Estate/XEstateModule.cs | 254 ++++++++++++++++++
.../World/Estate/XEstateRequestHandler.cs | 298 +++++++++++++++++++++
3 files changed, 767 insertions(+)
create mode 100644 OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
create mode 100644 OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
create mode 100644 OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
new file mode 100644
index 0000000..948c893
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Server.Base;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+
+using OpenMetaverse;
+using log4net;
+
+namespace OpenSim.Region.CoreModules.World.Estate
+{
+ public class EstateConnector
+ {
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ protected XEstateModule m_EstateModule;
+
+ public EstateConnector(XEstateModule module)
+ {
+ m_EstateModule = module;
+ }
+
+ public void SendTeleportHomeOneUser(uint EstateID, UUID PreyID)
+ {
+ Dictionary sendData = new Dictionary();
+ sendData["METHOD"] = "teleport_home_one_user";
+
+ sendData["EstateID"] = EstateID.ToString();
+ sendData["PreyID"] = PreyID.ToString();
+
+ SendToEstate(EstateID, sendData);
+ }
+
+ public void SendTeleportHomeAllUsers(uint EstateID)
+ {
+ Dictionary sendData = new Dictionary();
+ sendData["METHOD"] = "teleport_home_all_users";
+
+ sendData["EstateID"] = EstateID.ToString();
+
+ SendToEstate(EstateID, sendData);
+ }
+
+ public bool SendUpdateCovenant(uint EstateID, UUID CovenantID)
+ {
+ Dictionary sendData = new Dictionary();
+ sendData["METHOD"] = "update_covenant";
+
+ sendData["CovenantID"] = CovenantID.ToString();
+ sendData["EstateID"] = EstateID.ToString();
+
+ // Handle local regions locally
+ //
+ foreach (Scene s in m_EstateModule.Scenes)
+ {
+ if (s.RegionInfo.EstateSettings.EstateID == EstateID)
+ s.RegionInfo.RegionSettings.Covenant = CovenantID;
+// s.ReloadEstateData();
+ }
+
+ SendToEstate(EstateID, sendData);
+
+ return true;
+ }
+
+ public bool SendUpdateEstate(uint EstateID)
+ {
+ Dictionary sendData = new Dictionary();
+ sendData["METHOD"] = "update_estate";
+
+ sendData["EstateID"] = EstateID.ToString();
+
+ // Handle local regions locally
+ //
+ foreach (Scene s in m_EstateModule.Scenes)
+ {
+ if (s.RegionInfo.EstateSettings.EstateID == EstateID)
+ s.ReloadEstateData();
+ }
+
+ SendToEstate(EstateID, sendData);
+
+ return true;
+ }
+
+ public void SendEstateMessage(uint EstateID, UUID FromID, string FromName, string Message)
+ {
+ Dictionary sendData = new Dictionary();
+ sendData["METHOD"] = "estate_message";
+
+ sendData["EstateID"] = EstateID.ToString();
+ sendData["FromID"] = FromID.ToString();
+ sendData["FromName"] = FromName;
+ sendData["Message"] = Message;
+
+ SendToEstate(EstateID, sendData);
+ }
+
+ private void SendToEstate(uint EstateID, Dictionary sendData)
+ {
+ List regions = m_EstateModule.Scenes[0].GetEstateRegions((int)EstateID);
+
+ UUID ScopeID = UUID.Zero;
+
+ // Handle local regions locally
+ //
+ foreach (Scene s in m_EstateModule.Scenes)
+ {
+ if (regions.Contains(s.RegionInfo.RegionID))
+ {
+ // All regions in one estate are in the same scope.
+ // Use that scope.
+ //
+ ScopeID = s.RegionInfo.ScopeID;
+ regions.Remove(s.RegionInfo.RegionID);
+ }
+ }
+
+ // Our own region should always be in the above list.
+ // In a standalone this would not be true. But then,
+ // Scope ID is not relevat there. Use first scope.
+ //
+ if (ScopeID == UUID.Zero)
+ ScopeID = m_EstateModule.Scenes[0].RegionInfo.ScopeID;
+
+ // Don't send to the same instance twice
+ //
+ List done = new List();
+
+ // Send to remote regions
+ //
+ foreach (UUID regionID in regions)
+ {
+ GridRegion region = m_EstateModule.Scenes[0].GridService.GetRegionByUUID(ScopeID, regionID);
+ if (region != null)
+ {
+ string url = "http://" + region.ExternalHostName + ":" + region.HttpPort;
+ if (done.Contains(url))
+ continue;
+
+ Call(region, sendData);
+ done.Add(url);
+ }
+ }
+ }
+
+ private bool Call(GridRegion region, Dictionary sendData)
+ {
+ string reqString = ServerUtils.BuildQueryString(sendData);
+ // m_log.DebugFormat("[XESTATE CONNECTOR]: queryString = {0}", reqString);
+ try
+ {
+ string url = "http://" + region.ExternalHostName + ":" + region.HttpPort;
+ string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+ url + "/estate",
+ reqString);
+ if (reply != string.Empty)
+ {
+ Dictionary replyData = ServerUtils.ParseXmlResponse(reply);
+
+ if (replyData.ContainsKey("RESULT"))
+ {
+ if (replyData["RESULT"].ToString().ToLower() == "true")
+ return true;
+ else
+ return false;
+ }
+ else
+ m_log.DebugFormat("[XESTATE CONNECTOR]: reply data does not contain result field");
+
+ }
+ else
+ m_log.DebugFormat("[XESTATE CONNECTOR]: received empty reply");
+ }
+ catch (Exception e)
+ {
+ m_log.DebugFormat("[XESTATE CONNECTOR]: Exception when contacting remote sim: {0}", e.Message);
+ }
+
+ return false;
+ }
+ }
+}
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
new file mode 100644
index 0000000..1f099c6
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using Nini.Config;
+using Nwc.XmlRpc;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenSim.Server.Base;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using Mono.Addins;
+
+namespace OpenSim.Region.CoreModules.World.Estate
+{
+ [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XEstate")]
+ public class XEstateModule : ISharedRegionModule
+ {
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ protected List m_Scenes = new List();
+ protected bool m_InInfoUpdate = false;
+
+ public bool InInfoUpdate
+ {
+ get { return m_InInfoUpdate; }
+ set { m_InInfoUpdate = value; }
+ }
+
+ public List Scenes
+ {
+ get { return m_Scenes; }
+ }
+
+ protected EstateConnector m_EstateConnector;
+
+ public void Initialise(IConfigSource config)
+ {
+ int port = 0;
+
+ IConfig estateConfig = config.Configs["Estate"];
+ if (estateConfig != null)
+ {
+ port = estateConfig.GetInt("Port", 0);
+ }
+
+ m_EstateConnector = new EstateConnector(this);
+
+ // Instantiate the request handler
+ IHttpServer server = MainServer.GetHttpServer((uint)port);
+ server.AddStreamHandler(new EstateRequestHandler(this));
+ }
+
+ public void PostInitialise()
+ {
+ }
+
+ public void Close()
+ {
+ }
+
+ public void AddRegion(Scene scene)
+ {
+ m_Scenes.Add(scene);
+
+ scene.EventManager.OnNewClient += OnNewClient;
+ }
+
+ public void RegionLoaded(Scene scene)
+ {
+ IEstateModule em = scene.RequestModuleInterface();
+
+ em.OnRegionInfoChange += OnRegionInfoChange;
+ em.OnEstateInfoChange += OnEstateInfoChange;
+ em.OnEstateMessage += OnEstateMessage;
+ }
+
+ public void RemoveRegion(Scene scene)
+ {
+ scene.EventManager.OnNewClient -= OnNewClient;
+
+ m_Scenes.Remove(scene);
+ }
+
+ public string Name
+ {
+ get { return "EstateModule"; }
+ }
+
+ public Type ReplaceableInterface
+ {
+ get { return null; }
+ }
+
+ private Scene FindScene(UUID RegionID)
+ {
+ foreach (Scene s in Scenes)
+ {
+ if (s.RegionInfo.RegionID == RegionID)
+ return s;
+ }
+
+ return null;
+ }
+
+ private void OnRegionInfoChange(UUID RegionID)
+ {
+ Scene s = FindScene(RegionID);
+ if (s == null)
+ return;
+
+ if (!m_InInfoUpdate)
+ m_EstateConnector.SendUpdateCovenant(s.RegionInfo.EstateSettings.EstateID, s.RegionInfo.RegionSettings.Covenant);
+ }
+
+ private void OnEstateInfoChange(UUID RegionID)
+ {
+ Scene s = FindScene(RegionID);
+ if (s == null)
+ return;
+
+ if (!m_InInfoUpdate)
+ m_EstateConnector.SendUpdateEstate(s.RegionInfo.EstateSettings.EstateID);
+ }
+
+ private void OnEstateMessage(UUID RegionID, UUID FromID, string FromName, string Message)
+ {
+ Scene senderScenes = FindScene(RegionID);
+ if (senderScenes == null)
+ return;
+
+ uint estateID = senderScenes.RegionInfo.EstateSettings.EstateID;
+
+ foreach (Scene s in Scenes)
+ {
+ if (s.RegionInfo.EstateSettings.EstateID == estateID)
+ {
+ IDialogModule dm = s.RequestModuleInterface();
+
+ if (dm != null)
+ {
+ dm.SendNotificationToUsersInRegion(FromID, FromName,
+ Message);
+ }
+ }
+ }
+ if (!m_InInfoUpdate)
+ m_EstateConnector.SendEstateMessage(estateID, FromID, FromName, Message);
+ }
+
+ private void OnNewClient(IClientAPI client)
+ {
+ client.OnEstateTeleportOneUserHomeRequest += OnEstateTeleportOneUserHomeRequest;
+ client.OnEstateTeleportAllUsersHomeRequest += OnEstateTeleportAllUsersHomeRequest;
+
+ }
+
+ private void OnEstateTeleportOneUserHomeRequest(IClientAPI client, UUID invoice, UUID senderID, UUID prey)
+ {
+ if (prey == UUID.Zero)
+ return;
+
+ if (!(client.Scene is Scene))
+ return;
+
+ Scene scene = (Scene)client.Scene;
+
+ uint estateID = scene.RegionInfo.EstateSettings.EstateID;
+
+ if (!scene.Permissions.CanIssueEstateCommand(client.AgentId, false))
+ return;
+
+ foreach (Scene s in Scenes)
+ {
+ if (s == scene)
+ continue; // Already handles by estate module
+ if (s.RegionInfo.EstateSettings.EstateID != estateID)
+ continue;
+
+ ScenePresence p = scene.GetScenePresence(prey);
+ if (p != null && !p.IsChildAgent)
+ {
+ p.ControllingClient.SendTeleportStart(16);
+ scene.TeleportClientHome(prey, p.ControllingClient);
+ }
+ }
+
+ m_EstateConnector.SendTeleportHomeOneUser(estateID, prey);
+ }
+
+ private void OnEstateTeleportAllUsersHomeRequest(IClientAPI client, UUID invoice, UUID senderID)
+ {
+ if (!(client.Scene is Scene))
+ return;
+
+ Scene scene = (Scene)client.Scene;
+
+ uint estateID = scene.RegionInfo.EstateSettings.EstateID;
+
+ if (!scene.Permissions.CanIssueEstateCommand(client.AgentId, false))
+ return;
+
+ foreach (Scene s in Scenes)
+ {
+ if (s == scene)
+ continue; // Already handles by estate module
+ if (s.RegionInfo.EstateSettings.EstateID != estateID)
+ continue;
+
+ scene.ForEachScenePresence(delegate(ScenePresence p) {
+ if (p != null && !p.IsChildAgent)
+ {
+ p.ControllingClient.SendTeleportStart(16);
+ scene.TeleportClientHome(p.ControllingClient.AgentId, p.ControllingClient);
+ }
+ });
+ }
+
+ m_EstateConnector.SendTeleportHomeAllUsers(estateID);
+ }
+ }
+}
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs
new file mode 100644
index 0000000..eb74cda
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs
@@ -0,0 +1,298 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Xml;
+
+using OpenSim.Framework;
+using OpenSim.Server.Base;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+
+using OpenMetaverse;
+using log4net;
+
+namespace OpenSim.Region.CoreModules.World.Estate
+{
+ public class EstateRequestHandler : BaseStreamHandler
+ {
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ protected XEstateModule m_EstateModule;
+ protected Object m_RequestLock = new Object();
+
+ public EstateRequestHandler(XEstateModule fmodule)
+ : base("POST", "/estate")
+ {
+ m_EstateModule = fmodule;
+ }
+
+ public override byte[] Handle(string path, Stream requestData,
+ IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+ {
+ StreamReader sr = new StreamReader(requestData);
+ string body = sr.ReadToEnd();
+ sr.Close();
+ body = body.Trim();
+
+ m_log.DebugFormat("[XESTATE HANDLER]: query String: {0}", body);
+
+ try
+ {
+ lock (m_RequestLock)
+ {
+ Dictionary request =
+ ServerUtils.ParseQueryString(body);
+
+ if (!request.ContainsKey("METHOD"))
+ return FailureResult();
+
+ string method = request["METHOD"].ToString();
+ request.Remove("METHOD");
+
+ try
+ {
+ m_EstateModule.InInfoUpdate = false;
+
+ switch (method)
+ {
+ case "update_covenant":
+ return UpdateCovenant(request);
+ case "update_estate":
+ return UpdateEstate(request);
+ case "estate_message":
+ return EstateMessage(request);
+ case "teleport_home_one_user":
+ return TeleportHomeOneUser(request);
+ case "teleport_home_all_users":
+ return TeleportHomeAllUsers(request);
+ }
+ }
+ finally
+ {
+ m_EstateModule.InInfoUpdate = false;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ m_log.Debug("[XESTATE]: Exception {0}" + e.ToString());
+ }
+
+ return FailureResult();
+ }
+
+ byte[] TeleportHomeAllUsers(Dictionary request)
+ {
+ UUID PreyID = UUID.Zero;
+ int EstateID = 0;
+
+ if (!request.ContainsKey("EstateID"))
+ return FailureResult();
+
+ if (!Int32.TryParse(request["EstateID"].ToString(), out EstateID))
+ return FailureResult();
+
+ foreach (Scene s in m_EstateModule.Scenes)
+ {
+ if (s.RegionInfo.EstateSettings.EstateID == EstateID)
+ {
+ s.ForEachScenePresence(delegate(ScenePresence p) {
+ if (p != null && !p.IsChildAgent)
+ {
+ p.ControllingClient.SendTeleportStart(16);
+ s.TeleportClientHome(p.ControllingClient.AgentId, p.ControllingClient);
+ }
+ });
+ }
+ }
+
+ return SuccessResult();
+ }
+
+ byte[] TeleportHomeOneUser(Dictionary request)
+ {
+ UUID PreyID = UUID.Zero;
+ int EstateID = 0;
+
+ if (!request.ContainsKey("PreyID") ||
+ !request.ContainsKey("EstateID"))
+ {
+ return FailureResult();
+ }
+
+ if (!UUID.TryParse(request["PreyID"].ToString(), out PreyID))
+ return FailureResult();
+
+ if (!Int32.TryParse(request["EstateID"].ToString(), out EstateID))
+ return FailureResult();
+
+ foreach (Scene s in m_EstateModule.Scenes)
+ {
+ if (s.RegionInfo.EstateSettings.EstateID == EstateID)
+ {
+ ScenePresence p = s.GetScenePresence(PreyID);
+ if (p != null && !p.IsChildAgent)
+ {
+ p.ControllingClient.SendTeleportStart(16);
+ s.TeleportClientHome(PreyID, p.ControllingClient);
+ }
+ }
+ }
+
+ return SuccessResult();
+ }
+
+ byte[] EstateMessage(Dictionary request)
+ {
+ UUID FromID = UUID.Zero;
+ string FromName = String.Empty;
+ string Message = String.Empty;
+ int EstateID = 0;
+
+ if (!request.ContainsKey("FromID") ||
+ !request.ContainsKey("FromName") ||
+ !request.ContainsKey("Message") ||
+ !request.ContainsKey("EstateID"))
+ {
+ return FailureResult();
+ }
+
+ if (!UUID.TryParse(request["FromID"].ToString(), out FromID))
+ return FailureResult();
+
+ if (!Int32.TryParse(request["EstateID"].ToString(), out EstateID))
+ return FailureResult();
+
+ FromName = request["FromName"].ToString();
+ Message = request["Message"].ToString();
+
+ foreach (Scene s in m_EstateModule.Scenes)
+ {
+ if (s.RegionInfo.EstateSettings.EstateID == EstateID)
+ {
+ IDialogModule dm = s.RequestModuleInterface();
+
+ if (dm != null)
+ {
+ dm.SendNotificationToUsersInRegion(FromID, FromName,
+ Message);
+ }
+ }
+ }
+
+ return SuccessResult();
+ }
+
+ byte[] UpdateCovenant(Dictionary request)
+ {
+ UUID CovenantID = UUID.Zero;
+ int EstateID = 0;
+
+ if (!request.ContainsKey("CovenantID") || !request.ContainsKey("EstateID"))
+ return FailureResult();
+
+ if (!UUID.TryParse(request["CovenantID"].ToString(), out CovenantID))
+ return FailureResult();
+
+ if (!Int32.TryParse(request["EstateID"].ToString(), out EstateID))
+ return FailureResult();
+
+ foreach (Scene s in m_EstateModule.Scenes)
+ {
+ if (s.RegionInfo.EstateSettings.EstateID == (uint)EstateID)
+ s.RegionInfo.RegionSettings.Covenant = CovenantID;
+ }
+
+ return SuccessResult();
+ }
+
+ byte[] UpdateEstate(Dictionary request)
+ {
+ int EstateID = 0;
+
+ if (!request.ContainsKey("EstateID"))
+ return FailureResult();
+ if (!Int32.TryParse(request["EstateID"].ToString(), out EstateID))
+ return FailureResult();
+
+ foreach (Scene s in m_EstateModule.Scenes)
+ {
+ if (s.RegionInfo.EstateSettings.EstateID == (uint)EstateID)
+ s.ReloadEstateData();
+ }
+ return SuccessResult();
+ }
+
+ private byte[] FailureResult()
+ {
+ return BoolResult(false);
+ }
+
+ private byte[] SuccessResult()
+ {
+ return BoolResult(true);
+ }
+
+ private byte[] BoolResult(bool value)
+ {
+ XmlDocument doc = new XmlDocument();
+
+ XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
+ "", "");
+
+ doc.AppendChild(xmlnode);
+
+ XmlElement rootElement = doc.CreateElement("", "ServerResponse",
+ "");
+
+ doc.AppendChild(rootElement);
+
+ XmlElement result = doc.CreateElement("", "RESULT", "");
+ result.AppendChild(doc.CreateTextNode(value.ToString()));
+
+ rootElement.AppendChild(result);
+
+ return DocToBytes(doc);
+ }
+
+ private byte[] DocToBytes(XmlDocument doc)
+ {
+ MemoryStream ms = new MemoryStream();
+ XmlTextWriter xw = new XmlTextWriter(ms, null);
+ xw.Formatting = Formatting.Indented;
+ doc.WriteTo(xw);
+ xw.Flush();
+
+ return ms.ToArray();
+ }
+ }
+}
--
cgit v1.1
From 84118c5735f49bb38ded2ccc72b1bd7d39c09010 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 6 May 2013 18:05:37 -0700
Subject: BulletSim: properly free references to simple convex hull shapes.
Didn't loose memory since shapes are shared but did mess up usage accounting.
---
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 45 +++++++++++++++++++-----
1 file changed, 37 insertions(+), 8 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 3e4ee5a..9d47657 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -117,11 +117,11 @@ public abstract class BSShape
StringBuilder buff = new StringBuilder();
if (physShapeInfo == null)
{
- buff.Append(",noPhys");
+ buff.Append("
---
OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 04ea289..e93dbd7 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1028,6 +1028,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
Vector3 currentVelV = VehicleVelocity * Quaternion.Inverse(VehicleOrientation);
Vector3 linearMotorCorrectionV = m_linearMotor.Step(pTimestep, currentVelV);
+ // Friction reduces vehicle motion
+ Vector3 frictionFactorW = ComputeFrictionFactor(m_linearFrictionTimescale, pTimestep);
+ linearMotorCorrectionV -= (currentVelV * frictionFactorW);
+
// Motor is vehicle coordinates. Rotate it to world coordinates
Vector3 linearMotorVelocityW = linearMotorCorrectionV * VehicleOrientation;
@@ -1041,9 +1045,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
// Add this correction to the velocity to make it faster/slower.
VehicleVelocity += linearMotorVelocityW;
- // Friction reduces vehicle motion
- Vector3 frictionFactorW = ComputeFrictionFactor(m_linearFrictionTimescale, pTimestep) * VehicleOrientation;
- VehicleVelocity -= (VehicleVelocity * frictionFactorW);
+
VDetailLog("{0}, MoveLinear,velocity,origVelW={1},velV={2},correctV={3},correctW={4},newVelW={5},fricFact={6}",
ControllingPrim.LocalID, origVelW, currentVelV, linearMotorCorrectionV,
--
cgit v1.1
From ac6dcd35fb77f118fc6c3d72cb029591306c7e99 Mon Sep 17 00:00:00 2001
From: Vegaslon
Date: Mon, 6 May 2013 21:19:48 -0400
Subject: Bulletsim: and the rotational friction.
Signed-off-by: Robert Adams
---
OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index e93dbd7..c16b7d3 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1339,11 +1339,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
// angularMotorContributionV.Y = 0f;
// }
+ // Reduce any velocity by friction.
+ Vector3 frictionFactorW = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep);
+ angularMotorContributionV -= (currentAngularV * frictionFactorW);
+
VehicleRotationalVelocity += angularMotorContributionV * VehicleOrientation;
- // Reduce any velocity by friction.
- Vector3 frictionFactorW = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep) * VehicleOrientation;
- VehicleRotationalVelocity -= (VehicleRotationalVelocity * frictionFactorW);
+
VDetailLog("{0}, MoveAngular,angularTurning,angContribV={1}", ControllingPrim.LocalID, angularMotorContributionV);
}
--
cgit v1.1
From e92c05ebbdc44084326c3dcfa0a2ca0958e4b5e6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 7 May 2013 18:01:48 -0700
Subject: Added AvatarPickerSearch capability handler.
---
.../AvatarPickerSearchHandler.cs | 116 +++++++++++++++++
OpenSim/Capabilities/LLSDAvatarPicker.cs | 51 ++++++++
OpenSim/Framework/IPeople.cs | 47 +++++++
.../Linden/Caps/AvatarPickerSearchModule.cs | 140 +++++++++++++++++++++
.../UserManagement/HGUserManagementModule.cs | 2 +-
.../UserManagement/UserManagementModule.cs | 72 ++++++-----
6 files changed, 393 insertions(+), 35 deletions(-)
create mode 100644 OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
create mode 100644 OpenSim/Capabilities/LLSDAvatarPicker.cs
create mode 100644 OpenSim/Framework/IPeople.cs
create mode 100644 OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs b/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
new file mode 100644
index 0000000..4dca592
--- /dev/null
+++ b/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+using System.Reflection;
+using System.Web;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+//using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+
+namespace OpenSim.Capabilities.Handlers
+{
+ public class AvatarPickerSearchHandler : BaseStreamHandler
+ {
+ private static readonly ILog m_log =
+ LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ private IPeople m_PeopleService;
+
+ public AvatarPickerSearchHandler(string path, IPeople peopleService, string name, string description)
+ : base("GET", path, name, description)
+ {
+ m_PeopleService = peopleService;
+ }
+
+ public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+ {
+ // Try to parse the texture ID from the request URL
+ NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
+ string names = query.GetOne("names");
+ string psize = query.GetOne("page_size");
+ string pnumber = query.GetOne("page");
+
+ if (m_PeopleService == null)
+ return FailureResponse(names, (int)System.Net.HttpStatusCode.InternalServerError, httpResponse);
+
+ if (string.IsNullOrEmpty(names) || names.Length < 3)
+ return FailureResponse(names, (int)System.Net.HttpStatusCode.BadRequest, httpResponse);
+
+ m_log.DebugFormat("[AVATAR PICKER SEARCH]: search for {0}", names);
+
+ int page_size = (string.IsNullOrEmpty(psize) ? 500 : Int32.Parse(psize));
+ int page_number = (string.IsNullOrEmpty(pnumber) ? 1 : Int32.Parse(pnumber));
+
+ // Full content request
+ httpResponse.StatusCode = (int)System.Net.HttpStatusCode.OK;
+ //httpResponse.ContentLength = ??;
+ httpResponse.ContentType = "application/llsd+xml";
+
+ List users = m_PeopleService.GetUserData(names, page_size, page_number);
+
+ LLSDAvatarPicker osdReply = new LLSDAvatarPicker();
+ osdReply.next_page_url = httpRequest.RawUrl;
+ foreach (UserData u in users)
+ osdReply.agents.Array.Add(ConvertUserData(u));
+
+ string reply = LLSDHelpers.SerialiseLLSDReply(osdReply);
+ return System.Text.Encoding.UTF8.GetBytes(reply);
+ }
+
+ private LLSDPerson ConvertUserData(UserData user)
+ {
+ LLSDPerson p = new LLSDPerson();
+ p.legacy_first_name = user.FirstName;
+ p.legacy_last_name = user.LastName;
+ p.display_name = user.FirstName + " " + user.LastName;
+ if (user.LastName.StartsWith("@"))
+ p.username = user.FirstName.ToLower() + user.LastName.ToLower();
+ else
+ p.username = user.FirstName.ToLower() + "." + user.LastName.ToLower();
+ p.id = user.Id;
+ p.is_display_name_default = false;
+ return p;
+ }
+
+ private byte[] FailureResponse(string names, int statuscode, IOSHttpResponse httpResponse)
+ {
+ m_log.Error("[AVATAR PICKER SEARCH]: Error searching for " + names);
+ httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+ return System.Text.Encoding.UTF8.GetBytes(string.Empty);
+ }
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Capabilities/LLSDAvatarPicker.cs b/OpenSim/Capabilities/LLSDAvatarPicker.cs
new file mode 100644
index 0000000..d0b3f3a
--- /dev/null
+++ b/OpenSim/Capabilities/LLSDAvatarPicker.cs
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenMetaverse;
+
+namespace OpenSim.Framework.Capabilities
+{
+ [OSDMap]
+ public class LLSDAvatarPicker
+ {
+ public string next_page_url;
+ // an array of LLSDPerson
+ public OSDArray agents = new OSDArray();
+ }
+
+ [OSDMap]
+ public class LLSDPerson
+ {
+ public string username;
+ public string display_name;
+ //'display_name_next_update':d"1970-01-01T00:00:00Z"
+ public string legacy_first_name;
+ public string legacy_last_name;
+ public UUID id;
+ public bool is_display_name_default;
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/IPeople.cs b/OpenSim/Framework/IPeople.cs
new file mode 100644
index 0000000..b88e103
--- /dev/null
+++ b/OpenSim/Framework/IPeople.cs
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+
+namespace OpenSim.Framework
+{
+ public class UserData
+ {
+ public UUID Id { get; set; }
+ public string FirstName { get; set; }
+ public string LastName { get; set; }
+ public string HomeURL { get; set; }
+ public Dictionary ServerURLs { get; set; }
+ }
+
+ public interface IPeople
+ {
+ List GetUserData(string query, int page_size, int page_number);
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
new file mode 100644
index 0000000..d7af1f2
--- /dev/null
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Reflection;
+using System.IO;
+using System.Web;
+using log4net;
+using Nini.Config;
+using Mono.Addins;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OpenSim.Capabilities.Handlers;
+
+namespace OpenSim.Region.ClientStack.Linden
+{
+
+ [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AvatarPickerSearchModule")]
+ public class AvatarPickerSearchModule : INonSharedRegionModule
+ {
+ private static readonly ILog m_log =
+ LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ private Scene m_scene;
+ private IPeople m_People;
+ private bool m_Enabled = false;
+
+ private string m_URL;
+
+ #region ISharedRegionModule Members
+
+ public void Initialise(IConfigSource source)
+ {
+ IConfig config = source.Configs["ClientStack.LindenCaps"];
+ if (config == null)
+ return;
+
+ m_URL = config.GetString("Cap_AvatarPickerSearch", string.Empty);
+ m_log.DebugFormat("[XXX]: Cap_AvatarPickerSearch = {0}", m_URL);
+ // Cap doesn't exist
+ if (m_URL != string.Empty)
+ m_Enabled = true;
+ }
+
+ public void AddRegion(Scene s)
+ {
+ if (!m_Enabled)
+ return;
+
+ m_scene = s;
+ }
+
+ public void RemoveRegion(Scene s)
+ {
+ if (!m_Enabled)
+ return;
+
+ m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
+ m_scene = null;
+ }
+
+ public void RegionLoaded(Scene s)
+ {
+ if (!m_Enabled)
+ return;
+
+ m_People = m_scene.RequestModuleInterface();
+ m_scene.EventManager.OnRegisterCaps += RegisterCaps;
+ }
+
+ public void PostInitialise()
+ {
+ }
+
+ public void Close() { }
+
+ public string Name { get { return "AvatarPickerSearchModule"; } }
+
+ public Type ReplaceableInterface
+ {
+ get { return null; }
+ }
+
+ #endregion
+
+ public void RegisterCaps(UUID agentID, Caps caps)
+ {
+ UUID capID = UUID.Random();
+
+ if (m_URL == "localhost")
+ {
+ m_log.DebugFormat("[AVATAR PICKER SEARCH]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
+ caps.RegisterHandler(
+ "AvatarPickerSearch",
+ new AvatarPickerSearchHandler("/CAPS/" + capID + "/", m_People, "AvatarPickerSearch", "Search for avatars by name"));
+ }
+ else
+ {
+ // m_log.DebugFormat("[AVATAR PICKER SEARCH]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName);
+ caps.RegisterHandler("AvatarPickerSearch", m_URL);
+ }
+ }
+
+ }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
index 8ce20e9..fac93e6 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
#endregion ISharedRegionModule
- protected override void AddAdditionalUsers(UUID avatarID, string query, List users)
+ protected override void AddAdditionalUsers(string query, List users)
{
if (query.Contains("@")) // First.Last@foo.com, maybe?
{
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 7b823ba..6847e57 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -46,17 +46,8 @@ using Mono.Addins;
namespace OpenSim.Region.CoreModules.Framework.UserManagement
{
- public class UserData
- {
- public UUID Id { get; set; }
- public string FirstName { get; set; }
- public string LastName { get; set; }
- public string HomeURL { get; set; }
- public Dictionary ServerURLs { get; set; }
- }
-
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UserManagementModule")]
- public class UserManagementModule : ISharedRegionModule, IUserManagement
+ public class UserManagementModule : ISharedRegionModule, IUserManagement, IPeople
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -101,6 +92,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
m_Scenes.Add(scene);
scene.RegisterModuleInterface(this);
+ scene.RegisterModuleInterface(this);
scene.EventManager.OnNewClient += new EventManager.OnNewClientDelegate(EventManager_OnNewClient);
scene.EventManager.OnPrimsLoaded += new EventManager.PrimsLoaded(EventManager_OnPrimsLoaded);
}
@@ -181,29 +173,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
m_log.DebugFormat("[USER MANAGEMENT MODULE]: HandleAvatarPickerRequest for {0}", query);
- // searhc the user accounts service
- List accs = m_Scenes[0].UserAccountService.GetUserAccounts(m_Scenes[0].RegionInfo.ScopeID, query);
-
- List users = new List();
- if (accs != null)
- {
- foreach (UserAccount acc in accs)
- {
- UserData ud = new UserData();
- ud.FirstName = acc.FirstName;
- ud.LastName = acc.LastName;
- ud.Id = acc.PrincipalID;
- users.Add(ud);
- }
- }
-
- // search the local cache
- foreach (UserData data in m_UserCache.Values)
- if (users.Find(delegate(UserData d) { return d.Id == data.Id; }) == null &&
- (data.FirstName.ToLower().StartsWith(query.ToLower()) || data.LastName.ToLower().StartsWith(query.ToLower())))
- users.Add(data);
-
- AddAdditionalUsers(avatarID, query, users);
+ List users = GetUserData(query, 500, 1);
AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket)PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply);
// TODO: don't create new blocks if recycling an old packet
@@ -249,12 +219,46 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
client.SendAvatarPickerReply(agent_data, data_args);
}
- protected virtual void AddAdditionalUsers(UUID avatarID, string query, List users)
+ protected virtual void AddAdditionalUsers(string query, List users)
{
}
#endregion Event Handlers
+ #region IPeople
+
+ public List GetUserData(string query, int page_size, int page_number)
+ {
+ // search the user accounts service
+ List accs = m_Scenes[0].UserAccountService.GetUserAccounts(m_Scenes[0].RegionInfo.ScopeID, query);
+
+ List users = new List();
+ if (accs != null)
+ {
+ foreach (UserAccount acc in accs)
+ {
+ UserData ud = new UserData();
+ ud.FirstName = acc.FirstName;
+ ud.LastName = acc.LastName;
+ ud.Id = acc.PrincipalID;
+ users.Add(ud);
+ }
+ }
+
+ // search the local cache
+ foreach (UserData data in m_UserCache.Values)
+ if (users.Find(delegate(UserData d) { return d.Id == data.Id; }) == null &&
+ (data.FirstName.ToLower().StartsWith(query.ToLower()) || data.LastName.ToLower().StartsWith(query.ToLower())))
+ users.Add(data);
+
+ AddAdditionalUsers(query, users);
+
+ return users;
+
+ }
+
+ #endregion IPeople
+
private void CacheCreators(SceneObjectGroup sog)
{
//m_log.DebugFormat("[USER MANAGEMENT MODULE]: processing {0} {1}; {2}", sog.RootPart.Name, sog.RootPart.CreatorData, sog.RootPart.CreatorIdentification);
--
cgit v1.1
From 33aaa40bee37ca4d8a3afa10fbbea7c1be3a1d58 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Wed, 8 May 2013 13:13:51 -0700
Subject: Adds an event and a method so that handling of the CachedTexture
packet can be pulled out of LLClientView and moved to AvatarFactory. The
first pass at reusing textures (turned off by default) is included. When
reusing textures, if the baked textures from a previous login are still in
the asset service (which generally means that they are in the simulator's
cache) then the avatar will not need to rebake. This is both a performance
improvement (specifically that an avatars baked textures do not need to be
sent to other users who have the old textures cached) and a resource
improvement (don't have to deal with duplicate bakes in the asset service
cache).
---
OpenSim/Framework/CachedTextureEventArg.cs | 46 +++++++++++++++++
OpenSim/Framework/IClientAPI.cs | 5 ++
.../Region/ClientStack/Linden/UDP/LLClientView.cs | 58 +++++++++++++++------
.../Avatar/AvatarFactory/AvatarFactoryModule.cs | 59 ++++++++++++++++++++++
.../Server/IRCClientView.cs | 6 +++
.../Region/OptionalModules/World/NPC/NPCAvatar.cs | 6 +++
OpenSim/Tests/Common/Mock/TestClient.cs | 6 +++
7 files changed, 171 insertions(+), 15 deletions(-)
create mode 100644 OpenSim/Framework/CachedTextureEventArg.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Framework/CachedTextureEventArg.cs b/OpenSim/Framework/CachedTextureEventArg.cs
new file mode 100644
index 0000000..239fc56
--- /dev/null
+++ b/OpenSim/Framework/CachedTextureEventArg.cs
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Text;
+using OpenMetaverse;
+
+namespace OpenSim.Framework
+{
+ public class CachedTextureRequestArg
+ {
+ public int BakedTextureIndex;
+ public UUID WearableHashID;
+ }
+
+ public class CachedTextureResponseArg
+ {
+ public int BakedTextureIndex;
+ public UUID BakedTextureID;
+ public String HostName;
+ }
+}
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 4d5ec3a..cfb36fe 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -64,6 +64,8 @@ namespace OpenSim.Framework
public delegate void NetworkStats(int inPackets, int outPackets, int unAckedBytes);
+ public delegate void CachedTextureRequest(IClientAPI remoteClient, int serial, List cachedTextureRequest);
+
public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams);
public delegate void StartAnim(IClientAPI remoteClient, UUID animID);
@@ -780,6 +782,7 @@ namespace OpenSim.Framework
event EstateChangeInfo OnEstateChangeInfo;
event EstateManageTelehub OnEstateManageTelehub;
// [Obsolete("LLClientView Specific.")]
+ event CachedTextureRequest OnCachedTextureRequest;
event SetAppearance OnSetAppearance;
// [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")]
event AvatarNowWearing OnAvatarNowWearing;
@@ -1087,6 +1090,8 @@ namespace OpenSim.Framework
///
void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry);
+ void SendCachedTextureResponse(ISceneEntity avatar, int serial, List cachedTextures);
+
void SendStartPingCheck(byte seq);
///
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index bede379..47dd842 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -84,6 +84,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public event ModifyTerrain OnModifyTerrain;
public event Action OnRegionHandShakeReply;
public event GenericCall1 OnRequestWearables;
+ public event CachedTextureRequest OnCachedTextureRequest;
public event SetAppearance OnSetAppearance;
public event AvatarNowWearing OnAvatarNowWearing;
public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
@@ -321,7 +322,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private readonly byte[] m_channelVersion = Utils.EmptyBytes;
private readonly IGroupsModule m_GroupsModule;
- private int m_cachedTextureSerial;
private PriorityQueue m_entityUpdates;
private PriorityQueue m_entityProps;
private Prioritizer m_prioritizer;
@@ -11462,8 +11462,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
///
- /// Send a response back to a client when it asks the asset server (via the region server) if it has
- /// its appearance texture cached.
///
///
/// At the moment, we always reply that there is no cached texture.
@@ -11473,33 +11471,63 @@ namespace OpenSim.Region.ClientStack.LindenUDP
///
protected bool HandleAgentTextureCached(IClientAPI simclient, Packet packet)
{
- //m_log.Debug("texture cached: " + packet.ToString());
AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
- AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
if (cachedtex.AgentData.SessionID != SessionId)
return false;
+ List requestArgs = new List();
+
+ for (int i = 0; i < cachedtex.WearableData.Length; i++)
+ {
+ CachedTextureRequestArg arg = new CachedTextureRequestArg();
+ arg.BakedTextureIndex = cachedtex.WearableData[i].TextureIndex;
+ arg.WearableHashID = cachedtex.WearableData[i].ID;
+
+ requestArgs.Add(arg);
+ }
+
+ CachedTextureRequest handlerCachedTextureRequest = OnCachedTextureRequest;
+ if (handlerCachedTextureRequest != null)
+ {
+ handlerCachedTextureRequest(simclient,cachedtex.AgentData.SerialNum,requestArgs);
+ }
+
+ return true;
+ }
+
+ ///
+ /// Send a response back to a client when it asks the asset server (via the region server) if it has
+ /// its appearance texture cached.
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void SendCachedTextureResponse(ISceneEntity avatar, int serial, List cachedTextures)
+ {
+ ScenePresence presence = avatar as ScenePresence;
+ if (presence == null)
+ return;
+
+ AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
+
// TODO: don't create new blocks if recycling an old packet
- cachedresp.AgentData.AgentID = AgentId;
+ cachedresp.AgentData.AgentID = m_agentId;
cachedresp.AgentData.SessionID = m_sessionId;
- cachedresp.AgentData.SerialNum = m_cachedTextureSerial;
- m_cachedTextureSerial++;
- cachedresp.WearableData =
- new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length];
+ cachedresp.AgentData.SerialNum = serial;
+ cachedresp.WearableData = new AgentCachedTextureResponsePacket.WearableDataBlock[cachedTextures.Count];
- for (int i = 0; i < cachedtex.WearableData.Length; i++)
+ for (int i = 0; i < cachedTextures.Count; i++)
{
cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
- cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
- cachedresp.WearableData[i].TextureID = UUID.Zero;
+ cachedresp.WearableData[i].TextureIndex = (byte)cachedTextures[i].BakedTextureIndex;
+ cachedresp.WearableData[i].TextureID = cachedTextures[i].BakedTextureID;
cachedresp.WearableData[i].HostName = new byte[0];
}
cachedresp.Header.Zerocoded = true;
OutPacket(cachedresp, ThrottleOutPacketType.Task);
-
- return true;
}
protected bool HandleMultipleObjUpdate(IClientAPI simClient, Packet packet)
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index c7ac7c4..b640b48 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -55,6 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
private int m_savetime = 5; // seconds to wait before saving changed appearance
private int m_sendtime = 2; // seconds to wait before sending changed appearance
+ private bool m_reusetextures = false;
private int m_checkTime = 500; // milliseconds to wait between checks for appearance updates
private System.Timers.Timer m_updateTimer = new System.Timers.Timer();
@@ -73,6 +74,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
{
m_savetime = Convert.ToInt32(appearanceConfig.GetString("DelayBeforeAppearanceSave",Convert.ToString(m_savetime)));
m_sendtime = Convert.ToInt32(appearanceConfig.GetString("DelayBeforeAppearanceSend",Convert.ToString(m_sendtime)));
+ m_reusetextures = appearanceConfig.GetBoolean("ReuseTextures",m_reusetextures);
+
// m_log.InfoFormat("[AVFACTORY] configured for {0} save and {1} send",m_savetime,m_sendtime);
}
@@ -131,6 +134,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
client.OnRequestWearables += Client_OnRequestWearables;
client.OnSetAppearance += Client_OnSetAppearance;
client.OnAvatarNowWearing += Client_OnAvatarNowWearing;
+ client.OnCachedTextureRequest += Client_OnCachedTextureRequest;
}
#endregion
@@ -671,6 +675,61 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
QueueAppearanceSave(client.AgentId);
}
}
+
+ ///
+ /// Respond to the cached textures request from the client
+ ///
+ ///
+ ///
+ ///
+ private void Client_OnCachedTextureRequest(IClientAPI client, int serial, List cachedTextureRequest)
+ {
+ // m_log.WarnFormat("[AVFACTORY]: Client_OnCachedTextureRequest called for {0} ({1})", client.Name, client.AgentId);
+ ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
+
+ List cachedTextureResponse = new List