Skip to content

Commit 37544be

Browse files
authored
Merge pull request #65 from SideQuestVR/dev
dev to main, 2.2.0
2 parents 8e92cd5 + f56bcba commit 37544be

File tree

125 files changed

+14293
-1262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+14293
-1262
lines changed

Editor/Banter.SDKEditor.asmdef

+7-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"GUID:23f3c6063e13e4fd9addce3606ff4e42",
1010
"GUID:315d634a9ac6d460a9515f5a56be6311",
1111
"GUID:6055be8ebefd69e48b49212b09b47b2f",
12-
"GUID:00a9e2367449a2e4d89a262276b0dac1"
12+
"GUID:00a9e2367449a2e4d89a262276b0dac1",
13+
"GUID:f06555f75b070af458a003d92f9efb00"
1314
],
1415
"includePlatforms": [
1516
"Editor"
@@ -25,6 +26,11 @@
2526
"name": "com.unity.visualscripting",
2627
"expression": "1.7.8",
2728
"define": "BANTER_VISUAL_SCRIPTING"
29+
},
30+
{
31+
"name": "com.unity.timeline",
32+
"expression": "1.7.8",
33+
"define": "BANTER_VS_TIMELINE"
2834
}
2935
],
3036
"noEngineReferences": false

Editor/Components/BanterAssetBundleEditor.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
4040
seeFields.style.color = Color.gray;
4141
myInspector.Add(seeFields);
4242

43-
#if BANTER_EDITOR
43+
//#if BANTER_EDITOR
4444
var foldout = new Foldout();
45-
foldout.text = "Advanced Properties";
45+
foldout.text = "Available Properties";
4646
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
47-
foldout.value = false;
47+
foldout.value = false;
4848
foldout.Add(inspectorIMGUI);
4949
myInspector.Add(foldout);
50-
#endif
50+
//#endif
5151

5252
return myInspector;
5353
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
using UnityEditor;
2+
using UnityEngine;
3+
using UnityEngine.UIElements;
4+
using Banter.SDK;
5+
6+
namespace Banter.SDKEditor
7+
{
8+
[CustomEditor(typeof(BanterAttachedObject))]
9+
public class BanterAttachedObjectEditor : Editor
10+
{
11+
void OnEnable()
12+
{
13+
if (target is BanterAttachedObject)
14+
{
15+
var script = (BanterAttachedObject)target;
16+
// script.gameObject.GetComponent<MeshFilter>().hideFlags = HideFlags.HideInInspector;
17+
var path = AssetDatabase.GetAssetPath(script);
18+
}
19+
}
20+
public override bool UseDefaultMargins() => false;
21+
public override VisualElement CreateInspectorGUI()
22+
{
23+
var script = (BanterAttachedObject)target;
24+
Editor editor = Editor.CreateEditor(script);
25+
// script.gameObject.GetComponent<MeshFilter>().hideFlags = HideFlags.HideInInspector;
26+
VisualElement myInspector = new VisualElement();
27+
28+
var _mainWindowStyleSheet = Resources.Load<StyleSheet>("BanterCustomInspector");
29+
myInspector.styleSheets.Add(_mainWindowStyleSheet);
30+
31+
var title = new Label("PROPERTIES SEEN BY JS");
32+
title.style.fontSize = 14;
33+
myInspector.Add(title);
34+
var seeFields = new Label("uid, attachmentPosition, attachmentRotation, attachmentType, avatarAttachmentType, avatarAttachmentPoint, attachmentPoint, autoSync, jointAvatar, ");
35+
seeFields.style.unityFontStyleAndWeight = FontStyle.Bold;
36+
seeFields.style.flexWrap = Wrap.Wrap;
37+
seeFields.style.whiteSpace = WhiteSpace.Normal;
38+
seeFields.style.marginBottom = 10;
39+
seeFields.style.marginTop = 10;
40+
seeFields.style.color = Color.gray;
41+
myInspector.Add(seeFields);
42+
43+
//#if BANTER_EDITOR
44+
var foldout = new Foldout();
45+
foldout.text = "Available Properties";
46+
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
47+
foldout.value = false;
48+
foldout.Add(inspectorIMGUI);
49+
myInspector.Add(foldout);
50+
//#endif
51+
52+
return myInspector;
53+
}
54+
}
55+
}

Editor/Components/BanterAttachedObjectEditor.cs.meta

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Editor/Components/BanterAudioSourceEditor.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
4040
seeFields.style.color = Color.gray;
4141
myInspector.Add(seeFields);
4242

43-
#if BANTER_EDITOR
43+
//#if BANTER_EDITOR
4444
var foldout = new Foldout();
45-
foldout.text = "Advanced Properties";
45+
foldout.text = "Available Properties";
4646
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
47-
foldout.value = false;
47+
foldout.value = false;
4848
foldout.Add(inspectorIMGUI);
4949
myInspector.Add(foldout);
50-
#endif
50+
//#endif
5151

5252
return myInspector;
5353
}

Editor/Components/BanterBillboardEditor.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
4040
seeFields.style.color = Color.gray;
4141
myInspector.Add(seeFields);
4242

43-
#if BANTER_EDITOR
43+
//#if BANTER_EDITOR
4444
var foldout = new Foldout();
45-
foldout.text = "Advanced Properties";
45+
foldout.text = "Available Properties";
4646
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
47-
foldout.value = false;
47+
foldout.value = false;
4848
foldout.Add(inspectorIMGUI);
4949
myInspector.Add(foldout);
50-
#endif
50+
//#endif
5151

5252
return myInspector;
5353
}

Editor/Components/BanterBoxColliderEditor.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
4040
seeFields.style.color = Color.gray;
4141
myInspector.Add(seeFields);
4242

43-
#if BANTER_EDITOR
43+
//#if BANTER_EDITOR
4444
var foldout = new Foldout();
45-
foldout.text = "Advanced Properties";
45+
foldout.text = "Available Properties";
4646
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
47-
foldout.value = false;
47+
foldout.value = false;
4848
foldout.Add(inspectorIMGUI);
4949
myInspector.Add(foldout);
50-
#endif
50+
//#endif
5151

5252
return myInspector;
5353
}

Editor/Components/BanterBrowserEditor.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
4040
seeFields.style.color = Color.gray;
4141
myInspector.Add(seeFields);
4242

43-
#if BANTER_EDITOR
43+
//#if BANTER_EDITOR
4444
var foldout = new Foldout();
45-
foldout.text = "Advanced Properties";
45+
foldout.text = "Available Properties";
4646
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
47-
foldout.value = false;
47+
foldout.value = false;
4848
foldout.Add(inspectorIMGUI);
4949
myInspector.Add(foldout);
50-
#endif
50+
//#endif
5151

5252
return myInspector;
5353
}

Editor/Components/BanterCapsuleColliderEditor.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
4040
seeFields.style.color = Color.gray;
4141
myInspector.Add(seeFields);
4242

43-
#if BANTER_EDITOR
43+
//#if BANTER_EDITOR
4444
var foldout = new Foldout();
45-
foldout.text = "Advanced Properties";
45+
foldout.text = "Available Properties";
4646
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
47-
foldout.value = false;
47+
foldout.value = false;
4848
foldout.Add(inspectorIMGUI);
4949
myInspector.Add(foldout);
50-
#endif
50+
//#endif
5151

5252
return myInspector;
5353
}

Editor/Components/BanterColliderEventsEditor.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ public override VisualElement CreateInspectorGUI()
2929
myInspector.styleSheets.Add(_mainWindowStyleSheet);
3030

3131

32-
#if BANTER_EDITOR
32+
//#if BANTER_EDITOR
3333
var foldout = new Foldout();
34-
foldout.text = "Advanced Properties";
34+
foldout.text = "Available Properties";
3535
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
36-
foldout.value = false;
36+
foldout.value = false;
3737
foldout.Add(inspectorIMGUI);
3838
myInspector.Add(foldout);
39-
#endif
39+
//#endif
4040

4141
return myInspector;
4242
}

Editor/Components/BanterConfigurableJointEditor.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
4040
seeFields.style.color = Color.gray;
4141
myInspector.Add(seeFields);
4242

43-
#if BANTER_EDITOR
43+
//#if BANTER_EDITOR
4444
var foldout = new Foldout();
45-
foldout.text = "Advanced Properties";
45+
foldout.text = "Available Properties";
4646
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
47-
foldout.value = false;
47+
foldout.value = false;
4848
foldout.Add(inspectorIMGUI);
4949
myInspector.Add(foldout);
50-
#endif
50+
//#endif
5151

5252
return myInspector;
5353
}

Editor/Components/BanterGLTFEditor.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
4040
seeFields.style.color = Color.gray;
4141
myInspector.Add(seeFields);
4242

43-
#if BANTER_EDITOR
43+
//#if BANTER_EDITOR
4444
var foldout = new Foldout();
45-
foldout.text = "Advanced Properties";
45+
foldout.text = "Available Properties";
4646
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
47-
foldout.value = false;
47+
foldout.value = false;
4848
foldout.Add(inspectorIMGUI);
4949
myInspector.Add(foldout);
50-
#endif
50+
//#endif
5151

5252
return myInspector;
5353
}

Editor/Components/BanterGeometryEditor.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
4040
seeFields.style.color = Color.gray;
4141
myInspector.Add(seeFields);
4242

43-
#if BANTER_EDITOR
43+
//#if BANTER_EDITOR
4444
var foldout = new Foldout();
45-
foldout.text = "Advanced Properties";
45+
foldout.text = "Available Properties";
4646
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
47-
foldout.value = false;
47+
foldout.value = false;
4848
foldout.Add(inspectorIMGUI);
4949
myInspector.Add(foldout);
50-
#endif
50+
//#endif
5151

5252
return myInspector;
5353
}

Editor/Components/BanterInvertedMeshEditor.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ public override VisualElement CreateInspectorGUI()
2929
myInspector.styleSheets.Add(_mainWindowStyleSheet);
3030

3131

32-
#if BANTER_EDITOR
32+
//#if BANTER_EDITOR
3333
var foldout = new Foldout();
34-
foldout.text = "Advanced Properties";
34+
foldout.text = "Available Properties";
3535
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
36-
foldout.value = false;
36+
foldout.value = false;
3737
foldout.Add(inspectorIMGUI);
3838
myInspector.Add(foldout);
39-
#endif
39+
//#endif
4040

4141
return myInspector;
4242
}

Editor/Components/BanterKitItemEditor.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
4040
seeFields.style.color = Color.gray;
4141
myInspector.Add(seeFields);
4242

43-
#if BANTER_EDITOR
43+
//#if BANTER_EDITOR
4444
var foldout = new Foldout();
45-
foldout.text = "Advanced Properties";
45+
foldout.text = "Available Properties";
4646
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
47-
foldout.value = false;
47+
foldout.value = false;
4848
foldout.Add(inspectorIMGUI);
4949
myInspector.Add(foldout);
50-
#endif
50+
//#endif
5151

5252
return myInspector;
5353
}

Editor/Components/BanterMaterialEditor.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
4040
seeFields.style.color = Color.gray;
4141
myInspector.Add(seeFields);
4242

43-
#if BANTER_EDITOR
43+
//#if BANTER_EDITOR
4444
var foldout = new Foldout();
45-
foldout.text = "Advanced Properties";
45+
foldout.text = "Available Properties";
4646
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
47-
foldout.value = false;
47+
foldout.value = false;
4848
foldout.Add(inspectorIMGUI);
4949
myInspector.Add(foldout);
50-
#endif
50+
//#endif
5151

5252
return myInspector;
5353
}

Editor/Components/BanterMeshColliderEditor.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public override VisualElement CreateInspectorGUI()
4040
seeFields.style.color = Color.gray;
4141
myInspector.Add(seeFields);
4242

43-
#if BANTER_EDITOR
43+
//#if BANTER_EDITOR
4444
var foldout = new Foldout();
45-
foldout.text = "Advanced Properties";
45+
foldout.text = "Available Properties";
4646
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
47-
foldout.value = false;
47+
foldout.value = false;
4848
foldout.Add(inspectorIMGUI);
4949
myInspector.Add(foldout);
50-
#endif
50+
//#endif
5151

5252
return myInspector;
5353
}

Editor/Components/BanterMirrorEditor.cs

+15-4
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,26 @@ public override VisualElement CreateInspectorGUI()
2828
var _mainWindowStyleSheet = Resources.Load<StyleSheet>("BanterCustomInspector");
2929
myInspector.styleSheets.Add(_mainWindowStyleSheet);
3030

31+
var title = new Label("PROPERTIES SEEN BY JS");
32+
title.style.fontSize = 14;
33+
myInspector.Add(title);
34+
var seeFields = new Label("renderTextureSize, cameraClear, backgroundColor, ");
35+
seeFields.style.unityFontStyleAndWeight = FontStyle.Bold;
36+
seeFields.style.flexWrap = Wrap.Wrap;
37+
seeFields.style.whiteSpace = WhiteSpace.Normal;
38+
seeFields.style.marginBottom = 10;
39+
seeFields.style.marginTop = 10;
40+
seeFields.style.color = Color.gray;
41+
myInspector.Add(seeFields);
3142

32-
#if BANTER_EDITOR
43+
//#if BANTER_EDITOR
3344
var foldout = new Foldout();
34-
foldout.text = "Advanced Properties";
45+
foldout.text = "Available Properties";
3546
IMGUIContainer inspectorIMGUI = new IMGUIContainer(() => { editor.OnInspectorGUI(); });
36-
foldout.value = false;
47+
foldout.value = false;
3748
foldout.Add(inspectorIMGUI);
3849
myInspector.Add(foldout);
39-
#endif
50+
//#endif
4051

4152
return myInspector;
4253
}

0 commit comments

Comments
 (0)