Skip to content

[VFX] Remove Exact Fixed Time option #2507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 3, 2020
Merged

[VFX] Remove Exact Fixed Time option #2507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61af009
Remove temporarily "Exact Fixed Time Step" option on VisualEffectAsse…
PaulDemeulenaere Nov 3, 2020
9ea36db
Use santize instead of inspector behavior to remove ExactFixedTimeStep
PaulDemeulenaere Nov 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXSpawnerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ public IEnumerator Create_Spawner_Check_Time_Mode_Update_Count([ValueSource("s_C

graph.GetResource().updateMode = (VFXUpdateMode)timeMode.vfxUpdateMode;
AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(graph));
Assert.AreEqual(graph.GetResource().updateMode, (VFXUpdateMode)timeMode.vfxUpdateMode);

var previousCaptureFrameRate = Time.captureFramerate;
var previousFixedTimeStep = UnityEngine.VFX.VFXManager.fixedTimeStep;
Expand Down Expand Up @@ -398,6 +399,7 @@ public IEnumerator Change_Fixed_Time_Step_To_A_Large_Value_Then_Back_To_Default(
CreateAssetAndComponent(3615.0f, "OnPlay", out graph, out vfxComponent, out gameObj, out cameraObj);
graph.GetResource().updateMode = (VFXUpdateMode)timeMode.vfxUpdateMode;
AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(graph));
Assert.AreEqual(graph.GetResource().updateMode, (VFXUpdateMode)timeMode.vfxUpdateMode);

var previousCaptureFrameRate = Time.captureFramerate;
var previousFixedTimeStep = UnityEngine.VFX.VFXManager.fixedTimeStep;
Expand Down
1 change: 1 addition & 0 deletions com.unity.visualeffectgraph/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ The version number for this package has increased due to a version update of a r
- Fixed Random Vector subgraph utility operator in Additional Samples
- Fixed Set Strip Progress Attribute utility block in Additional Samples
- Fix [Case 1255182](https://fogbugz.unity3d.com/f/cases/1255182/)
- Remove temporarily "Exact Fixed Time Step" option on VisualEffectAsset to avoid unexpected behavior

## [10.1.0] - 2020-10-12
### Added
Expand Down
4 changes: 4 additions & 0 deletions com.unity.visualeffectgraph/Editor/Inspector/VFXAssetEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,11 @@ public override void OnInspectorGUI()
bool newExactFixedTimeStep = false;
EditorGUI.showMixedValue = !initialProcessEveryFrame.HasValue;
EditorGUI.BeginDisabledGroup((!initialFixedDeltaTime.HasValue || !initialFixedDeltaTime.Value) && !resourceUpdateModeProperty.hasMultipleDifferentValues);

#if CASE_1289829_HAS_BEEN_FIXED
newExactFixedTimeStep = EditorGUILayout.Toggle(processEveryFrameContent, initialProcessEveryFrame ?? false);
#endif

EditorGUI.EndDisabledGroup();
EditorGUI.showMixedValue = !initialIgnoreGameTimeScale.HasValue;
bool newIgnoreTimeScale = EditorGUILayout.Toggle(ignoreTimeScaleContent, initialIgnoreGameTimeScale ?? false);
Expand Down
8 changes: 8 additions & 0 deletions com.unity.visualeffectgraph/Editor/Models/VFXGraph.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,14 @@ public void SanitizeGraph()
m_GraphSanitized = true;
m_GraphVersion = CurrentVersion;

#if !CASE_1289829_HAS_BEEN_FIXED
if (visualEffectResource != null && (visualEffectResource.updateMode & VFXUpdateMode.ExactFixedTimeStep) == VFXUpdateMode.ExactFixedTimeStep)
{
visualEffectResource.updateMode = visualEffectResource.updateMode & ~VFXUpdateMode.ExactFixedTimeStep;
Debug.Log("Sanitize : Exact Fixed Time has been automatically reset to false to avoid an unexpected behavior.");
}
#endif

UpdateSubAssets(); //Should not be necessary : force remove no more referenced object from asset
}

Expand Down