ci: release trigger

Innoactive · Nov 16, 2020 · b2a63d4 · b2a63d4
2 parents db536a2 + 49e1dd4
commit b2a63d4
Show file tree

Hide file tree

Showing 15 changed files with 339 additions and 135 deletions.
diff --git a/Editor/Innoactive.CreatorEditor.XRInteraction.asmdef b/Editor/Innoactive.CreatorEditor.XRInteraction.asmdef
@@ -22,7 +22,7 @@
     "versionDefines": [
         {
             "name": "com.unity.xr.interaction.toolkit",
-            "expression": "",
+            "expression": "[0.9.4-preview]",
             "define": "XR_INTERACTION_TOOLKIT"
         }
     ],

diff --git a/Editor/Interaction/InteractableHighlighterEditor.cs b/Editor/Interaction/InteractableHighlighterEditor.cs
@@ -74,6 +74,9 @@ internal HighlightCase(SerializedObject serializedObject, string sectionTitle, s
 
         private void OnEnable()
         {
+            InteractableHighlighter highlighter = target as InteractableHighlighter;
+            highlighter.ForceRefreshCachedRenderers();
+
             onTouchHighlighting = new HighlightCase(serializedObject, "On Touch Highlight", "touchHighlightColor", "touchHighlightMaterial", "allowOnTouchHighlight", true);
             onGrabHighlighting = new HighlightCase(serializedObject, "On Grab Highlight", "grabHighlightColor", "grabHighlightMaterial", "allowOnGrabHighlight", false);
             onUseHighlighting = new HighlightCase(serializedObject, "On Use Highlight", "useHighlightColor", "useHighlightMaterial", "allowOnUseHighlight", false);

diff --git a/Editor/PackageDependencies/XRInteractionPackageEnabler.cs b/Editor/PackageDependencies/XRInteractionPackageEnabler.cs
@@ -6,7 +6,7 @@
     public class XRInteractionPackageEnabler : Dependency 
     {        
         /// <inheritdoc/>
-        public override string Package { get; } = "com.unity.xr.interaction.toolkit";
+        public override string Package { get; } = "com.unity.xr.interaction.toolkit@0.9.4-preview";
 
         /// <inheritdoc/>
         public override int Priority { get; } = 4;

diff --git a/Editor/ProjectSettings.meta b/Editor/ProjectSettings.meta
diff --git a/Editor/ProjectSettings/SnapZoneSettingsProvider.cs b/Editor/ProjectSettings/SnapZoneSettingsProvider.cs
@@ -0,0 +1,49 @@
+using Innoactive.Creator.XRInteraction;
+using Innoactive.CreatorEditor.UI;
+using Innoactive.CreatorEditor.XRInteraction;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+internal class SnapZoneSettingsProvider : SettingsProvider
+{
+    const string Path = "Project/Creator/Snap Zones";
+
+    private Editor editor;
+
+    public SnapZoneSettingsProvider() : base(Path, SettingsScope.Project) {}
+
+    public override void OnGUI(string searchContext)
+    {
+        EditorGUILayout.Space();
+        GUIStyle labelStyle = CreatorEditorStyles.ApplyPadding(CreatorEditorStyles.Paragraph, 0); 
+        GUILayout.Label("These settings help you to configure Snap Zones within your scenes. You can define colors and other values that will be set to Snap Zones created by clicking the 'Create Snap Zone' button of a Snappable Property.", labelStyle);
+        EditorGUILayout.Space();
+
+        editor.OnInspectorGUI();
+
+        EditorGUILayout.Space(20f);
+
+        if (GUILayout.Button("Apply settings in current scene"))
+        {
+            SnapZone[] snapZones = Resources.FindObjectsOfTypeAll<SnapZone>();
+
+            foreach (SnapZone snapZone in snapZones)
+            {
+                SnapZoneSettings.Instance.ApplySettingsToSnapZone(snapZone);
+            }
+        }
+    }
+
+    public override void OnActivate(string searchContext, VisualElement rootElement)
+    {
+        editor = Editor.CreateEditor(SnapZoneSettings.Instance);
+    }
+
+    [SettingsProvider]
+    public static SettingsProvider Provider()
+    {
+        SettingsProvider provider = new SnapZoneSettingsProvider();
+        return provider;
+    }
+}
diff --git a/Editor/ProjectSettings/SnapZoneSettingsProvider.cs.meta b/Editor/ProjectSettings/SnapZoneSettingsProvider.cs.meta
diff --git a/Editor/SnapZone/SnapZoneSettings.cs b/Editor/SnapZone/SnapZoneSettings.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using Innoactive.Creator.Core.Runtime.Utils;
 using UnityEditor;
 using UnityEngine;
 using Innoactive.Creator.XRInteraction;
@@ -10,7 +11,7 @@ namespace Innoactive.CreatorEditor.XRInteraction
     /// Settings for <see cref="SnapZone"/>s for e.g. automatic creation of such snap zones.
     /// </summary>
     [CreateAssetMenu(fileName = "SnapZoneSettings", menuName = "Innoactive/SnapZoneSettings", order = 1)]
-    public class SnapZoneSettings : ScriptableObject
+    public class SnapZoneSettings : SettingsObject<SnapZoneSettings>
     {
         private const string MaterialsPath = "Assets/Resources/SnapZones";
         private static SnapZoneSettings settings;

diff --git a/Editor/SnapZone/SnapZoneWizard.cs b/Editor/SnapZone/SnapZoneWizard.cs
diff --git a/Editor/SnapZone/SnapZoneWizard.cs.meta b/Editor/SnapZone/SnapZoneWizard.cs.meta
diff --git a/NOTICE b/NOTICE
@@ -1,7 +1,7 @@
 Innoactive Creator
 Copyright 2013-2019 Innoactive GmbH
 
-This product includes software developed at Innoactive GmbH (http://innoactive.de).
+This product includes software developed at Innoactive GmbH (http://innoactive.de), licensed under the Apache License, Version 2.0.
 
 This product contains software https://github.com/Unity-Technologies/XR-Interaction-Toolkit-Examples developed by Unity Technologies, licensed under the Unity Companion License for Unity-dependent projects.
 

diff --git a/Runtime/AssemblyAttributes.cs b/Runtime/AssemblyAttributes.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Innoactive.CreatorEditor.XRInteraction")]
diff --git a/Runtime/AssemblyAttributes.cs.meta b/Runtime/AssemblyAttributes.cs.meta