Fix vfx view not beeing framed at launch (#79)

* Fix vfx view not beeing framed at launch * safer implementation * Update CHANGELOG.md
Unity-Technologies · Aug 27, 2020 · e600d59 · e600d59
1 parent 2981e68
commit e600d59
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/com.unity.visualeffectgraph/CHANGELOG.md b/com.unity.visualeffectgraph/CHANGELOG.md
@@ -136,6 +136,7 @@ The version number for this package has increased due to a version update of a r
 - Make VisualEffect created from the GameObject menu have unique names [Case 1262989](https://issuetracker.unity3d.com/product/unity/issues/guid/1262989/)
 - Missing System Seed in new dynamic built-in operator.
 - Prefab highlight missing for initial event name toggle [Case 1263012](https://issuetracker.unity3d.com/product/unity/issues/guid/1263012/)
+- Correctly frame the whole graph, when opening the Visual Effect Editor
 - Optimize display of inspector when there is a lot of exposed VFX properties.
 - fixes the user created vfx default resources that were ignored unless loaded
 - fix crash when creating a loop in subgraph operators [Case 1251523](https://issuetracker.unity3d.com/product/unity/issues/guid/1251523/)

diff --git a/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXView.cs b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXView.cs
@@ -749,6 +749,8 @@ public void FrameNewController()
 
         void FrameAfterAWhile()
         {
+
+
             var rectToFit = contentViewContainer.layout;
             var frameTranslation = Vector3.zero;
             var frameScaling = Vector3.one;
@@ -760,7 +762,16 @@ void FrameAfterAWhile()
                 return;
             }
 
-            CalculateFrameTransform(rectToFit, layout, 30, out frameTranslation, out frameScaling);
+            Rect rectAvailable = layout;
+
+            float validateFloat = rectAvailable.x + rectAvailable.y + rectAvailable.width + rectAvailable.height;
+            if (float.IsInfinity(validateFloat) || float.IsNaN(validateFloat))
+            {
+                schedule.Execute(FrameAfterAWhile);
+                return;
+            }
+
+            CalculateFrameTransform(rectToFit, rectAvailable, 30, out frameTranslation, out frameScaling);
 
             Matrix4x4.TRS(frameTranslation, Quaternion.identity, frameScaling);