Fix entityId, still supporting instanceID for old versions for now

AGXUnity/Collide/Mesh.cs

@@ -321,7 +321,11 @@ private void CreateRenderMeshes()
         var renderColors = new List<Color>();
 
         var prevState = Random.state;
+#if UNITY_6000_3_OR_NEWER
+        Random.InitState( GetEntityId().GetHashCode() );
+#else
         Random.InitState( GetInstanceID() );
+#endif
         foreach ( var collisionMesh in PrecomputedCollisionMeshes ) {
           var meshes = collisionMesh.CreateRenderMeshes( transform );
           renderMeshes.AddRange( meshes );

AGXUnity/Constraints/Constraint.cs

@@ -824,7 +824,11 @@ protected override bool Initialize()
 
         // Not possible to handle collisions if connected frame parent is null/world.
         if ( CollisionsState != ECollisionsState.KeepExternalState && AttachmentPair.ConnectedObject != null ) {
+#if UNITY_6000_3_OR_NEWER
+          string groupName = gameObject.name + "_" + gameObject.GetEntityId();
+#else
           string groupName = gameObject.name + "_" + gameObject.GetInstanceID().ToString();
+#endif
           GameObject go1   = null;
           GameObject go2   = null;
           if ( CollisionsState == ECollisionsState.DisableReferenceVsConnected ) {

AGXUnity/Model/WheelJoint.cs

@@ -502,7 +502,12 @@ protected override bool Initialize()
 
         // Not possible to handle collisions if connected frame parent is null/world.
         if ( CollisionsState != Constraint.ECollisionsState.KeepExternalState && AttachmentPair.ConnectedObject != null ) {
+#if UNITY_6000_3_OR_NEWER
+          string groupName = gameObject.name + "_" + gameObject.GetEntityId();
+#else
           string groupName = gameObject.name + "_" + gameObject.GetInstanceID().ToString();
+#endif
+
           GameObject go1   = null;
           GameObject go2   = null;
           if ( CollisionsState == Constraint.ECollisionsState.DisableReferenceVsConnected ) {

AGXUnity/Rendering/CableRenderer.cs

@@ -304,7 +304,11 @@ private void RenderGameObjects()
 
           var go = m_segmentSpawner.CreateSegment( prevEndPosition, endPosition, radius );
 
+#if UNITY_6000_3_OR_NEWER
+          int id = go.GetEntityId().GetHashCode();
+#else
           int id = go.GetInstanceID();
+#endif
 
           (MeshRenderer, MeshRenderer) meshRenderers;
           if ( m_segmentRenderers.TryGetValue( id, out meshRenderers ) && meshRenderers.Item1 != null ) {

AGXUnity/RigidBodyEmitterSink.cs

@@ -172,12 +172,20 @@ protected override bool Initialize()
       }
 
       var templateGroupNames = new List<string>();
-      var baseGroupName = $"es_{Shape.GetInstanceID().ToString()}";
+#if UNITY_6000_3_OR_NEWER
+      var baseGroupName = $"es_{Shape.GetEntityId().ToString()}";
+#else
+      var baseGroupName = $"es_{Shape.GetInstanceID()}";
+#endif
       foreach ( var template in m_templates ) {
         foreach ( var emitter in m_emitters ) {
           if ( !emitter.ContainsTemplate( template ) )
             continue;
+#if UNITY_6000_3_OR_NEWER
+          var templateGroupName = $"{baseGroupName}_{template.GetEntityId()}";
+#else
           var templateGroupName = $"{baseGroupName}_{template.GetInstanceID()}";
+#endif
           var nativeTemplate = emitter.GetNativeTemplate( template );
           if ( nativeTemplate != null ) {
             foreach ( var geometry in nativeTemplate.getGeometries() )

AGXUnity/RuntimeObjects.cs

@@ -118,7 +118,11 @@ private void Update()
 
     private static string GetName( MonoBehaviour script )
     {
+#if UNITY_6000_3_OR_NEWER
+      return script.name + "_ro_" + script.GetEntityId().ToString();
+#else
       return script.name + "_ro_" + script.GetInstanceID().ToString();
+#endif
     }
 
     private static RuntimeObjects RecoverAndGetInstance()

Editor/AGXUnityEditor/InspectorGUI.cs

@@ -778,8 +778,13 @@ public static void ToolArrayGUI<T>( Tools.CustomTargetTool context,
                                                      getDefaultTypename;
       using ( IndentScope.Single ) {
         foreach ( var item in items ) {
+#if UNITY_6000_3_OR_NEWER
+          if ( !Foldout( EditorData.Instance.GetData( context.Targets[ 0 ],
+                                                      item.GetEntityId().ToString() ),
+#else
           if ( !Foldout( EditorData.Instance.GetData( context.Targets[ 0 ],
                                                       item.GetInstanceID().ToString() ),
+#endif
                          GUI.MakeLabel( InspectorEditor.Skin.TagTypename( getTypename( item ) ) +
                                         ' ' +
                                         item.name ) ) ) {
@@ -950,7 +955,11 @@ public static EditorDataEntry GetItemToolArrayGUIData( Object target,
                                                            Object item,
                                                            Action<EditorDataEntry> onCreate = null )
     {
+#if UNITY_6000_3_OR_NEWER
+      return EditorData.Instance.GetData( target, $"{identifier}_" + item.GetEntityId().ToString(), onCreate );
+#else
       return EditorData.Instance.GetData( target, $"{identifier}_" + item.GetInstanceID().ToString(), onCreate );
+#endif
     }
 
     private static void HandleItemEditorDisable<T>( Tools.CustomTargetTool tool, T item )

Editor/AGXUnityEditor/Settings/EditorData.cs

@@ -50,7 +50,7 @@ public void GC()
       while ( index < m_data.Count ) {
         var data = m_data[ index ];
 #if UNITY_6000_3_OR_NEWER
-        var obj = EditorUtility.EntityIdToObject( data.InstanceId );
+        var obj = EditorUtility.EntityIdToObject( data.EntityId );
 #else
         var obj = EditorUtility.InstanceIDToObject( data.InstanceId );
 #endif

Editor/AGXUnityEditor/Settings/EditorDataEntry.cs

@@ -10,16 +10,17 @@ public class EditorDataEntry
   {
     public static uint CalculateKey( UnityEngine.Object target, string identifier )
     {
+#if UNITY_6000_3_OR_NEWER
+      return ( ( target == null ? "0" : target.GetEntityId() ) + "_" + identifier ).To32BitFnv1aHash();
+#else
       return ( ( target == null ? "0" : target.GetInstanceID().ToString() ) + "_" + identifier ).To32BitFnv1aHash();
+#endif
     }
 
     [SerializeField]
     private uint m_key = uint.MaxValue;
     [SerializeField]
-    private int m_instanceId = int.MaxValue;
-    [SerializeField]
     private bool m_isStatic = false;
-
     [SerializeField]
     private bool m_bool = false;
     [SerializeField]
@@ -164,15 +165,27 @@ public Color Color
 
     public uint Key { get { return m_key; } private set { m_key = value; } }
 
-    public int InstanceId { get { return m_instanceId; } private set { m_instanceId = value; } }
+#if UNITY_6000_3_OR_NEWER
+    [SerializeField]
+    private EntityId m_instanceId = new EntityId();
+    public EntityId EntityId { get { return m_instanceId; } private set { m_instanceId = value; } }
+#else
+    [SerializeField]
+    private int m_instanceId = int.MaxValue;
 
+    public int InstanceId { get { return m_instanceId; } private set { m_instanceId = value; } }
+#endif
     public bool IsStatic { get { return m_isStatic; } }
 
     public EditorDataEntry( UnityEngine.Object target, uint key )
     {
       Key = key;
       if ( target != null )
+#if UNITY_6000_3_OR_NEWER
+        EntityId = target.GetEntityId();
+#else
         InstanceId = target.GetInstanceID();
+#endif
       else
         m_isStatic = true;
     }
@@ -192,7 +205,7 @@ private void OnValueChanged()
       // This is to trigger an update of the target GUI when the value has been changed.
       // E.g., clicking expand/collapse on a foldout we'd like the GUI to instantly respond.
 #if UNITY_6000_3_OR_NEWER
-      UnityEngine.Object obj = EditorUtility.EntityIdToObject( InstanceId );
+      UnityEngine.Object obj = EditorUtility.EntityIdToObject( EntityId );
 #else
       UnityEngine.Object obj = EditorUtility.InstanceIDToObject( InstanceId );
 #endif

Editor/AGXUnityEditor/Tools/BuiltInToolsTool.cs

@@ -83,7 +83,11 @@ public BuiltInToolsTool()
       AddKeyHandler( "SelectObject", SelectGameObjectKeyHandler );
       AddKeyHandler( "SelectRigidBody", SelectRigidBodyKeyHandler );
       AddKeyHandler( "PickHandler", PickHandlerKeyHandler );
+#if UNITY_6000_3_OR_NEWER
+      EditorApplication.hierarchyWindowItemByEntityIdOnGUI += HandleHierarchyDragDrop;
+#else
       EditorApplication.hierarchyWindowItemOnGUI += HandleHierarchyDragDrop;
+#endif
     }
 
     public override void OnSceneViewGUI( SceneView sceneView )
@@ -223,19 +227,21 @@ private static void AssignMaterial( GameObject go, AGXUnity.ShapeMaterial materi
         assignAll();
     }
 
-    private void HandleHierarchyDragDrop( int instanceId, Rect pos )
-    {
 #if UNITY_6000_3_OR_NEWER
+    private void HandleHierarchyDragDrop( EntityId entityId, Rect pos )
+    {
       InspectorGUI.HandleDragDrop<AGXUnity.ShapeMaterial>( pos,
                                                            Event.current,
                                                            material =>
-                                                             HasShapeMaterialProperty( EditorUtility.EntityIdToObject( instanceId ) as GameObject, false ),
-                                                           material =>
-                                                           {
-                                                             AssignMaterial( EditorUtility.EntityIdToObject( instanceId ) as GameObject,
+                                                             HasShapeMaterialProperty( EditorUtility.EntityIdToObject( entityId ) as GameObject, false ),
+                                                           material => {
+                                                             AssignMaterial( EditorUtility.EntityIdToObject( entityId ) as GameObject,
                                                                              material );
                                                            } );
+    }
 #else 
+    private void HandleHierarchyDragDrop( int instanceId, Rect pos )
+    {
       InspectorGUI.HandleDragDrop<AGXUnity.ShapeMaterial>( pos,
                                                            Event.current,
                                                            material =>
@@ -244,8 +250,8 @@ private void HandleHierarchyDragDrop( int instanceId, Rect pos )
                                                              AssignMaterial( EditorUtility.InstanceIDToObject( instanceId ) as GameObject,
                                                                              material );
                                                            } );
-#endif
     }
+#endif
 
     private void HandleSceneViewDragDrop( Event current, SceneView sceneView )
     {

Editor/AGXUnityEditor/Tools/DisableCollisionsTool.cs

@@ -95,11 +95,18 @@ public void OnInspectorGUI()
                                                                    "Cancel" );
 
       if ( applyCancelState == InspectorGUI.PositiveNegativeResult.Positive ) {
-        string selectedGroupName = m_mainObject.GetInstanceID().ToString();
         string mainObjectGroupName = "";
+#if UNITY_6000_3_OR_NEWER
+        string selectedGroupName = m_mainObject.GetEntityId().ToString();
+        for ( int i = 0; i < m_selected.Count; ++i )
+          mainObjectGroupName += m_selected[ i ].GetEntityId().ToString() +
+                                 ( i != m_selected.Count - 1 ? "_" : "" );
+#else
+        string selectedGroupName = m_mainObject.GetInstanceID().ToString();
         for ( int i = 0; i < m_selected.Count; ++i )
           mainObjectGroupName += m_selected[ i ].GetInstanceID().ToString() +
                                  ( i != m_selected.Count - 1 ? "_" : "" );
+#endif
 
         Undo.SetCurrentGroupName( "Disabling collisions" );
         var undoGroupId = Undo.GetCurrentGroup();

Editor/AGXUnityEditor/Utils/DrawGizmoCallbackHandler.cs

@@ -103,7 +103,6 @@ private static void HandleColorizedBodies( DebugRenderManager manager )
 #else
             var bodies = UnityEngine.Object.FindObjectsOfType<RigidBody>();
 #endif
-            Array.Sort( bodies, ( b1, b2 ) => { return b1.GetInstanceID() > b2.GetInstanceID() ? -1 : 1; } );
 
             foreach ( var body in bodies ) {
               // Create the color for all bodies for the colors to be consistent.

Editor/AGXUnityEditor/Windows/ConvertMaterialsWindow.cs

@@ -63,11 +63,12 @@ private string GetShaderPath( Material mat )
       var so =  new SerializedObject( mat );
       var sp = so.FindProperty( "m_Shader" );
       sp.Next( true );
-      var id = sp.intValue;
 
 #if UNITY_6000_3_OR_NEWER
-      AssetDatabase.TryGetGUIDAndLocalFileIdentifier( (EntityId)id, out string guid, out long _ );
+      var entityId = sp.entityIdValue;
+      AssetDatabase.TryGetGUIDAndLocalFileIdentifier( entityId, out string guid, out long _ );
 #else
+      var id = sp.intValue;
       AssetDatabase.TryGetGUIDAndLocalFileIdentifier( id, out string guid, out long _ );
 #endif
       return AssetDatabase.GUIDToAssetPath( guid ); ;