Skip to content

VFX 8.3 backports #2669

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.

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 70 commits into from
Nov 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
a877225
Fix for blackboard scrollable element hidden by resize.
iTris666 Jul 2, 2020
b06e41f
Target Gameobject windows resize doesn't go too far above scrollbars
iTris666 Jul 6, 2020
021e108
e3ba0e6 - Missing or incorrect unit in uss.
iTris666 Jul 10, 2020
e0c8262
[VFX] Fix crash on NDA platform : 100_Fog (#1265)
PaulDemeulenaere Jul 16, 2020
02ac3a0
Simplify linear drag (#67)
iTris666 Jul 17, 2020
76f6988
Vfx/docs/system requirements (#69)
Jul 23, 2020
b8f4cf0
Fix for node window staying when clicking elsewhere #68
iTris666 Jul 22, 2020
8016314
Prevent resourcehistory from beeing set to null by serialization (#66)
iTris666 Jul 22, 2020
f1c5f97
Fix position of block creation window (#72)
iTris666 Jul 23, 2020
361f721
Fix Prefab Highlight for initial event name toggle & override #71
PaulDemeulenaere Jul 24, 2020
19e3fba
Call recreateCopy after recusion test not before. #52
iTris666 Jul 27, 2020
057457f
Uniquify create visual effect gameobject name. Standard behaviour. #75
iTris666 Jul 27, 2020
7e595fe
Vfx/fix/1246989 normals and scale (#81)
julienf-unity Aug 18, 2020
1f08958
Fix Texture2DArray and Cubemap exposition from sg in output mesh cont…
julienf-unity Aug 19, 2020
b7b8af8
int and uint support in Compare (#53)
julienf-unity Aug 25, 2020
ca964cc
Added render pipeline compatability table (#87)
Aug 27, 2020
8cf1ae2
Fix square complexity on parameter to serialized property matching
iTris666 Aug 27, 2020
a1ebfe3
Fix vfx view not beeing framed at launch
iTris666 Aug 27, 2020
d449a5a
Fix for the lookup of mixed values in the VisualEffectEditor with obj…
iTris666 Aug 31, 2020
fdff963
SampleSDF operator (#88)
ludovic-theobald Sep 2, 2020
84ad80d
Fix UInt/Int Condition Reduction (PS4/X1 issue) (#96)
PaulDemeulenaere Sep 3, 2020
0dbb605
Fix 1154328 - infinite recompile with rand (#93)
julienf-unity Sep 10, 2020
8436069
World to Viewport Point & Viewport to World Point operators + Test (#98)
gabrieldelacruz Sep 10, 2020
241fa27
Fix Construct Matrix on GPU (#102)
PaulDemeulenaere Sep 21, 2020
1283c9a
Remove Debug Log
julienf-unity Nov 16, 2020
ffd1156
Fix case 1279294 : Invalid Random per component behavior in spawn con…
PaulDemeulenaere Sep 24, 2020
5d1a4d2
Point cache: Binary format corrupted due to an extra byte offset (#108)
gabrieldelacruz Sep 25, 2020
08aebc3
Fix InvalidCastException when using byte properties in point cache fi…
gabrieldelacruz Sep 25, 2020
65a2287
Setting ZClip in shadow caster templates (#99)
gabrieldelacruz Oct 1, 2020
7be875a
Fix and reenable test (#117)
julienf-unity Oct 1, 2020
c59f9f0
Fix spawner set attribute/ custom category (#115)
iTris666 Sep 30, 2020
5c86fc3
Fix non uniform scale test (once again)
julienf-unity Oct 2, 2020
35465c9
Fix cascaded type popup width (#124)
iTris666 Oct 5, 2020
683dde3
Forbid creation of context in VisualEffectSubgraphBlock through edge …
iTris666 Oct 8, 2020
6185da1
Make sure m_DependentDirty is flagged when the strutu change because …
iTris666 Oct 8, 2020
c17d31d
Fix overlap in properties (#128)
iTris666 Oct 8, 2020
35723ee
Fix Sample installation in URP #122
PaulDemeulenaere Oct 9, 2020
7b3fbdd
Four bug fixes for event tester (#123)
iTris666 Oct 9, 2020
7c27626
Reset the indentLevel at the end of VisualEffectEditor, also better c…
iTris666 Oct 15, 2020
090dec4
Un edit nodes that are collapsed (#133)
iTris666 Oct 15, 2020
ee1bbd0
Fixes https://fogbugz.unity3d.com/f/cases/1268956/ (#125)
iTris666 Oct 15, 2020
88cb2da
Create new VisualEffect Graph" creates a graph
iTris666 Oct 20, 2020
4c9bb9e
fixed spelling (#142)
iTris666 Oct 20, 2020
62d8a60
Fix Several issue in Property Binder (#106)
PaulDemeulenaere Oct 21, 2020
1221603
Add one pixel to height in non wide mode so that margin is equal to w…
iTris666 Oct 23, 2020
cd7c90d
Fix 1285603 View and Object mode of Shadergraph position node don't r…
ludovic-theobald Oct 24, 2020
46b0b99
Fix collapse exception and added automated test (#149)
iTris666 Oct 28, 2020
89303ad
Misc fixes for vfx shadergraph integrations (#130)
iTris666 Oct 28, 2020
6e21c55
Small fix for collapse test
iTris666 Oct 28, 2020
0bb5f49
Fix 1255182 Compile errors using Baked GI (default UV settings) / Out…
ludovic-theobald Oct 29, 2020
91f60c5
Update rebuild all script to take subgraph into account
julienf-unity Oct 29, 2020
34c668f
Fix suitableContext for subblocks not being serialized
julienf-unity Nov 5, 2020
4b88413
Fix subgraph not being sanitized at import
julienf-unity Nov 5, 2020
79b853d
[HDRP] Fix debug view material (albedo/normal/...)
PaulDemeulenaere Nov 13, 2020
b551611
Force ui update when shader might be reimported in StaticMeshOutput (…
iTris666 Nov 16, 2020
675cdff
Revert "Fix UInt/Int Condition Reduction (PS4/X1 issue) (#96)"
julienf-unity Nov 16, 2020
b65344c
Fix compil
julienf-unity Nov 16, 2020
59c7a6f
Backout int and uint support in Compare (#53)
julienf-unity Nov 16, 2020
ebb4e52
Override VFXPropertyAttribute equals to make it correct. (#73)
iTris666 Jul 22, 2020
2c3cf3d
8.x.x Fix compile loop in vfxoperator by adding a RecreateCopy mecani…
iTris666 Oct 2, 2020
323b005
Fix changelog
julienf-unity Nov 16, 2020
4eb1a55
Merge remote-tracking branch 'graphics/8.x.x/release' into vfx/8.x.x-…
julienf-unity Nov 17, 2020
d46ea8a
backout SampleSDF operator (#88)
julienf-unity Nov 17, 2020
faff67d
Fix some tests (8 and 26)
julienf-unity Nov 17, 2020
c9de33c
Update HDRP VFX + meta
julienf-unity Nov 17, 2020
31aef98
Update URP project + add missing metas
julienf-unity Nov 17, 2020
8ec1abc
*Update HDRP_Debug considering the blending is enable for debug material
PaulDemeulenaere Nov 17, 2020
f8c9d5d
*Add missing standalone 28_CameraProject.png
PaulDemeulenaere Nov 17, 2020
5adf5c9
*Increase treshold for 26_NonUnifomScale.unity
PaulDemeulenaere Nov 18, 2020
be4b0dc
Merge branch '8.x.x/release' into vfx/8.x.x-staging
sebastienlagarde Nov 18, 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
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,26 @@ public void ProcessExpressionMatrixToVector4s()

Assert.AreEqual(new Vector4(1, 0, 0, 0), reduced.Get<Vector4>());
}

[Test]
public void CheckExpressionRandomEquality()
{
var obj0 = new object();
var obj1 = new object();

var exp0 = new VFXExpressionRandom(true, new RandId(obj0));
var exp1 = new VFXExpressionRandom(true, new RandId(obj0));
var exp2 = new VFXExpressionRandom(false, new RandId(obj0));
var exp3 = new VFXExpressionRandom(true, new RandId(obj1));
var exp4 = new VFXExpressionRandom(true, new RandId(obj0, 1));

Assert.AreEqual(exp0, exp1);
Assert.AreEqual(exp0.GetHashCode(), exp1.GetHashCode());

Assert.AreNotEqual(exp0, exp2);
Assert.AreNotEqual(exp0, exp3);
Assert.AreNotEqual(exp0, exp4);
}
}
}
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
using UnityEngine;
using UnityEngine.VFX;
using UnityEditor.VFX;
using UnityEngine.TestTools;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEditor.VFX.UI;
Expand All @@ -15,7 +17,7 @@ namespace UnityEditor.VFX.Test
[TestFixture]
public class VFXGUITests
{
private const int testAssetCount = 8;
private const int testAssetCount = 9;
private VisualEffectAsset[] m_GuiTestAssets = new VisualEffectAsset[testAssetCount];

[OneTimeSetUp]
Expand Down Expand Up @@ -325,6 +327,40 @@ public void CreateAllOperatorsTest()
CreateAllOperators();
}


[UnityTest]
public IEnumerator CollapseTest()
{
EditTestAsset(8);

var builtInItem = VFXLibrary.GetOperators().Where(t => typeof(VFXBuiltInParameter).IsAssignableFrom(t.modelType)).First();

var builtIn = m_ViewController.AddVFXOperator(Vector2.zero, builtInItem);

yield return null;

builtIn.collapsed = true;

yield return null;

yield return null;

builtIn.collapsed = false;

yield return null;

yield return null;

builtIn.superCollapsed = true;

yield return null;

yield return null;

builtIn.superCollapsed = false;

}

List<VFXOperator> CreateAllOperators()
{
List<VFXOperator> operators = new List<VFXOperator>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,7 @@ GameObject:
- component: {fileID: 1849253499}
- component: {fileID: 1849253498}
- component: {fileID: 1849253500}
- component: {fileID: 1849253501}
m_Layer: 0
m_Name: Visual_Effect_Shadow
m_TagString: Untagged
Expand Down Expand Up @@ -833,3 +834,23 @@ VFXRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!114 &1849253501
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1849253497}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 20f198885badb1f4fa1e65869995ff82, type: 3}
m_Name:
m_EditorClassIdentifier:
ImageComparisonSettings:
TargetWidth: 512
TargetHeight: 512
PerPixelCorrectnessThreshold: 0
AverageCorrectnessThreshold: 0.00001
UseHDR: 0
UseBackBuffer: 0
ImageResolution: 0
Loading