From f7d09b898ad6df32b3f07cb64657623980178c2f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 27 Jun 2013 23:14:28 +0100
Subject: Make the concept of namespaces explicit in dynamic attributes
This is in order to reduce the likelihood of naming clashes, make it easier to filter in/out attributes, ensure uniformity, etc.
All dynattrs in the opensim distro itself or likely future ones should be in the "OpenSim" namespace.
This does alter the underlying dynattrs data structure. All data in previous structures may not be available, though old structures should not cause errors.
This is done without notice since this feature has been explicitly labelled as experimental, subject to change and has not been in a release.
However, existing materials data is being preserved by moving it to the "Materials" store in the "OpenSim" namespace.
---
OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/UuidGatherer.cs')
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 0e83781..586b59d 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -212,7 +212,6 @@ namespace OpenSim.Region.Framework.Scenes
// }
// }
-
///
/// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps
///
@@ -221,20 +220,23 @@ namespace OpenSim.Region.Framework.Scenes
public void GatherMaterialsUuids(SceneObjectPart part, IDictionary assetUuids)
{
// scan thru the dynAttrs map of this part for any textures used as materials
- OSDMap OSMaterials = null;
+ OSD osdMaterials = null;
lock (part.DynAttrs)
{
- if (part.DynAttrs.ContainsKey("OS:Materials"))
- OSMaterials = part.DynAttrs["OS:Materials"];
- if (OSMaterials != null && OSMaterials.ContainsKey("Materials"))
+ if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
+ {
+ OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+ materialsStore.TryGetValue("Materials", out osdMaterials);
+ }
+
+ if (osdMaterials != null)
{
- OSD osd = OSMaterials["Materials"];
//m_log.Info("[UUID Gatherer]: found Materials: " + OSDParser.SerializeJsonString(osd));
- if (osd is OSDArray)
+ if (osdMaterials is OSDArray)
{
- OSDArray matsArr = osd as OSDArray;
+ OSDArray matsArr = osdMaterials as OSDArray;
foreach (OSDMap matMap in matsArr)
{
try
--
cgit v1.1
From 149487ea0f74a46a70c98b3a31259b667f4d29b2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 27 Jun 2013 23:42:35 +0100
Subject: refactor: Move code for gathering textures referenced by materials
into MaterialsDemoModule from UuidGatherer
This code is now triggered via EventManager.OnGatherUuids which modules can subscribe to.
---
OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 69 +------------------------
1 file changed, 2 insertions(+), 67 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/UuidGatherer.cs')
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 586b59d..3492813 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -186,8 +186,7 @@ namespace OpenSim.Region.Framework.Scenes
GatherAssetUuids(tii.AssetID, (AssetType)tii.Type, assetUuids);
}
- // get any texture UUIDs used for materials such as normal and specular maps
- GatherMaterialsUuids(part, assetUuids);
+ part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids);
}
catch (Exception e)
{
@@ -211,71 +210,7 @@ namespace OpenSim.Region.Framework.Scenes
// Monitor.Pulse(this);
// }
// }
-
- ///
- /// 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
- OSD osdMaterials = null;
-
- lock (part.DynAttrs)
- {
- if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
- {
- OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
- materialsStore.TryGetValue("Materials", out osdMaterials);
- }
-
- if (osdMaterials != null)
- {
- //m_log.Info("[UUID Gatherer]: found Materials: " + OSDParser.SerializeJsonString(osd));
-
- if (osdMaterials is OSDArray)
- {
- OSDArray matsArr = osdMaterials 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 f6ce87c96d037787963d203346c5cb1a1dd52747 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 28 Jun 2013 18:50:33 +0100
Subject: Reinsert code for gathering uuids reference by materials back
directly into UuidGatherer for now.
This cannot be triggered as an event from Scene.EventManager since some invocations of UuidGatherer (e.g. IAR saving) use scene objects which are not in scenes.
There needs to be some way for modules to register for events which are not connected with a particular scene.
---
OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 71 ++++++++++++++++++++++++-
1 file changed, 70 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework/Scenes/UuidGatherer.cs')
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 3492813..4e5fb8e 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -186,7 +186,13 @@ namespace OpenSim.Region.Framework.Scenes
GatherAssetUuids(tii.AssetID, (AssetType)tii.Type, assetUuids);
}
- part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids);
+ // FIXME: We need to make gathering modular but we cannot yet, since gatherers are not guaranteed
+ // to be called with scene objects that are in a scene (e.g. in the case of hg asset mapping and
+ // inventory transfer. There needs to be a way for a module to register a method without assuming a
+ // Scene.EventManager is present.
+// part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids);
+
+ GatherMaterialsUuids(part, assetUuids);
}
catch (Exception e)
{
@@ -210,6 +216,69 @@ namespace OpenSim.Region.Framework.Scenes
// Monitor.Pulse(this);
// }
// }
+
+ ///
+ /// 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
+ OSD osdMaterials = null;
+
+ lock (part.DynAttrs)
+ {
+ if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
+ {
+ OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+ materialsStore.TryGetValue("Materials", out osdMaterials);
+ }
+
+ if (osdMaterials != null)
+ {
+ //m_log.Info("[UUID Gatherer]: found Materials: " + OSDParser.SerializeJsonString(osd));
+
+ if (osdMaterials is OSDArray)
+ {
+ OSDArray matsArr = osdMaterials 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
--
cgit v1.1
From 371085546d93c610770abe1182e2add1d75cb16e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 28 Jun 2013 23:57:41 +0100
Subject: Add materials store null check into UuidGatherer code.
---
OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'OpenSim/Region/Framework/Scenes/UuidGatherer.cs')
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 4e5fb8e..8f69ce3 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -232,6 +232,10 @@ namespace OpenSim.Region.Framework.Scenes
if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
{
OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+
+ if (materialsStore == null)
+ return;
+
materialsStore.TryGetValue("Materials", out osdMaterials);
}
--
cgit v1.1