- Adding support for Unity 6

  Fixed warning/build errors with unity 6 preview1 ahead of the release.
- Unity Bindings: Consider HAPI_Transform structs as serializable.
  This will remove the obsolete "MarshalAs UnmanagedType.Struct" warnings when using the plugin's
  generated C# binding. The warning was:
'UnmanagedType.Struct' is obsolete: 'Applying UnmanagedType.Struct is unnecessary when marshalling a struct.
Support for UnmanagedType.Struct when marshalling a reference type may be unavailable in future releases.'

Author: dpernuit

Plugins/HoudiniEngineUnity/Scripts/Asset/HEU_BoundingVolume.cs

@@ -55,7 +55,11 @@ public List<GameObject> GetAllIntersectingObjects()
         }
 
         List<GameObject> intersectingObjects = new List<GameObject>();
+#if UNITY_6000_0_OR_NEWER
+        GameObject[] allObjects = UnityEngine.Object.FindObjectsByType<GameObject>(FindObjectsSortMode.None);
+#else
         GameObject[] allObjects = UnityEngine.Object.FindObjectsOfType<GameObject>();
+#endif
         foreach (GameObject obj in allObjects)
         {
             if (obj == this.gameObject)

Plugins/HoudiniEngineUnity/Scripts/Asset/HEU_HoudiniAsset.cs

@@ -4672,7 +4672,11 @@ internal void AddToAssetDBCache(string assetObjectFileName, UnityEngine.Object o
         /// <param name="bShow">True to show</param>
         internal static void SetCurvesVisibilityInScene(bool bShow)
         {
+#if UNITY_6000_0_OR_NEWER
+            HEU_HoudiniAsset[] houdiniAssets = GameObject.FindObjectsByType<HEU_HoudiniAsset>(FindObjectsSortMode.None);
+#else
             HEU_HoudiniAsset[] houdiniAssets = GameObject.FindObjectsOfType<HEU_HoudiniAsset>();
+#endif
             foreach (HEU_HoudiniAsset asset in houdiniAssets)
             {
                 List<HEU_Curve> curves = asset.Curves;

Plugins/HoudiniEngineUnity/Scripts/Core/HEU_HAPIUtility.cs

@@ -886,7 +886,11 @@ public static bool IsNodeValidInHoudini(HEU_SessionBase session, HAPI_NodeId nod
         public static HEU_HoudiniAssetRoot GetAssetInScene(HAPI_NodeId assetID)
         {
             HEU_HoudiniAssetRoot foundAsset = null;
+#if UNITY_6000_0_OR_NEWER
+            HEU_HoudiniAssetRoot[] houdiniAssets = GameObject.FindObjectsByType<HEU_HoudiniAssetRoot>(FindObjectsSortMode.None);
+#else
             HEU_HoudiniAssetRoot[] houdiniAssets = GameObject.FindObjectsOfType<HEU_HoudiniAssetRoot>();
+#endif
 
             foreach (HEU_HoudiniAssetRoot assetRoot in houdiniAssets)
             {

Plugins/HoudiniEngineUnity/Scripts/Sessions/HEU_SessionManager.cs

@@ -226,7 +226,12 @@ public static void LoadAllSessionData()
         private static void InternalValidateSceneAssets()
         {
             // Go through each asset, and validate in session
+#if UNITY_6000_0_OR_NEWER
+            HEU_HoudiniAsset[] assets = GameObject.FindObjectsByType<HEU_HoudiniAsset>(FindObjectsSortMode.None);
+#else
             HEU_HoudiniAsset[] assets = GameObject.FindObjectsOfType<HEU_HoudiniAsset>();
+#endif
+
             foreach (var asset in assets)
             {
                 if (asset.SessionID != HEU_Defines.HEU_INVALID_NODE_ID)

Plugins/HoudiniEngineUnity/Scripts/Utility/HEU_EditorUtility.cs

@@ -291,7 +291,10 @@ public static bool IsEditingInPrefabMode(GameObject obj)
         public static bool IsDisconnectedPrefabInstance(GameObject go)
         {
 #if UNITY_EDITOR
-#if UNITY_2018_3_OR_NEWER
+#if UNITY_6000_0_OR_NEWER
+            // Disconnected prefabs are no longer supported
+            return false;
+#elif UNITY_2018_3_OR_NEWER
             return PrefabUtility.IsDisconnectedFromPrefabAsset(go);
 #elif UNITY_2018_2_OR_NEWER
 			return PrefabUtility.GetPrefabType(go) == PrefabType.DisconnectedPrefabInstance;
@@ -1045,7 +1048,11 @@ public static HEU_HoudiniAssetRoot[] GetSelectedAssetRoots()
         /// <returns>List of all Houdini asset root components in the scene (HEU_HoudiniAssetRoot)</returns>
         public static HEU_HoudiniAssetRoot[] GetAllAssetRoots()
         {
+#if UNITY_6000_0_OR_NEWER
+            return GameObject.FindObjectsByType<HEU_HoudiniAssetRoot>(FindObjectsSortMode.None);
+#else
             return GameObject.FindObjectsOfType<HEU_HoudiniAssetRoot>();
+#endif
         }
 
         /// <summary>

Plugins/HoudiniEngineUnity/Scripts/Utility/HEU_RenderingPipelineDefines.cs

@@ -101,10 +101,18 @@ private static void UpdateDefines()
         public static HEU_PipelineType GetPipeline()
         {
 #if UNITY_2019_1_OR_NEWER
+#if UNITY_6000_0_OR_NEWER
+            if (GraphicsSettings.defaultRenderPipeline != null)
+#else
             if (GraphicsSettings.renderPipelineAsset != null)
+#endif
             {
                 // SRP
+#if UNITY_6000_0_OR_NEWER
+                var srpType = GraphicsSettings.defaultRenderPipeline.GetType().ToString();
+#else
                 var srpType = GraphicsSettings.renderPipelineAsset.GetType().ToString();
+#endif
                 if (srpType.Contains("HDRenderPipelineAsset"))
                 {
                     return HEU_PipelineType.HDRP;
@@ -159,12 +167,17 @@ public static void RemoveDefine(string define)
         public static List<string> GetDefines()
         {
 #if UNITY_EDITOR
-            var target = EditorUserBuildSettings.activeBuildTarget;
+            var target = EditorUserBuildSettings.activeBuildTarget;                        
             var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(target);
+#if UNITY_6000_0_OR_NEWER
+            var defines = PlayerSettings.GetScriptingDefineSymbols(UnityEditor.Build.NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup));
+#else       
             var defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(buildTargetGroup);
+#endif
+
             return defines.Split(';').ToList();
 #else
-        return new List<string>();
+            return new List<string>();
 #endif
         }
 
@@ -174,7 +187,12 @@ public static void SetDefines(List<string> definesList)
             var target = EditorUserBuildSettings.activeBuildTarget;
             var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(target);
             var defines = string.Join(";", definesList.ToArray());
+#if UNITY_6000_0_OR_NEWER
+            PlayerSettings.SetScriptingDefineSymbols(UnityEditor.Build.NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup), defines);
+#else
             PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTargetGroup, defines);
+#endif
+
 #endif
         }
     }