Skip to content

Commit

Permalink
Read Attribute in Spawn Context (#6)
Browse files Browse the repository at this point in the history
* Squashed commit of the following:

commit 9d42330b20431b0ff5c4a5e5a90bf293635ab4a2
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Apr 3 11:14:14 2020 +0200

    *Update image reference (having issue with standalone, not sure of the result)

commit 275c22de35f08ada783c96c625b12475f0c42337
Merge: 85254f1ec4 a9338688a6
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Apr 3 09:59:48 2020 +0200

    Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner

    # Conflicts:
    #	TestProjects/VisualEffectGraph/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/20_SpawnerChainingAndLoop.png
    #	TestProjects/VisualEffectGraph/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/20_SpawnerChainingAndLoop.png
    #	com.unity.visualeffectgraph/CHANGELOG.md

commit 85254f1ec4ffb2c4d0014a2baa52f49f0b97d0f8
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Mar 17 16:21:39 2020 +0100

    *Update image reference due to fix with grapicTest update

commit e361ecfed65e61f07db4af32f4dd22a9d3cb9caf
Merge: d8db341bfb 47b17e444b
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Mar 17 11:51:43 2020 +0100

    Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner

    # Conflicts:
    #	TestProjects/VisualEffectGraph/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/20_SpawnerChainingAndLoop.png
    #	TestProjects/VisualEffectGraph/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/20_SpawnerChainingAndLoop.png
    #	TestProjects/VisualEffectGraph/ProjectSettings/EditorBuildSettings.asset

commit d8db341bfbd9257e1a5285d200e3eabe24857b01
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Mar 5 17:57:38 2020 +0100

    *Apply Formatting

commit f80441dd6b30ef726d46ae2fe32bcf05d208b760
Merge: b3d858ffe1 01f176355a
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Mar 5 17:32:49 2020 +0100

    Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner

commit b3d858ffe13b19dc42e1874d8393cf9829a5e2c7
Merge: 0bce44dc9a 5d2dfe278f
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 25 13:18:58 2020 +0100

    Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner

    # Conflicts:
    #	.yamato/upm-ci-vfx_lwrp.yml
    #	.yamato/upm-ci-vfxmain.yml
    #	com.unity.visualeffectgraph/CHANGELOG.md

commit 0bce44dc9a694bf36b849efb894e999fa9dc959e
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Jan 24 14:20:03 2020 +0100

    *Fix build

commit 03b0b05d4f86168f97d9e5e34757b79cae6c39df
Merge: 2130ea0ef2 e6fd39c7a2
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Jan 24 09:47:09 2020 +0100

    Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner

    # Conflicts:
    #	com.unity.visualeffectgraph/CHANGELOG.md

commit 2130ea0ef2186ecdc5692878940d5d6635dca31b
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Jan 13 14:09:13 2020 +0100

    *Update tooltips (thanks @vlad)

commit f8cdb95f5d2075848e530d997551b69de43f39e0
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Jan 13 14:01:44 2020 +0100

    Rename SpawnerState in SpawnState

commit 3e2b4fd67c4776907e96a8cfa1b9985ee3fab2fd
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Jan 13 13:54:24 2020 +0100

    Improve ReadAttribute test to cover NewLoop state

commit 2c515bfde823bfbce87df8a1444e19e5c2327e32
Merge: a9efee24ff bff1b74b59
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 23 16:32:45 2019 +0100

    Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner

commit a9efee24ff84131c53dc2ba93f1985b02217e3d7
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 16 14:54:25 2019 +0100

    *Update comment

commit 6b17879881555cd72b3af4463fd907423f92ad7f
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 16 14:53:11 2019 +0100

    Throws an exception while detecting unexpected expression flag

commit cbad9212075ec6776cf9d892185dd6ee64f8fab2
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 16 09:43:33 2019 +0100

    Reorder spawner state operator

commit e2357ac0dee8d71fe9d4a1ad877aa5fe19a5222a
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 16 09:35:30 2019 +0100

    Fix issue "Cannot plug in attribute-derived nodes into a spawner block."

commit b06d7f0708e5178cae51e9e8b96f547fc2f4c6b2
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 9 15:58:30 2019 +0100

    *Update changelog

commit 61bd2e5871f23002dd1add024858efdef5e09372
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 9 15:46:52 2019 +0100

    Update _CCCC test & Rename Spawner State library name

commit 4942912123d795023aacb0363c8e462a2da29943
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Dec 6 16:58:17 2019 +0100

    Fix test & clean useless code in VFXExpression.Initialize

commit e6d6c593eb27c612a225340615dabe7692f76a00
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Dec 6 15:22:31 2019 +0100

    Switch to graphics/vfx/fix/read-attribute-in-spawner for testing purpose

commit f00f740b775f67e9378072744513f3ff920f470d
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Dec 6 15:16:39 2019 +0100

    Update 20_SpawnerChainingAndLoop (this is the only test affected by compilation order change)

commit b7d8e238dd7e05bf99114a980c8584da7985dcf8
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Dec 6 14:45:56 2019 +0100

    Clean test data & add reference images

commit 6ddb3389f8e62da44ef50de621884b0526e1b8aa
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Dec 6 14:17:51 2019 +0100

    Move graphicTest to common files

commit fa21846e7787fec9068c5a18a33dc568df3f7cc9
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Dec 6 11:53:18 2019 +0100

    Separate cleanly per event attribute expressions

commit 80e5259674a011e864e65f13c77ce06f92f33b7f
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Dec 6 08:38:41 2019 +0100

    New test for chaining & read attributes

commit 97473daecd146b85eb3c232fffe8141bd0a7f3a1
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Dec 5 18:47:20 2019 +0100

    Add read attribute for loop settings (context evaluation)

commit a41a4a6095e9d5791fdbf3e26baf1d871cfc0fab
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Dec 5 15:30:56 2019 +0100

    Clean expression patching

commit 9af80d22f70443ef0eb1a8d29aef1d0b3bc64ca0
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Dec 5 11:45:06 2019 +0100

    Clarify compatibility code for spawner order & random implication

commit 0dcf774f623fb93eb7bc19b06407b88669472443
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Wed Dec 4 18:42:30 2019 +0100

    Add tricky case in test vfx & fix compatibility code

    TODO : Optimize it & reserve cleaner solution when change graphicTest result is expected

commit 92b5328ab0ea225d0dd86d1443af0e64bae1963e
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Wed Dec 4 16:49:42 2019 +0100

    *Up local test

commit 0984d8a89b5cc8e0daa79765b00392fa4dfff5d4
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Wed Dec 4 15:22:03 2019 +0100

    Detect & Compute partial evaluation

commit 2d9e7a250a0437c13e5f180e4feb4cc97d47aa5b
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Dec 3 15:16:29 2019 +0100

    Add spawner State Operator & SpawnCount (even if it's actually an attribute)

commit 0b1c1982a8ed4bb61182aa070561b7f6036bc07d
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Dec 3 15:04:04 2019 +0100

    Add spawner state accessor

commit adb1d6d66172f2d187b577facaf7b2aea4677d13
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Dec 3 11:24:20 2019 +0100

    Add VFXDataSpawner & Use this helper to retrieve read attribute per context while compiling

commit d43ad0e1395d0e51f3583ce9627a72006356e117
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 2 16:19:05 2019 +0100

    Store m_GlobalEventAttributes in VFXExpressionGraph : this data is used to patch VFXReadAttribute

commit 8a25b5fbed33569529d30379fce2acd4da7de88d
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Nov 29 16:14:32 2019 +0100

    Backup test asset (temporarily)

commit dcb3efaf885dbbdec317f5a42ace9ace336fded9
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Nov 28 16:37:48 2019 +0100

    WIP : experimenting new concept of Read Attribute expression

* Merge with vfx/staging
  • Loading branch information
PaulDemeulenaere authored and GitHub Enterprise committed Jun 2, 2020
1 parent db7d767 commit 8cab507
Show file tree
Hide file tree
Showing 42 changed files with 43,343 additions and 298 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void CheckDataPropagation_Link()
var spawnData = spawn.GetData();
var particleData = init.GetData();

Assert.IsNull(spawnData);
Assert.IsNotNull(spawnData);
Assert.IsNotNull(particleData);
Assert.AreEqual(particleData, update.GetData());
Assert.AreEqual(particleData, output0.GetData());
Expand Down

Large diffs are not rendered by default.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ EditorBuildSettings:
- enabled: 1
path: Packages/com.unity.testing.visualeffectgraph/Scenes/009_MultiCamera.unity
guid: 6d090a604691ff048bb6cd282208c7bd
- enabled: 1
path: Packages/com.unity.testing.visualeffectgraph/Scenes/009_ReadAttributeInSpawner.unity
guid: a6e75e236a616124d9604762b5402ac7
- enabled: 1
path: Assets/AllTests/VFXTests/GraphicsTests/009_MultiCamera_MotionVector.unity
guid: c3aad03df123b0b4fa26a6480fcbe297
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8cab507

Please sign in to comment.