Enabled Avatar Possessions

Runtime/Sites/Scripts/HumanoidInterface.cs

@@ -113,7 +113,7 @@ namespace Passer.Humanoid {
         /// Try to add the GameObject to the Possessions of the Humanoid
         /// </summary>
         /// <param name="gameObject">The GameObject of the Possession to add</param>
-        /// This does nothing if the gamObject is not a Possession
+        /// This does nothing if the gamObject is not Possessable
         public void TryAddToPossessions(GameObject gameObject) {
             if (gameObject == null)
                 return;

Runtime/Visitors/Scripts/UI/HumanoidMenu.cs

@@ -0,0 +1,22 @@
+using UnityEngine;
+
+namespace Passer.Humanoid {
+
+    public class HumanoidMenu : MonoBehaviour {
+
+        public Canvas mainMenu;
+
+        private void OnEnable() {
+            Canvas[] childCanvases = GetComponentsInChildren<Canvas>();
+            foreach (Canvas childCanvas in childCanvases) {
+                if (childCanvas == mainMenu)
+                    continue;
+
+                childCanvas.gameObject.SetActive(false);
+            }
+
+            if (mainMenu != null)
+                mainMenu.gameObject.SetActive(true);
+        }
+    }
+}

Runtime/Visitors/Scripts/UI/HumanoidMenu.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f15c1f33a6b326e4192b1c37038640cd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/Visitors/Scripts/UI/PossessionDetailsUI.cs

@@ -23,20 +23,27 @@ namespace Passer {
             this.possession = possession;
         }
 
-        void OnEnable() {
+        public void RetrievePossession(VisitorPossessions.Possession possession) {
+            this.possession = possession;
+            RetrievePossession();
+        }
+
+        public void RetrievePossession() {
             if (possession == null)
                 return;
 
+            humanoid = GetComponentInParent<HumanoidControl>();
+
             if (possession.type == Possessable.Type.Avatar) {
                 // make the humanoid change to the avatar directly?
-                StartCoroutine(VisitorPossessions.RetrievePossessionAsync(possession, ChangeAvatar));
+                SiteNavigator.instance.StartCoroutine(VisitorPossessions.RetrievePossessionAsync(possession, ChangeAvatar));
             }
             else {
 
                 nameUI.text = possession.name;
                 countUI.text = "";
 
-                StartCoroutine(VisitorPossessions.RetrievePossessionAsync(possession, AttachToSocket));
+                SiteNavigator.instance.StartCoroutine(VisitorPossessions.RetrievePossessionAsync(possession, AttachToSocket));
             }
         }
 
@@ -56,8 +63,11 @@ namespace Passer {
 
         private void ChangeAvatar(GameObject avatarObj) {
             humanoid.ChangeAvatar(avatarObj);
-            this.gameObject.SetActive(false);
+            //this.gameObject.SetActive(false);
-            pawnPossessionsUI.gameObject.SetActive(true);
+            //pawnPossessionsUI.gameObject.SetActive(false);
+
+            Canvas canvas = GetComponentInParent<Canvas>();
+            canvas.gameObject.SetActive(false);
         }
     }
 }

Runtime/Visitors/Scripts/UI/PossessionsUI.cs

@@ -84,8 +84,8 @@ namespace Passer.Humanoid {
 
         private void ShowDetails(VisitorPossessions.Possession possession) {
             canvas.gameObject.SetActive(false);
-            posessionDetailsUI.SetPossesion(possession);
             posessionDetailsUI.gameObject.SetActive(true);
+            posessionDetailsUI.RetrievePossession(possession);
         }
 
         private void DeletePossession(VisitorPossessions.Possession possession) {

Runtime/Visitors/Scripts/VisitorPossessions.cs

@@ -100,6 +100,10 @@ namespace Passer {
 
             // Default Possessions cannot be deleted
             AddPossessions(defaultPossessions, false);
+
+            Possessable possessableAvatar = humanoid.avatarRig.GetComponent<Possessable>();
+            if (possessableAvatar != null)
+                AddPossessions(new Possessable[] {possessableAvatar}, true);            
         }
 
         #endregion
@@ -196,9 +200,9 @@ namespace Passer {
             Debug.Log("deleted");
         }
 
-        private void RetrievePossession(Possession possession) {
+        //private void RetrievePossession(Possession possession) {
-            StartCoroutine(RetrievePossessionAsync(possession));
+        //    StartCoroutine(RetrievePossessionAsync(possession));
-        }
+        //}
 
         private static IEnumerator RetrievePossessionAsync(Possession possession) {
 #if UNITY_ANDROID
@@ -227,6 +231,16 @@ namespace Passer {
         private static AssetBundle lastAssetBundle;
 
         public static IEnumerator RetrievePossessionAsync(Possession possession, System.Action<GameObject> callback) {
+            if (possession.siteLocation == "") {
+                GameObject prefab = possession.scenePossession.gameObject;
+                prefab.SetActive(true);
+                callback(prefab);
+                prefab.SetActive(false);
+                yield return null;
+
+            } else
+                yield return RetrievePossessableAsync(possession.siteLocation, possession.assetPath, callback);
+            /*
             GameObject prefab;
 
             if (possession.siteLocation == "") {
@@ -280,15 +294,26 @@ namespace Passer {
                 }
                 callback(prefab);
             }
+            */
         }
 
         public static IEnumerator RetrievePossessableAsync(string possessableLocation, string possessablePath, System.Action<GameObject> callback) {
             GameObject prefab;
 
             if (possessableLocation == "") {
+                CachedPossession foundPossession = cache.Find(entry => entry.siteLocation == possessableLocation);
+                if (foundPossession == null) {
                     Debug.Log("Cannot retrieve Possessable: location is not set");
-                //yield return null;
                     callback(null);
+                } else {
+                    Debug.Log("Load from cache: " + possessablePath);
+                    prefab = foundPossession.assetBundle.LoadAsset<GameObject>(possessablePath);
+                    if (prefab == null) {
+                        Debug.LogError("Could not load " + possessablePath);
+                        callback(null);
+                    } else
+                        callback(prefab);
+                }
             }
             else {
                 Debug.Log("Cache size: " + cache.Count);
@@ -345,6 +370,7 @@ namespace Passer {
         }
 
         public static void UnloadPossession() {
+            if (lastAssetBundle != null)
                 lastAssetBundle.Unload(true);
         }
 

Samples~/VisitorsAndSites/Visitors/Prefabs/HumanoidMenu.prefab

@@ -19,7 +19,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &224305054863795988
 RectTransform:
   m_ObjectHideFlags: 0
@@ -27,17 +27,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1009298696547010}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224516364197970440}
+  m_Father: {fileID: 1732726482920354961}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 400, y: 400}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!223 &223982030086277360
 Canvas:
@@ -143,12 +143,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1010087135327232}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224240286644164966}
-  m_Father: {fileID: 224516364197970440}
+  m_Father: {fileID: 1732726482920354961}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -364,12 +364,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0.8759999}
   m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
   m_Children:
-  - {fileID: 224278994567763658}
+  - {fileID: 1732726482920354961}
-  - {fileID: 224305054863795988}
+  - {fileID: 4935924285374007194}
-  - {fileID: 224632906456248364}
-  - {fileID: 224902923911444970}
-  - {fileID: 224534749999103628}
-  - {fileID: 224550686342740716}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -780,7 +776,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1092005954041834}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
@@ -793,13 +789,13 @@ RectTransform:
   - {fileID: 224404634261783714}
   - {fileID: 224347278942118144}
   - {fileID: 224799093168728884}
-  m_Father: {fileID: 224516364197970440}
+  m_Father: {fileID: 1732726482920354961}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 400, y: 400}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!223 &223620151362750862
 Canvas:
@@ -893,7 +889,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &224632906456248364
 RectTransform:
   m_ObjectHideFlags: 0
@@ -901,14 +897,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1100335821991332}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224094901804644558}
   - {fileID: 224063162988156848}
   - {fileID: 224093856472970038}
-  m_Father: {fileID: 224516364197970440}
+  m_Father: {fileID: 1732726482920354961}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1783,7 +1779,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &224534749999103628
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1791,17 +1787,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1360348357047622}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
-  m_Father: {fileID: 224516364197970440}
+  - {fileID: 224550686342740716}
+  m_Father: {fileID: 1732726482920354961}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 400, y: 400}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!223 &223878645148792952
 Canvas:
@@ -2153,7 +2150,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 114234284667120282}
+      - m_Target: {fileID: 281413147588345248}
         m_MethodName: ApplicationQuit
         m_Mode: 1
         m_Arguments:
@@ -2314,7 +2311,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 3699023896077975722}
+      - m_Target: {fileID: 68386750862569867}
         m_MethodName: GoHome
         m_Mode: 1
         m_Arguments:
@@ -2768,7 +2765,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &224035301891000628
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3397,7 +3394,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1836836856681562}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
@@ -3408,8 +3405,8 @@ RectTransform:
   - {fileID: 224903934453329662}
   - {fileID: 224601146517823674}
   - {fileID: 4788109076704438}
-  m_Father: {fileID: 224516364197970440}
+  m_Father: {fileID: 224534749999103628}
-  m_RootOrder: 5
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4407,7 +4404,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 3699023896077975722}
+      - m_Target: {fileID: 68386750862569867}
         m_MethodName: GoBack
         m_Mode: 1
         m_Arguments:
@@ -4513,6 +4510,60 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 150, y: 75, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &3048678936055710789
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1732726482920354961}
+  - component: {fileID: 3746086346525692611}
+  m_Layer: 5
+  m_Name: UI
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1732726482920354961
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3048678936055710789}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224278994567763658}
+  - {fileID: 224305054863795988}
+  - {fileID: 224632906456248364}
+  - {fileID: 224902923911444970}
+  - {fileID: 224534749999103628}
+  m_Father: {fileID: 224516364197970440}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &3746086346525692611
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3048678936055710789}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f15c1f33a6b326e4192b1c37038640cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mainMenu: {fileID: 223620151362750862}
 --- !u!1 &4337858597399895603
 GameObject:
   m_ObjectHideFlags: 0
@@ -4634,7 +4685,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 3699023896077975722}
+      - m_Target: {fileID: 68386750862569867}
         m_MethodName: ReloadSite
         m_Mode: 1
         m_Arguments:
@@ -4974,3 +5025,67 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Reload
+--- !u!1 &8717867794581555491
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4935924285374007194}
+  - component: {fileID: 68386750862569867}
+  - component: {fileID: 281413147588345248}
+  m_Layer: 5
+  m_Name: Functionality
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4935924285374007194
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8717867794581555491}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224516364197970440}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &68386750862569867
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8717867794581555491}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30aa688ff1be4ec45b922da88c07d164, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  loadSiteAtStart: 0
+  startSite: 
+  startScene: 
+--- !u!114 &281413147588345248
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8717867794581555491}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66f1263dc17745042986d64d3fc85479, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Samples~/VisitorsAndSites/Visitors/Prefabs/Resources/MakeHuman_simple_TP.prefab.meta

@@ -3,5 +3,5 @@ guid: f249fe40e650a8c4a90aee2b885b941f
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: humanoidvisitor desktop_possessions
   assetBundleVariant: