Merge pull request #65 from SideQuestVR/dev

dev to main, 2.2.0
SideQuestVR · Oct 30, 2024 · 37544be · 37544be
2 parents 8e92cd5 + f56bcba
commit 37544be
Show file tree

Hide file tree

Showing 125 changed files with 14,293 additions and 1,262 deletions.
diff --git a/Editor/Banter.SDKEditor.asmdef b/Editor/Banter.SDKEditor.asmdef
@@ -9,7 +9,8 @@
         "GUID:23f3c6063e13e4fd9addce3606ff4e42",
         "GUID:315d634a9ac6d460a9515f5a56be6311",
         "GUID:6055be8ebefd69e48b49212b09b47b2f",
-        "GUID:00a9e2367449a2e4d89a262276b0dac1"
+        "GUID:00a9e2367449a2e4d89a262276b0dac1",
+        "GUID:f06555f75b070af458a003d92f9efb00"
     ],
     "includePlatforms": [
         "Editor"
@@ -25,6 +26,11 @@
             "name": "com.unity.visualscripting",
             "expression": "1.7.8",
             "define": "BANTER_VISUAL_SCRIPTING"
+        },
+        {
+            "name": "com.unity.timeline",
+            "expression": "1.7.8",
+            "define": "BANTER_VS_TIMELINE"
         }
     ],
     "noEngineReferences": false

diff --git a/Editor/Components/BanterAssetBundleEditor.cs b/Editor/Components/BanterAssetBundleEditor.cs
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
             seeFields.style.color = Color.gray;
             myInspector.Add(seeFields);
 
-#if BANTER_EDITOR
+            //#if BANTER_EDITOR
             var foldout = new Foldout();
-            foldout.text = "Advanced Properties";
+            foldout.text = "Available Properties";
             IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
-            foldout.value = false; 
+            foldout.value = false;
             foldout.Add(inspectorIMGUI);
             myInspector.Add(foldout);
-#endif
+            //#endif
 
             return myInspector;
         }

diff --git a/Editor/Components/BanterAttachedObjectEditor.cs b/Editor/Components/BanterAttachedObjectEditor.cs
@@ -0,0 +1,55 @@
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using Banter.SDK;
+
+namespace Banter.SDKEditor
+{
+    [CustomEditor(typeof(BanterAttachedObject))]
+    public class BanterAttachedObjectEditor : Editor
+    {
+        void OnEnable()
+        {
+            if (target is BanterAttachedObject)
+            {
+                var script = (BanterAttachedObject)target;
+                // script.gameObject.GetComponent<MeshFilter>().hideFlags = HideFlags.HideInInspector;
+                var path = AssetDatabase.GetAssetPath(script);
+            }
+        }
+        public override bool UseDefaultMargins() => false;
+        public override VisualElement CreateInspectorGUI()
+        {
+            var script = (BanterAttachedObject)target;
+            Editor editor = Editor.CreateEditor(script);
+            // script.gameObject.GetComponent<MeshFilter>().hideFlags = HideFlags.HideInInspector;
+            VisualElement myInspector = new VisualElement();
+
+            var _mainWindowStyleSheet = Resources.Load<StyleSheet>("BanterCustomInspector");
+            myInspector.styleSheets.Add(_mainWindowStyleSheet);
+
+            var title = new Label("PROPERTIES SEEN BY JS");
+            title.style.fontSize = 14;
+            myInspector.Add(title);
+            var seeFields = new Label("uid, attachmentPosition, attachmentRotation, attachmentType, avatarAttachmentType, avatarAttachmentPoint, attachmentPoint, autoSync, jointAvatar, ");
+            seeFields.style.unityFontStyleAndWeight = FontStyle.Bold;
+            seeFields.style.flexWrap = Wrap.Wrap;
+            seeFields.style.whiteSpace = WhiteSpace.Normal;
+            seeFields.style.marginBottom = 10;
+            seeFields.style.marginTop = 10;
+            seeFields.style.color = Color.gray;
+            myInspector.Add(seeFields);
+
+            //#if BANTER_EDITOR
+            var foldout = new Foldout();
+            foldout.text = "Available Properties";
+            IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
+            foldout.value = false;
+            foldout.Add(inspectorIMGUI);
+            myInspector.Add(foldout);
+            //#endif
+
+            return myInspector;
+        }
+    }
+}
diff --git a/Editor/Components/BanterAttachedObjectEditor.cs.meta b/Editor/Components/BanterAttachedObjectEditor.cs.meta
diff --git a/Editor/Components/BanterAudioSourceEditor.cs b/Editor/Components/BanterAudioSourceEditor.cs
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
             seeFields.style.color = Color.gray;
             myInspector.Add(seeFields);
 
-#if BANTER_EDITOR
+            //#if BANTER_EDITOR
             var foldout = new Foldout();
-            foldout.text = "Advanced Properties";
+            foldout.text = "Available Properties";
             IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
-            foldout.value = false; 
+            foldout.value = false;
             foldout.Add(inspectorIMGUI);
             myInspector.Add(foldout);
-#endif
+            //#endif
 
             return myInspector;
         }

diff --git a/Editor/Components/BanterBillboardEditor.cs b/Editor/Components/BanterBillboardEditor.cs
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
             seeFields.style.color = Color.gray;
             myInspector.Add(seeFields);
 
-#if BANTER_EDITOR
+            //#if BANTER_EDITOR
             var foldout = new Foldout();
-            foldout.text = "Advanced Properties";
+            foldout.text = "Available Properties";
             IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
-            foldout.value = false; 
+            foldout.value = false;
             foldout.Add(inspectorIMGUI);
             myInspector.Add(foldout);
-#endif
+            //#endif
 
             return myInspector;
         }

diff --git a/Editor/Components/BanterBoxColliderEditor.cs b/Editor/Components/BanterBoxColliderEditor.cs
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
             seeFields.style.color = Color.gray;
             myInspector.Add(seeFields);
 
-#if BANTER_EDITOR
+            //#if BANTER_EDITOR
             var foldout = new Foldout();
-            foldout.text = "Advanced Properties";
+            foldout.text = "Available Properties";
             IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
-            foldout.value = false; 
+            foldout.value = false;
             foldout.Add(inspectorIMGUI);
             myInspector.Add(foldout);
-#endif
+            //#endif
 
             return myInspector;
         }

diff --git a/Editor/Components/BanterBrowserEditor.cs b/Editor/Components/BanterBrowserEditor.cs
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
             seeFields.style.color = Color.gray;
             myInspector.Add(seeFields);
 
-#if BANTER_EDITOR
+            //#if BANTER_EDITOR
             var foldout = new Foldout();
-            foldout.text = "Advanced Properties";
+            foldout.text = "Available Properties";
             IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
-            foldout.value = false; 
+            foldout.value = false;
             foldout.Add(inspectorIMGUI);
             myInspector.Add(foldout);
-#endif
+            //#endif
 
             return myInspector;
         }

diff --git a/Editor/Components/BanterCapsuleColliderEditor.cs b/Editor/Components/BanterCapsuleColliderEditor.cs
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
             seeFields.style.color = Color.gray;
             myInspector.Add(seeFields);
 
-#if BANTER_EDITOR
+            //#if BANTER_EDITOR
             var foldout = new Foldout();
-            foldout.text = "Advanced Properties";
+            foldout.text = "Available Properties";
             IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
-            foldout.value = false; 
+            foldout.value = false;
             foldout.Add(inspectorIMGUI);
             myInspector.Add(foldout);
-#endif
+            //#endif
 
             return myInspector;
         }

diff --git a/Editor/Components/BanterColliderEventsEditor.cs b/Editor/Components/BanterColliderEventsEditor.cs
@@ -29,14 +29,14 @@ public override VisualElement CreateInspectorGUI()
             myInspector.styleSheets.Add(_mainWindowStyleSheet);
 
 
-#if BANTER_EDITOR
+            //#if BANTER_EDITOR
             var foldout = new Foldout();
-            foldout.text = "Advanced Properties";
+            foldout.text = "Available Properties";
             IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
-            foldout.value = false; 
+            foldout.value = false;
             foldout.Add(inspectorIMGUI);
             myInspector.Add(foldout);
-#endif
+            //#endif
 
             return myInspector;
         }

diff --git a/Editor/Components/BanterConfigurableJointEditor.cs b/Editor/Components/BanterConfigurableJointEditor.cs
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
             seeFields.style.color = Color.gray;
             myInspector.Add(seeFields);
 
-#if BANTER_EDITOR
+            //#if BANTER_EDITOR
             var foldout = new Foldout();
-            foldout.text = "Advanced Properties";
+            foldout.text = "Available Properties";
             IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
-            foldout.value = false; 
+            foldout.value = false;
             foldout.Add(inspectorIMGUI);
             myInspector.Add(foldout);
-#endif
+            //#endif
 
             return myInspector;
         }

diff --git a/Editor/Components/BanterGLTFEditor.cs b/Editor/Components/BanterGLTFEditor.cs
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
             seeFields.style.color = Color.gray;
             myInspector.Add(seeFields);
 
-#if BANTER_EDITOR
+            //#if BANTER_EDITOR
             var foldout = new Foldout();
-            foldout.text = "Advanced Properties";
+            foldout.text = "Available Properties";
             IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
-            foldout.value = false; 
+            foldout.value = false;
             foldout.Add(inspectorIMGUI);
             myInspector.Add(foldout);
-#endif
+            //#endif
 
             return myInspector;
         }

diff --git a/Editor/Components/BanterGeometryEditor.cs b/Editor/Components/BanterGeometryEditor.cs
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
             seeFields.style.color = Color.gray;
             myInspector.Add(seeFields);
 
-#if BANTER_EDITOR
+            //#if BANTER_EDITOR
             var foldout = new Foldout();
-            foldout.text = "Advanced Properties";
+            foldout.text = "Available Properties";
             IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
-            foldout.value = false; 
+            foldout.value = false;
             foldout.Add(inspectorIMGUI);
             myInspector.Add(foldout);
-#endif
+            //#endif
 
             return myInspector;
         }

diff --git a/Editor/Components/BanterInvertedMeshEditor.cs b/Editor/Components/BanterInvertedMeshEditor.cs
@@ -29,14 +29,14 @@ public override VisualElement CreateInspectorGUI()
             myInspector.styleSheets.Add(_mainWindowStyleSheet);
 
 
-#if BANTER_EDITOR
+            //#if BANTER_EDITOR
             var foldout = new Foldout();
-            foldout.text = "Advanced Properties";
+            foldout.text = "Available Properties";
             IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
-            foldout.value = false; 
+            foldout.value = false;
             foldout.Add(inspectorIMGUI);
             myInspector.Add(foldout);
-#endif
+            //#endif
 
             return myInspector;
         }

diff --git a/Editor/Components/BanterKitItemEditor.cs b/Editor/Components/BanterKitItemEditor.cs
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
             seeFields.style.color = Color.gray;
             myInspector.Add(seeFields);
 
-#if BANTER_EDITOR
+            //#if BANTER_EDITOR
             var foldout = new Foldout();
-            foldout.text = "Advanced Properties";
+            foldout.text = "Available Properties";
             IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
-            foldout.value = false; 
+            foldout.value = false;
             foldout.Add(inspectorIMGUI);
             myInspector.Add(foldout);
-#endif
+            //#endif
 
             return myInspector;
         }

diff --git a/Editor/Components/BanterMaterialEditor.cs b/Editor/Components/BanterMaterialEditor.cs
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
             seeFields.style.color = Color.gray;
             myInspector.Add(seeFields);
 
-#if BANTER_EDITOR
+            //#if BANTER_EDITOR
             var foldout = new Foldout();
-            foldout.text = "Advanced Properties";
+            foldout.text = "Available Properties";
             IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
-            foldout.value = false; 
+            foldout.value = false;
             foldout.Add(inspectorIMGUI);
             myInspector.Add(foldout);
-#endif
+            //#endif
 
             return myInspector;
         }

diff --git a/Editor/Components/BanterMeshColliderEditor.cs b/Editor/Components/BanterMeshColliderEditor.cs
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
             seeFields.style.color = Color.gray;
             myInspector.Add(seeFields);
 
-#if BANTER_EDITOR
+            //#if BANTER_EDITOR
             var foldout = new Foldout();
-            foldout.text = "Advanced Properties";
+            foldout.text = "Available Properties";
             IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
-            foldout.value = false; 
+            foldout.value = false;
             foldout.Add(inspectorIMGUI);
             myInspector.Add(foldout);
-#endif
+            //#endif
 
             return myInspector;
         }

diff --git a/Editor/Components/BanterMirrorEditor.cs b/Editor/Components/BanterMirrorEditor.cs
@@ -28,15 +28,26 @@ public override VisualElement CreateInspectorGUI()
             var _mainWindowStyleSheet = Resources.Load<StyleSheet>("BanterCustomInspector");
             myInspector.styleSheets.Add(_mainWindowStyleSheet);
 
+            var title = new Label("PROPERTIES SEEN BY JS");
+            title.style.fontSize = 14;
+            myInspector.Add(title);
+            var seeFields = new Label("renderTextureSize, cameraClear, backgroundColor, ");
+            seeFields.style.unityFontStyleAndWeight = FontStyle.Bold;
+            seeFields.style.flexWrap = Wrap.Wrap;
+            seeFields.style.whiteSpace = WhiteSpace.Normal;
+            seeFields.style.marginBottom = 10;
+            seeFields.style.marginTop = 10;
+            seeFields.style.color = Color.gray;
+            myInspector.Add(seeFields);
 
-#if BANTER_EDITOR
+            //#if BANTER_EDITOR
             var foldout = new Foldout();
-            foldout.text = "Advanced Properties";
+            foldout.text = "Available Properties";
             IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
-            foldout.value = false; 
+            foldout.value = false;
             foldout.Add(inspectorIMGUI);
             myInspector.Add(foldout);
-#endif
+            //#endif
 
             return myInspector;
         }