Update to version 0.15.10

mtion-tv · Oct 16, 2024 · 8c21de1 · 8c21de1
1 parent 63baab1
commit 8c21de1
Show file tree

Hide file tree

Showing 13 changed files with 101 additions and 42 deletions.
diff --git a/Editor/BuildScripts/ThumbnailGenerator.cs b/Editor/BuildScripts/ThumbnailGenerator.cs
@@ -57,14 +57,15 @@ private static void TakeSnapshot(Camera camera, string directory, string filenam
             {
                 return;
             }
-
+            
             RenderTexture rt = new RenderTexture(ThumbnailResWidth, ThumbnailResHeight, 24);
+            rt.name = "ThumbnailGenerator.TakeSnapshot.rt";
             camera.targetTexture = rt;
             camera.Render();
 
             RenderTexture.active = rt;
             Texture2D snapshot = new Texture2D(ThumbnailResWidth, ThumbnailResHeight, TextureFormat.RGB24, false);
-            snapshot.name = $"Snapshot-{filename}";
+            snapshot.name = $"ThumbnailGenerator.TakeSnapshot.Snapshot-{filename}";
             snapshot.ReadPixels(new Rect(0, 0, ThumbnailResWidth, ThumbnailResHeight), 0, 0);
 
             camera.targetTexture = null;

diff --git a/Editor/Components/MVirtualCameraEventTrackerEditor.cs b/Editor/Components/MVirtualCameraEventTrackerEditor.cs
@@ -53,6 +53,7 @@ void OnEnable()
                 TrackerEditorCamera.VizCamera = TrackerEditorCamera.cameraObject.AddComponent<Camera>();
 
                 TrackerEditorCamera.VizTexture = new RenderTexture((int)(TrackerEditorCamera.defaultTextureHeight * instance_.CameraParams.AspectRatio), (int)TrackerEditorCamera.defaultTextureHeight, 0);
+                TrackerEditorCamera.VizTexture.name = "mtion.room.sdk.MVirtualCameraEventTrackerEditor.VizTexture";
                 TrackerEditorCamera.VizCamera.targetTexture = TrackerEditorCamera.VizTexture;
             }
 
@@ -101,6 +102,7 @@ private static void DoOverlayUI(UnityEngine.Object target, SceneView sceneView)
                     TrackerEditorCamera.VizTexture = new RenderTexture(
                         (int)(TrackerEditorCamera.defaultTextureHeight * tracker.CameraParams.AspectRatio),
                         (int)TrackerEditorCamera.defaultTextureHeight, 0);
+                    TrackerEditorCamera.VizTexture.name = "mtion.room.sdk.MVirtualCameraEventTrackerEditor.VizTexture";
                     TrackerEditorCamera.VizCamera.targetTexture = TrackerEditorCamera.VizTexture;
                     TrackerEditorCamera.VizCamera.Render();
                 }

diff --git a/Editor/ControlPanels/MTIONSDKToolsBuildTab.cs b/Editor/ControlPanels/MTIONSDKToolsBuildTab.cs
@@ -175,6 +175,44 @@ private static void DrawBuildOptions()
                 }
                 MTIONSDKToolsWindow.EndBox();
 
+
+                MTIONSDKToolsWindow.StartBox();
+                {
+                    var blueprintSDKObject = GameObject.FindObjectOfType<MTIONSDKBlueprint>();
+                    if (blueprintSDKObject != null)
+                    {
+                        bool sceneExists = false;
+                        string[] guids = AssetDatabase.FindAssets("t:SceneAsset");
+                        foreach (string guid in guids)
+                        {
+                            string path = AssetDatabase.GUIDToAssetPath(guid);
+                            string sceneName = System.IO.Path.GetFileNameWithoutExtension(path);
+                            if (sceneName == blueprintSDKObject.RoomSceneName)
+                            {
+                                sceneExists = true;
+                                break;
+                            }
+                        }
+
+                        if (!sceneExists)
+                        {
+                            EditorGUILayout.HelpBox("Room scene not found. Please drag and drop the scene file.", MessageType.Warning);
+                            SceneAsset newSceneAsset = EditorGUILayout.ObjectField("Room Scene", null, typeof(SceneAsset), false) as SceneAsset;
+                            if (newSceneAsset != null)
+                            {
+                                string sceneName = newSceneAsset.name;
+                                blueprintSDKObject.RoomSceneName = sceneName;
+
+                                EditorUtility.SetDirty(blueprintSDKObject);
+                            }
+
+                            return;
+                        }
+                    }
+                }
+                MTIONSDKToolsWindow.EndBox();
+
+
                 MTIONSDKToolsWindow.StartBox();
                 {
                     GUILayout.Label("Options", headerLabelStyle);
@@ -276,11 +314,39 @@ private static void DrawBuildOptions()
                         var blueprintSDKObject = GameObject.FindObjectOfType<MTIONSDKBlueprint>();
                         if (blueprintSDKObject != null)
                         {
-                            bool SwitchScene = GUILayout.Button(new GUIContent("Switch to Environment Scene"), MTIONSDKToolsWindow.MediumButtonStyle);
-                            if (SwitchScene)
+                            bool sceneExists = false;
+                            string[] guids = AssetDatabase.FindAssets("t:SceneAsset");
+                            foreach (string guid in guids)
+                            {
+                                string path = AssetDatabase.GUIDToAssetPath(guid);
+                                string sceneName = System.IO.Path.GetFileNameWithoutExtension(path);
+                                if (sceneName == blueprintSDKObject.EnvironmentSceneName)
+                                {
+                                    sceneExists = true;
+                                    break;
+                                }
+                            }
+
+                            if (!sceneExists)
+                            {
+                                EditorGUILayout.HelpBox("Environment scene not found. Please drag and drop the scene file.", MessageType.Warning);
+                                SceneAsset newSceneAsset = EditorGUILayout.ObjectField("Environment Scene", null, typeof(SceneAsset), false) as SceneAsset;
+                                if (newSceneAsset != null)
+                                {
+                                    string sceneName = newSceneAsset.name;
+                                    blueprintSDKObject.EnvironmentSceneName = sceneName;
+
+                                    EditorUtility.SetDirty(blueprintSDKObject);
+                                }
+                            }
+                            else
                             {
-                                var scene = EditorSceneManager.GetSceneByName(blueprintSDKObject.EnvironmentSceneName);
-                                EditorSceneManager.SetActiveScene(scene);
+                                bool SwitchScene = GUILayout.Button(new GUIContent("Switch to Environment Scene"), MTIONSDKToolsWindow.MediumButtonStyle);
+                                if (SwitchScene)
+                                {
+                                    var scene = EditorSceneManager.GetSceneByName(blueprintSDKObject.EnvironmentSceneName);
+                                    EditorSceneManager.SetActiveScene(scene);
+                                }
                             }
                         }
 

diff --git a/Editor/ControlPanels/MTIONSDKToolsWindow.cs b/Editor/ControlPanels/MTIONSDKToolsWindow.cs
@@ -547,6 +547,7 @@ public static Texture2D CreateTextureForColor(int width, int height, Color col)
                 pix[i] = col;
             }
             Texture2D result = new Texture2D(width, height);
+            result.name = "MTIONSDKToolsWindow.CreateTextureForColor";
             result.SetPixels(pix);
             result.Apply();
             return result;

diff --git a/Plugins/ThirdParty/MTIONStudioSDK_Public_Compiled_Editor.dll b/Plugins/ThirdParty/MTIONStudioSDK_Public_Compiled_Editor.dll
diff --git a/Plugins/ThirdParty/MTIONUtilityClasses.dll b/Plugins/ThirdParty/MTIONUtilityClasses.dll
diff --git a/Plugins/ThirdParty/UniVRM.Editor.dll b/Plugins/ThirdParty/UniVRM.Editor.dll
diff --git a/Plugins/ThirdParty/VRM.dll b/Plugins/ThirdParty/VRM.dll
diff --git a/Plugins/ThirdParty/VRMShaders.GLTF.IO.Runtime.dll b/Plugins/ThirdParty/VRMShaders.GLTF.IO.Runtime.dll
diff --git a/Scripts/ActionSystem/IMActionInterfaceImpl.cs b/Scripts/ActionSystem/IMActionInterfaceImpl.cs
@@ -87,8 +87,7 @@ public interface IMMultiActionExitEvents : IAction
         void UnbindToActionComplete(Action onActionComplete);
         void SimulateActionComplete();
     }
-
-
+
     public interface IMActionExitParameterProvider : IAction
     {
         int Count { get; }
@@ -104,8 +103,7 @@ public interface IMActionForceInternalUpdate
     {
         void ForceInternalUpdate();
     }
-
-
+
     public interface IMActionEntryEvent : IAction
     {
 

diff --git a/Scripts/ActionSystem/Internal/ActionTypeConverter.cs b/Scripts/ActionSystem/Internal/ActionTypeConverter.cs
@@ -10,12 +10,8 @@ namespace mtion.room.sdk.action
 {
 
 
-
-
-
     public static class TypeConversion
     {
-
         public static class NumericConverter
         {
             public static bool IsNumericType(Type type)
@@ -90,7 +86,6 @@ public static object ConvertToNumericValue(object input, Type expectedType)
             }
         }
 
-
         public static class ContainerConverter
         {
             public static T DeserializeContainer<T>(string jsonString)
@@ -129,17 +124,16 @@ public static bool CanDeserialize(string jsonString, Type targetType)
                     return false;
                 }
             }
-
-
+
             public static bool IsContainer(Type type)
             {
                 Type[] containerTypes =
                 {
-            typeof(List<>),
-            typeof(Dictionary<,>),
-            typeof(HashSet<>),
-            typeof(Array),
-        };
+                    typeof(List<>),
+                    typeof(Dictionary<,>),
+                    typeof(HashSet<>),
+                    typeof(Array),
+                };
 
                 foreach (Type containerType in containerTypes)
                 {
@@ -178,8 +172,7 @@ private static bool IsAssignableToGenericType(Type givenType, Type genericType)
                 return IsAssignableToGenericType(baseType, genericType);
             }
         }
-
-
+
         public static List<object> GenerateParameters(List<object> inputParameters, List<ActionEntryParameterInfo> parameterDefinitions)
         {
             List<object> output = new List<object>();
@@ -210,6 +203,13 @@ public static List<object> GenerateParameters(List<object> inputParameters, List
                             param = NumericConverter.ConvertToNumericValue(param, expectedType);
                         }
                         else if (expectedType == typeof(string))
+                        {
+                            param = param.ToString();
+                        }
+                    }
+                    else if (inputType == typeof(bool))
+                    {
+                        if (expectedType == typeof(string))
                         {
                             param = Convert.ChangeType(param, expectedType);
                         }
@@ -275,16 +275,10 @@ public static List<object> GenerateParameters(List<object> inputParameters, List
                 {
                 }
 
-
                 output.Add(param);
             }
 
             return output;
         }
-
-
-
-
-
     }
 }
diff --git a/Scripts/Utility/IResetStateListener.cs b/Scripts/Utility/IResetStateListener.cs
@@ -6,9 +6,6 @@ namespace mtion.room.sdk
 {
     public interface IResetStateListener
     {
-        public string ClubhouseGuid { get; set; }
-        public string ElementGuid { get; set; }
-
         public void ResetState();
     }
 }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "com.mtion.sdk",
     "description": "Tools to create assets and clubhouses for mtion studio.",
-    "version": "0.15.9",
+    "version": "0.15.10",
     "supportedVersion": "2021.3.25f1",
     "unity": "2021.3",
     "displayName": "Mtion SDK",