Fixed an issue where curves were not editable after being saved and reloaded.

Code cleanup.

Author: andys-sidefx

Plugins/HoudiniEngineUnity/Editor/UI/HEU_CurveUI.cs

@@ -62,17 +62,12 @@ public class HEU_CurveUI : Editor
         private const float _sceneUIBorderPadding = 2f;
 
         private const string _curveEditorLabel = "HOUDINI ENGINE CURVE EDITOR";
-
         private const string _infoHeaderLabel = "CURVE EDITOR INFO";
-
         private const string _curveNewPointModeLabel = "New Point Mode";
-
         private const string _infoLabel = "Press F1 to show or hide Info Panel.";
-
         private const string _curveViewHelp =
             "You can add and edit curve points similar to the Houdini Curve tool."
             + "\nSelect ADD or EDIT mode or switch to them using Space.";
-
         private const string _curveViewHelp2 =
             "You can add and edit curve points similar to the Houdini Curve tool."
             + "\nSelect ADD or EDIT mode or switch to them using F2.";
@@ -96,13 +91,9 @@ public class HEU_CurveUI : Editor
         // CACHE ------------------------------------------------------------------------------------------------------
 
         private Camera _currentCamera;
-
         private Texture2D _lineTexture;
-
         private Texture2D _boxTexture;
-
         private Rect _curveEditorUIRect;
-
         private HEU_Curve.Interaction _interactionMode;
 
         // Map of selected points for each curve
@@ -894,17 +885,10 @@ private void UpdateEditMode(HEU_HoudiniAsset asset, int controlID, EventType eve
             // For multi-point selection, calculates bounds and centre point
             Bounds bounds = new Bounds();
             int numSelectedPoints = 0;
-
             bool bInteractionOcurred = false;
-
             bool isDraggingPoints = false;
             bool wasDraggingPoints = false;
 
-            bool cookWhileDragging = false;
-
-            bool disableCurveScaleRot = false;
-
-
             // Draw the curve points
             EditModeDrawCurvePoints(currentEvent, eventType, ref numSelectedPoints, ref bounds,
                 ref bInteractionOcurred);
@@ -916,7 +900,7 @@ private void UpdateEditMode(HEU_HoudiniAsset asset, int controlID, EventType eve
                 // Drag selected points
                 Vector3 handleCenter = bounds.center;
                 isDraggingPoints = (EditorGUIUtility.hotControl != 0);
-                disableCurveScaleRot = asset.CurveDisableScaleRotation;
+                bool disableCurveScaleRot = asset.CurveDisableScaleRotation;
 
 
                 // Use rotation for every handle type
@@ -933,8 +917,6 @@ private void UpdateEditMode(HEU_HoudiniAsset asset, int controlID, EventType eve
                         if (selectedPoints.Count > 0)
                         {
                             SerializedObject serializedCurve = GetOrCreateSerializedCurve(curvePoints.Key);
-                            SerializedProperty curveNodesProperty = serializedCurve.FindProperty("_curveNodeData");
-
                             HEU_Curve curve = serializedCurve.targetObject as HEU_Curve;
                             handleRotation = Quaternion.Euler(curve.CurveNodeData[selectedPoints[0]].rotation);
                             handleScale = curve.CurveNodeData[selectedPoints[0]].scale;
@@ -1093,7 +1075,7 @@ private void UpdateEditMode(HEU_HoudiniAsset asset, int controlID, EventType eve
                     HEU_Curve.CurveEditState editState = (HEU_Curve.CurveEditState)stateProperty.intValue;
 
                     // On mouse release, transition editing curve to generation state
-                    if (!isDraggingPoints || (isDraggingPoints && cookWhileDragging))
+                    if (!isDraggingPoints)
                     {
                         if (editState == HEU_Curve.CurveEditState.EDITING)
                         {

Plugins/HoudiniEngineUnity/Scripts/Asset/HEU_Curve.cs

@@ -55,9 +55,7 @@ namespace HoudiniEngineUnity
     public class CurveNodeData : IEquivable<CurveNodeData>
     {
         [SerializeField] public Vector3 position = Vector3.zero;
-
         [SerializeField] public Vector3 rotation = Vector3.zero;
-
         [SerializeField] public Vector3 scale = Vector3.one;
 
         // The index of the curve that this node belongs to
@@ -211,23 +209,16 @@ public GameObject TargetGameObject
 
         // DATA -------------------------------------------------------------------------------------------------------
 
-        [SerializeField] private HAPI_NodeId _geoID;
-
-
-        [SerializeField] private HAPI_NodeId _partID;
+        [System.NonSerialized] private HAPI_NodeId _geoID = HEU_Defines.HEU_INVALID_NODE_ID;
+        [System.NonSerialized] private HAPI_NodeId _partID;
 
 
         [SerializeField] private List<CurveNodeData> _curveNodeData = new List<CurveNodeData>();
 
 
         [SerializeField] private Vector3[] _vertices;
-
         [SerializeField] private bool _isEditable;
-
-
         [SerializeField] private HEU_Parameters _parameters;
-
-
         [SerializeField] private bool _bUploadParameterPreset;
 
         internal void SetUploadParameterPreset(bool bValue)
@@ -236,10 +227,7 @@ internal void SetUploadParameterPreset(bool bValue)
         }
 
         [SerializeField] private string _curveName;
-
-
         [SerializeField] private GameObject _targetGameObject;
-
         [SerializeField] private bool _isGeoCurve;
 
 
@@ -282,9 +270,7 @@ internal enum CurveDrawCollision
         // Variables dealing with part curves
 
         [SerializeField] private bool _bIsPartCurve = true;
-
         [SerializeField] private bool _cachedCurveInfoValid = false;
-
         [SerializeField] private int[] _cachedCurveCounts = null;
 
 
@@ -326,6 +312,16 @@ public void Recook()
             }
         }
 
+        public void Rebuild()
+        {
+            SetEditState(CurveEditState.INVALID);
+
+            if (_parentAsset != null)
+            {
+                _parentAsset.RequestReload();
+            }
+        }
+
         /// <inheritdoc />
         public bool IsEditable()
         {

Plugins/HoudiniEngineUnity/Scripts/Asset/HEU_HoudiniAsset.cs

@@ -454,7 +454,7 @@ internal HEU_AssetType AssetTypeInternal
 
         [SerializeField] private string _assetHelp;
 
-        [SerializeField] private HAPI_NodeId _assetID = HEU_Defines.HEU_INVALID_NODE_ID;
+        [System.NonSerialized] private HAPI_NodeId _assetID = HEU_Defines.HEU_INVALID_NODE_ID;
 
         [SerializeField] private string _assetPath;
 
@@ -1921,6 +1921,16 @@ private void Awake()
                 HEU_Logger.LogWarning("Undoing a deleted HDA may also remove its parameter undo stack.");
                 RequestReload(false);
             }
+
+            // If there are curves they need to be cooked.
+            if (Curves != null)
+            {
+                foreach (var curve in Curves)
+                {
+                    curve.Rebuild();
+                }
+            }
+
 #endif
         }
 
@@ -2782,7 +2792,7 @@ private bool InternalStartRecook(bool bCheckParamsChanged,
                 }
             }
 
-            if (!bCookingSessionSync)
+            if (!bCookingSessionSync || true)
             {
                 // Only upload the following if we are not cooking as a result of SessionSync
                 // i.e. Houdini already cook so no need to upload our own
@@ -2798,11 +2808,12 @@ private bool InternalStartRecook(bool bCheckParamsChanged,
                     }
                     else
                     {
-                        // Otherwise curves should upload their parameters
-                        UploadCurvesParameters(session, bCheckParamsChanged);
                     }
                 }
 
+                // Otherwise curves should upload their parameters
+                UploadCurvesParameters(session, bCheckParamsChanged);
+
                 // Upload attributes. For edit nodes, this will be a cumulative update. So if the source geo has
                 // changed earlier in the graph, it will most likely be ignored here since the edit node has its own
                 // version of the geo with custom attributes. The only way to resolve it would be to blow away the custom

Plugins/HoudiniEngineUnity/Scripts/Parameters/HEU_Parameters.cs

@@ -83,14 +83,12 @@ public List<HEU_ParameterModifier> ParameterModifiers
 
         //	DATA ------------------------------------------------------------------------------------------------------
 
-        [SerializeField] private HAPI_NodeId _nodeID;
+        [System.NonSerialized] private HAPI_NodeId _nodeID = HEU_Defines.HEU_INVALID_NODE_ID;
 
         [SerializeField] internal string _uiLabel = "ASSET PARAMETERS";
 
         [SerializeField] private int[] _paramInts;
-
         [SerializeField] private float[] _paramFloats;
-
         [SerializeField] private string[] _paramStrings;
 
         [SerializeField] private HAPI_ParmChoiceInfo[] _paramChoices;