Skip to content

[VFX] New ShaderGraph integration support in URP #5448

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 317 commits into from
Sep 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
317 commits
Select commit Hold shift + click to select a range
ef2d791
Remove the debug symbol pragma
johnpars Feb 23, 2021
f90951b
Ommit HLSL Object Types from GraphProperties struct
johnpars Feb 23, 2021
6d969b8
Fix up some nullrefs
johnpars Feb 23, 2021
f078b38
Filter the builtin VFX output settings (defer to material inspector)
johnpars Feb 25, 2021
d6c36be
Configure VFX Sort Mode by the shadergraph material blend mode
johnpars Feb 26, 2021
5b275a9
Syncronize material state on VFX compilation
johnpars Feb 26, 2021
2b1e585
Merge Master
johnpars Feb 26, 2021
d2f6a32
Resolve conflicts (mostly with the new custom interpolator work)
johnpars Feb 26, 2021
14ee993
Clean up the predicates for apply mesh modification
johnpars Mar 1, 2021
609cf3c
Support octagon crop factor
johnpars Mar 1, 2021
093b6ce
Implement SetupMaterial callback
julienf-unity Mar 2, 2021
77f0227
Add VFXMaterialSerializedSettings
julienf-unity Mar 3, 2021
21a0a2c
Serialize only hidden float properties + add editor test
julienf-unity Mar 3, 2021
3654462
Deactivate a check because it fails with subgraphs :(
julienf-unity Mar 3, 2021
9b41c53
Reformating
julienf-unity Mar 3, 2021
bda976f
Forgot to remove some code from old path for mesh output
julienf-unity Mar 3, 2021
0e394f0
Merge branch 'master' into HDRP/sg-vfx-integration-improved
johnpars Mar 3, 2021
d1d550d
Merge branch 'vfx/feature/material-serialization' into HDRP/sg-vfx-in…
johnpars Mar 3, 2021
52a65b2
Fix build of URP project
PaulDemeulenaere Mar 3, 2021
0256f8d
Initial commit of the new material mechanism on top of the new C++
johnpars Mar 3, 2021
242ddb0
Merge branch 'HDRP/sg-vfx-integration-improved' of https://github.com…
johnpars Mar 3, 2021
fdc2b29
Add a way to resync material without recompiling (test)
julienf-unity Mar 4, 2021
515b79a
Change ResyncMaterials editor API a bit
julienf-unity Mar 4, 2021
02b788f
Add a way to resync material without recompiling (test)
julienf-unity Mar 4, 2021
33acc43
Change ResyncMaterials editor API a bit
julienf-unity Mar 4, 2021
3b0fc6f
Update sub renderer to maintain dictioary instead to mimic material API
johnpars Mar 4, 2021
8c00f35
Use the new material settings to get the vfx blend mode
johnpars Mar 4, 2021
865b97c
Trigger full recompile on blend mode change
johnpars Mar 4, 2021
8269ee3
Fix "show generated" shader
julienf-unity Mar 5, 2021
658dacd
Formatting
julienf-unity Mar 5, 2021
a760fd4
Merge latest VFX branch to fix asset editor
johnpars Mar 5, 2021
b428bc4
Fix strips
johnpars Mar 5, 2021
4fdfed3
Fix particle strip custom texcoord
johnpars Mar 5, 2021
2c9a529
Add specific define for VFX & integrate toggle to m_SupportVFX
PaulDemeulenaere Mar 8, 2021
be109e4
Move target to actual VFXUniversalBinder (using USE_VFX)
PaulDemeulenaere Mar 8, 2021
22e7d2b
*WIP* Stupid migration from HD to Universal : fix build
PaulDemeulenaere Mar 8, 2021
a474563
*Add missing meta
PaulDemeulenaere Mar 8, 2021
445d869
*Add local test data
PaulDemeulenaere Mar 8, 2021
b70fe6e
Basic integration of PostProcessSubShader & GetFields
PaulDemeulenaere Mar 8, 2021
b2ae9c1
Remove redundant zero initialize
johnpars Mar 8, 2021
56d6111
*Basic template integration (keeping change as minimal in URP template)
PaulDemeulenaere Mar 9, 2021
aad0587
Merge SurfaceDescriptionInputs & FragInput concept for URP
PaulDemeulenaere Mar 9, 2021
093c87f
Updated the shared output settings with the shader graph property
JordanL8 Mar 9, 2021
876a92e
Fix SurfaceDescriptionInputs vs FragInputs in URP
PaulDemeulenaere Mar 9, 2021
5d6e232
Added support vfx graph checkbox to master stack docs
JordanL8 Mar 9, 2021
3c2bb2f
Fixed a bug with incorrect formatting for headers in the build
JordanL8 Mar 9, 2021
e82bded
Added vfx graph documentation
JordanL8 Mar 9, 2021
7f4661a
Use correct VertexDescriptionFunction
PaulDemeulenaere Mar 9, 2021
f6fe0d9
Merge branch 'HDRP/sg-vfx-integration-improved' of https://github.com…
johnpars Mar 9, 2021
26940f4
Rename Attribute => VFXAttribute
PaulDemeulenaere Mar 9, 2021
df09c5f
Fix UnlitPass (and only this one)
PaulDemeulenaere Mar 9, 2021
7cad459
Re-use attributes element for motion vectors
johnpars Mar 9, 2021
7bca281
Fix nulref for destroyed vfx material
johnpars Mar 9, 2021
68b5e87
Make Shadows/MV setup work with new material serialization setup
johnpars Mar 9, 2021
5b5882f
Integrate feedback for function prototype define
johnpars Mar 9, 2021
9d94fd3
Integrate UI feedback for VFX preference toggle
johnpars Mar 9, 2021
e1a1117
Integrate TransformMeshToElement & co
PaulDemeulenaere Mar 10, 2021
875f45f
Fix the artifacts for VFX Unlit
johnpars Mar 10, 2021
dc8388d
Add warning message box for transparent MV write disabled
johnpars Mar 10, 2021
f5b599b
Filter out MV + Shadows if disabled on context
johnpars Mar 10, 2021
93c9e5e
Hide the Visual Effect target
johnpars Mar 10, 2021
335b02f
Make context output name dynamic to shader graph ID
johnpars Mar 10, 2021
26f46c0
*Minor : fill expected content of VFXUniversalBinder.SetupMaterial & …
PaulDemeulenaere Mar 11, 2021
520b1ba
*test data
PaulDemeulenaere Mar 11, 2021
25ac3dd
*Other test data (will be removed)
PaulDemeulenaere Mar 11, 2021
292bbd4
Merge branch 'HDRP/sg-vfx-integration-improved' into HDRP/sg-vfx-inte…
PaulDemeulenaere Mar 11, 2021
11d674a
Fix & Sync after merge
PaulDemeulenaere Mar 11, 2021
c4ef07e
Fix copying & init varying
PaulDemeulenaere Mar 11, 2021
e313903
*Update test data
PaulDemeulenaere Mar 11, 2021
e019db2
Improve the dynamic context naming
johnpars Mar 11, 2021
2483e18
Fix nulref for resync of context name
johnpars Mar 11, 2021
70054ae
Revert previous artifact fix and implement it to handle unlit shadow …
johnpars Mar 11, 2021
2b79cd8
Hide the alpha threshold when in SG generation mode
johnpars Mar 11, 2021
c37d6de
Fix regression with legacy vfx target inspector
johnpars Mar 12, 2021
0cb6532
Invest the injection of TBN for unlit shadow matte depth pass
johnpars Mar 12, 2021
da14e9a
Omit DXR SubShader for VFX
johnpars Mar 12, 2021
8699729
Fix Shader.SetGlobalX
johnpars Mar 12, 2021
60ff3cb
Fix sorting for new SG VFX contexts
johnpars Mar 16, 2021
00127ef
Check if default material has the setting as sometimes this is not th…
johnpars Mar 16, 2021
fac2979
Validity check on the graph data for (currently) unsupported property…
johnpars Mar 16, 2021
5f22593
Add Gradients to the list of unsupported properties
johnpars Mar 17, 2021
2152f8f
Correct some of the wording of the generation warning message
johnpars Mar 17, 2021
ee4573b
Remove the hiding of the Visual Target and instead display warning bo…
johnpars Mar 18, 2021
d49925e
Add tooltips and new ui prototype that accepts a property tooltip
johnpars Mar 18, 2021
96dd9c3
Fix tangent support
johnpars Mar 18, 2021
dd8eba7
Update the info message box for visual effect target deprecation
johnpars Mar 19, 2021
43aeeb3
Disable sorting for strips
johnpars Mar 19, 2021
08cc749
Particle space as object space
johnpars Mar 22, 2021
0091153
Fix MV for object space is particle space
johnpars Mar 22, 2021
99d61dc
Make less generic function names
johnpars Mar 22, 2021
b186f61
Merge master (remove this PR's interpolation modifier since it has be…
johnpars Mar 22, 2021
ab63ef2
Fix the hasOnlyVFXTarget predicate to fix shader graph importing for VFX
johnpars Mar 23, 2021
5e95e3f
Fix
johnpars Mar 24, 2021
e5b75da
Changelog
johnpars Mar 24, 2021
cd96d3f
Merge branch 'HDRP/fix-rendering-debug-ui' into HDRP/sg-vfx-integrati…
johnpars Mar 24, 2021
d5bebb4
Merge branch 'master' into HDRP/sg-vfx-integration-improved
johnpars Mar 24, 2021
a250059
Fix output context system naming
johnpars Mar 24, 2021
e936a10
Fix an issue with vertex properties generation and assignment
johnpars Mar 24, 2021
0518a9b
Fix more issues with VFX vertex properties generation
johnpars Mar 24, 2021
47dd600
Add new shader graph generation test (more robust testing will be don…
johnpars Mar 24, 2021
2494ef2
Fix random node non-constant
johnpars Mar 25, 2021
3f5895d
Fix MV for Eye VFX
johnpars Mar 25, 2021
f51b665
Fix custom interpolator support for VFX
johnpars Mar 25, 2021
c86e228
Fix random node for vertex stage
johnpars Mar 26, 2021
937b26f
Initial work to generate a graph with external target inputs
johnpars Mar 26, 2021
5aa7905
Merge master in hopes of resolving yamato formatting failure
johnpars Mar 29, 2021
ae76833
Introduce IMaySupportVFX and removal of WorksWithVFX from Target API
johnpars Mar 29, 2021
8a7d91b
Introduce IRequiresVFXContext
johnpars Mar 29, 2021
0128cef
First past removal of static global vfx generation configuration in f…
johnpars Mar 29, 2021
dd934e9
Append VFX field dependencies in a safer way
johnpars Mar 29, 2021
6b78324
Bump shader graph importer version
johnpars Mar 29, 2021
4742e9b
Address some minor code comments
johnpars Mar 29, 2021
cd19be3
Fix preprocessor for VFX motion vector
johnpars Mar 30, 2021
3fd62d6
Fix test project build settings
johnpars Mar 31, 2021
1b5259a
Clean up predicate for HDRP VFX settings
johnpars Mar 31, 2021
3d34c1b
Fix HDRP field dependency assignment
johnpars Mar 31, 2021
444571a
Hide normal bending for shader graph generation mode
johnpars Mar 31, 2021
d78ca0f
Fix custom interpolator port properties
johnpars Mar 31, 2021
9938fe9
Introduction of IMayRequireTransform
johnpars Mar 31, 2021
93fa9cb
Add additional interface implementation for transformation matrix node
johnpars Apr 1, 2021
77b24ea
Initial commit of VFX matrix abstraction
johnpars Apr 1, 2021
5f53b92
Fix inverse world for local space VFX
johnpars Apr 1, 2021
7507229
Fix VFX orientation nodes that use the abstracted matrices
johnpars Apr 1, 2021
25d0c05
Fix strips
johnpars Apr 1, 2021
2d40eef
Add support for ObjectNode
johnpars Apr 1, 2021
f1875cf
SUpport CameraNode and extend IMayRequireTransform to return a list
johnpars Apr 1, 2021
b96c81d
Require transform for custom function node
johnpars Apr 2, 2021
a4d29f4
Rename Attributes to less generic InternalAttributesElement
johnpars Apr 2, 2021
b013321
Move VFX inputs to frag inputs substruct
johnpars Apr 2, 2021
bdded15
Fix generic struct name for strips
johnpars Apr 2, 2021
8fc2f75
Merge branch 'master' into HDRP/sg-vfx-integration-improved
johnpars Apr 6, 2021
b6d93cb
[CI] Updated pinned editor versions
Apr 7, 2021
a676571
Remove frag inputs vfx template
johnpars Apr 8, 2021
161915f
Fix the stubborn matrix define compiler bug
johnpars Apr 8, 2021
c9ca639
Merge branch 'HDRP/sg-vfx-integration-improved' of https://github.com…
johnpars Apr 8, 2021
ea3699c
Merge branch 'HDRP/sg-vfx-integration-improved' into HDRP/sg-vfx-inte…
PaulDemeulenaere Apr 11, 2021
f3ccf69
*Catching up on HDRP implementation
PaulDemeulenaere Apr 12, 2021
7dfeb3b
Fix model matrix override
PaulDemeulenaere Apr 12, 2021
b6f6ed5
*Push temporary debug symbols
PaulDemeulenaere Apr 13, 2021
c68e99e
Fix various DX12 + Vulkan issue for null geometry input (draw procedu…
johnpars Apr 20, 2021
1395d4d
Fix Vulkan related interpolator issue
johnpars Apr 20, 2021
0e7b871
Merge Master
johnpars Apr 20, 2021
63f7278
Fix interpolator for boolean type
johnpars Apr 20, 2021
5fedbe4
Merge branch 'HDRP/sg-vfx-integration-improved' into HDRP/sg-vfx-inte…
PaulDemeulenaere Apr 20, 2021
69ba752
interpolation modifiers without a semantic now generate one to avoid …
Apr 20, 2021
8034ae7
Fix the graphics test
johnpars Apr 20, 2021
db66805
Catching up on hdrp implementation
PaulDemeulenaere Apr 20, 2021
3448010
*Update test data
PaulDemeulenaere Apr 20, 2021
6ef3efd
Workaround infinite compilation loop (to investigate !!)
PaulDemeulenaere Apr 20, 2021
017d7bc
Adding an error when NeedSync always returns true
PaulDemeulenaere Apr 20, 2021
8d5966d
Merge remote-tracking branch 'public/HDRP/sg-vfx-integration-improved…
PaulDemeulenaere Apr 20, 2021
1977e6f
Merge remote-tracking branch 'origin/master' into sg/fix-intmod-seman…
Apr 20, 2021
766242b
accidentally mixed up some fields.
Apr 20, 2021
8bdb152
interpolation function wasn't updated correctly.
Apr 20, 2021
6c5a9f5
Merge Shader Graph hotfix for interpolation modifiers
johnpars Apr 20, 2021
3d3d234
Merge branch 'HDRP/sg-vfx-integration-improved' into HDRP/sg-vfx-inte…
PaulDemeulenaere Apr 21, 2021
91d6d81
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere May 14, 2021
9cf0974
*Fix after merge
PaulDemeulenaere May 14, 2021
fe6fd2a
Fix build after merge
PaulDemeulenaere May 14, 2021
e058cdf
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere Jul 18, 2021
9fa1ba2
Clean Some code to anticipate factorization
PaulDemeulenaere Jul 20, 2021
c986c73
Fix hacky workaround
PaulDemeulenaere Jul 20, 2021
c93b788
Move all common code from VFXHDRPSubTarget to VFXSubTarget
PaulDemeulenaere Jul 20, 2021
db514b5
Minor : Use double face culling in _A.shadergraph
PaulDemeulenaere Jul 20, 2021
19a1b2b
*Add URP target to 35_ShaderGraphGenerationFTP
PaulDemeulenaere Jul 20, 2021
88fd0c7
Move 35_ShaderGraphGenerationFTP to common asset
PaulDemeulenaere Jul 20, 2021
60ea4d4
Move IRequireVFXContext to global UniversalSubTarget
PaulDemeulenaere Jul 20, 2021
22bb080
Add forward pass integration for VFX
PaulDemeulenaere Jul 20, 2021
37c7606
*Revert unexpected change in LitSubTarget
PaulDemeulenaere Jul 20, 2021
fbfbb8f
Easier integration using BuildSurfaceDescription & existing BuildVary…
PaulDemeulenaere Jul 20, 2021
d68df42
Use BuildSurfaceDescription instead of BuildSurfaceDescriptionInputs/…
PaulDemeulenaere Jul 20, 2021
f5dfb12
Fix missing vfx graph integration in PassMesh.template
PaulDemeulenaere Jul 21, 2021
d4f5eb9
Remove unexpected change from PassMesh.template
PaulDemeulenaere Jul 21, 2021
5bdf738
Fix shadow compilation
PaulDemeulenaere Jul 21, 2021
335ddc4
Fix case 1349894
PaulDemeulenaere Jul 21, 2021
b2646fd
*Commit Test Data (will be deleted)
PaulDemeulenaere Jul 21, 2021
b90c5e8
Add ShaderGUI excluder in BaseShaderGUI for URP
PaulDemeulenaere Jul 22, 2021
3888719
*Add note about the conflicting color
PaulDemeulenaere Jul 22, 2021
021b5b3
Move 35_ShaderGraphGeneration to HDRP (will actually duplicate in URP)
PaulDemeulenaere Jul 22, 2021
68549e8
Copy 35_ShaderGenerationFTP in URP project
PaulDemeulenaere Jul 22, 2021
ff18143
Porting 35_FTP test : Legacy SG migration
PaulDemeulenaere Jul 22, 2021
2b8a0ae
Migrate Vertex Rotation test
PaulDemeulenaere Jul 22, 2021
ae283a8
Update Strips VFX & Other Space VFX
PaulDemeulenaere Jul 22, 2021
1873a91
Simple temp strip test
PaulDemeulenaere Jul 22, 2021
1e37ff6
Rename "Attributes" in "VFXAttribute"
PaulDemeulenaere Jul 22, 2021
7ae9ec9
Clean deprecated code / comment
PaulDemeulenaere Jul 22, 2021
4f3ebc0
*WIP* Investigation about failure to reach the object space
PaulDemeulenaere Jul 22, 2021
25353d1
Revert "Clean deprecated code / comment"
PaulDemeulenaere Jul 23, 2021
25cdc12
Fix World/Element consideration
PaulDemeulenaere Jul 23, 2021
c00bf94
Revert "Revert "Clean deprecated code / comment""
PaulDemeulenaere Jul 23, 2021
3b1a8f6
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere Jul 27, 2021
8cbb5d0
Fix build after merge
PaulDemeulenaere Jul 27, 2021
0280d89
Fix custom interpolator in URP
PaulDemeulenaere Jul 27, 2021
ccc8296
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere Jul 28, 2021
9b2d20a
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere Aug 16, 2021
de91273
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere Aug 19, 2021
9d2f087
Fix missing integration to revert object matrice override in URP
PaulDemeulenaere Aug 19, 2021
8b9371c
Rename ShaderGraphGenerationFTP
PaulDemeulenaere Aug 23, 2021
9d2ba9f
*Add reference image before cleaning TODOPAUL
PaulDemeulenaere Aug 23, 2021
88d899b
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere Aug 23, 2021
00d9da6
Proper way to support fragInputs variant from HDRP
PaulDemeulenaere Aug 24, 2021
816b1d1
Remove TODOPAUL
PaulDemeulenaere Aug 24, 2021
1970d87
Proper way to filter unsupported target
PaulDemeulenaere Aug 24, 2021
cc2a0e3
Remove FragInputsVFX, not needed in URP
PaulDemeulenaere Aug 24, 2021
75c7fc1
Remove deprecated comment
PaulDemeulenaere Aug 24, 2021
eade2a3
Factorize VisualEffectMatrices moving it to VFX package
PaulDemeulenaere Aug 24, 2021
02cb1ee
Removing completly the fragsInput declaration
PaulDemeulenaere Aug 24, 2021
7b77afa
Minor : add comment
PaulDemeulenaere Aug 24, 2021
b74fd0f
Minor : Remove VaryingsMeshType & use directly Varyings
PaulDemeulenaere Aug 24, 2021
5487808
*Add note (doesn't work on vulkan/dx12 -_-')
PaulDemeulenaere Aug 24, 2021
0a053b4
Move ApplyCameraTranslationToMatrix to VFXCommon.hlsl
PaulDemeulenaere Aug 24, 2021
531fff8
Workaround fix when a property is named "_Color"
PaulDemeulenaere Aug 24, 2021
c9475ea
Clean TODOPAUL
PaulDemeulenaere Aug 24, 2021
3608cdb
Move IsGraphDataValid to common srp binder implementation
PaulDemeulenaere Aug 24, 2021
da0fd67
Correct URPBinder implementation
PaulDemeulenaere Aug 24, 2021
c860d4a
Remove old workaround
PaulDemeulenaere Aug 24, 2021
59d82e2
Remove temp test data
PaulDemeulenaere Aug 24, 2021
574e5d0
Add test target compatibility (same behavior than HDRP)
PaulDemeulenaere Aug 24, 2021
2cadcdb
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere Aug 24, 2021
c11b91f
Fix null geometry support
PaulDemeulenaere Aug 25, 2021
f9d801e
Add TODOPAUL
PaulDemeulenaere Aug 25, 2021
a9df082
Use kUberTemplatePath for all UniversalTarget pass used in UniversalS…
PaulDemeulenaere Aug 26, 2021
78eae3f
Fix decal compilation when creating a new SG
PaulDemeulenaere Aug 26, 2021
b2088d9
Clean TODOPAUL about multiply blendState
PaulDemeulenaere Aug 26, 2021
64c9440
*Add reference image for player & OSX editor
PaulDemeulenaere Aug 26, 2021
d68357d
Move template from SRP to VFX implementation \o/
PaulDemeulenaere Aug 27, 2021
7846078
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere Aug 30, 2021
61ebca1
Fix case https://fogbugz.unity3d.com/f/cases/1361601/
PaulDemeulenaere Aug 31, 2021
4ff7190
Fix issue with allow material override set to false
PaulDemeulenaere Sep 1, 2021
42b8498
Minor: Safest way of filter UniversalTarget
PaulDemeulenaere Sep 2, 2021
6a69bca
Handle correctly MaterialOffset & CastShadow override
PaulDemeulenaere Sep 2, 2021
da991a5
Fix target selection
PaulDemeulenaere Sep 2, 2021
434d7df
Suggestion from @gabrieldelacruz: better format
PaulDemeulenaere Sep 3, 2021
8e3ae42
Revert unexpected change in BaseShaderGUI.cs
PaulDemeulenaere Sep 3, 2021
f4b9e05
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere Sep 3, 2021
1f1b261
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere Sep 3, 2021
c3a2422
Add vulkan image reference
PaulDemeulenaere Sep 3, 2021
0a1e173
*Update changelog.md
PaulDemeulenaere Sep 3, 2021
7721e4b
Minor: Fix tab vs. space
PaulDemeulenaere Sep 3, 2021
0c43a5a
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere Sep 3, 2021
5ccf554
*Update documentation
PaulDemeulenaere Sep 6, 2021
8b90b7b
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere Sep 7, 2021
bbed247
Implement GetShaderName in URP
PaulDemeulenaere Sep 7, 2021
e37845b
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere Sep 8, 2021
54b2a5b
Minor suggestion from @alex-vazquez Thanks
PaulDemeulenaere Sep 8, 2021
d821149
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere Sep 10, 2021
5d3d140
Reapply changes from https://github.com/Unity-Technologies/Graphics/p…
PaulDemeulenaere Sep 10, 2021
dcda9b7
*Update URP test to integrate sample texture
PaulDemeulenaere Sep 10, 2021
3be3f27
Move "VFX: New shadergraph support directly on Universal target" to 1…
PaulDemeulenaere Sep 15, 2021
481f1e5
Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp
PaulDemeulenaere Sep 15, 2021
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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"m_SGVersion": 2,
"m_SGVersion": 3,
"m_Type": "UnityEditor.ShaderGraph.GraphData",
"m_ObjectId": "5b72b3ed6ff94e1dbadc4c2b9314cf05",
"m_Properties": [
Expand Down Expand Up @@ -38,6 +38,12 @@
}
],
"m_Keywords": [],
"m_Dropdowns": [],
"m_CategoryData": [
{
"m_Id": "76e42e16a21945d88fa18d613ddffcb6"
}
],
"m_Nodes": [
{
"m_Id": "525da8ca6a015b8ebbfb5dd0d578794c"
Expand Down Expand Up @@ -362,10 +368,11 @@
"serializedMesh": {
"m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
"m_Guid": ""
}
},
"preventRotation": false
},
"m_Path": "Shader Graphs",
"m_ConcretePrecision": 0,
"m_GraphPrecision": 0,
"m_PreviewMode": 2,
"m_OutputNode": {
"m_Id": ""
Expand Down Expand Up @@ -540,9 +547,13 @@
"m_GuidSerialized": "14771a08-6dbe-46a8-b6ac-dbe1ad8ea942"
},
"m_Name": "TextureSlice",
"m_DefaultRefNameVersion": 0,
"m_RefNameGeneratedByDisplayName": "",
"m_DefaultReferenceName": "Vector1_61C7B6DF",
"m_OverrideReferenceName": "TextureSlice",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",
"m_Precision": 0,
"overrideHLSLDeclaration": false,
"hlslDeclarationOverride": 0,
Expand Down Expand Up @@ -576,9 +587,13 @@
"m_GuidSerialized": "140186c3-e9ce-4659-8272-132b9d411200"
},
"m_Name": "Alpha",
"m_DefaultRefNameVersion": 0,
"m_RefNameGeneratedByDisplayName": "",
"m_DefaultReferenceName": "Vector1_FDFDB2D",
"m_OverrideReferenceName": "Alpha",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",
"m_Precision": 0,
"overrideHLSLDeclaration": false,
"hlslDeclarationOverride": 0,
Expand Down Expand Up @@ -647,9 +662,13 @@
"m_GuidSerialized": "98328d96-0098-4b8f-91a4-14d2fae21028"
},
"m_Name": "Texture2D Array",
"m_DefaultRefNameVersion": 0,
"m_RefNameGeneratedByDisplayName": "",
"m_DefaultReferenceName": "Texture2DArray_3BA5FE5B",
"m_OverrideReferenceName": "",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",
"m_Precision": 0,
"overrideHLSLDeclaration": false,
"hlslDeclarationOverride": 0,
Expand Down Expand Up @@ -898,9 +917,13 @@
"m_GuidSerialized": "3d5dd2b6-1b28-4124-8f6d-5ae8c2236eba"
},
"m_Name": "Normals",
"m_DefaultRefNameVersion": 0,
"m_RefNameGeneratedByDisplayName": "",
"m_DefaultReferenceName": "Texture2D_47BCFF26",
"m_OverrideReferenceName": "Normals",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",
"m_Precision": 0,
"overrideHLSLDeclaration": false,
"hlslDeclarationOverride": 0,
Expand All @@ -909,6 +932,8 @@
"m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
"m_Guid": ""
},
"isMainTexture": false,
"useTilingAndOffset": false,
"m_Modifiable": true,
"m_DefaultType": 0
}
Expand Down Expand Up @@ -1021,9 +1046,13 @@
"m_GuidSerialized": "93f62363-7e2e-4102-9dde-f16d8ca9a868"
},
"m_Name": "NormalStrength",
"m_DefaultRefNameVersion": 0,
"m_RefNameGeneratedByDisplayName": "",
"m_DefaultReferenceName": "Vector1_3A2EC07",
"m_OverrideReferenceName": "NormalStrength",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",
"m_Precision": 0,
"overrideHLSLDeclaration": false,
"hlslDeclarationOverride": 0,
Expand Down Expand Up @@ -1069,9 +1098,13 @@
"m_GuidSerialized": "1bd333e3-2b9c-421b-8cfd-6351bd35211f"
},
"m_Name": "VFXTime",
"m_DefaultRefNameVersion": 0,
"m_RefNameGeneratedByDisplayName": "",
"m_DefaultReferenceName": "",
"m_OverrideReferenceName": "VFXTime",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",
"m_Precision": 0,
"overrideHLSLDeclaration": false,
"hlslDeclarationOverride": 0,
Expand Down Expand Up @@ -1376,7 +1409,8 @@
"m_SerializableColors": []
},
"m_TextureType": 0,
"m_NormalMapSpace": 0
"m_NormalMapSpace": 0,
"m_EnableGlobalMipBias": true
}

{
Expand Down Expand Up @@ -1489,6 +1523,48 @@
"m_Channel": 0
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.CategoryData",
"m_ObjectId": "76e42e16a21945d88fa18d613ddffcb6",
"m_Name": "",
"m_ChildObjectList": [
{
"m_Id": "ef37b7946fdca68b906b753d5b79192c"
},
{
"m_Id": "9de5f4a2023970829c20155062bcc0df"
},
{
"m_Id": "3fb32aa957fef385b31cf457c12ce18d"
},
{
"m_Id": "4e9e9578d27c3e8194775bf79a226b24"
},
{
"m_Id": "2460f8e8cb948988be7b17bbd3ec0648"
},
{
"m_Id": "1024545e1c66688392d0e81441668607"
},
{
"m_Id": "e0b8736d9984de80a0891446ab2f68e2"
},
{
"m_Id": "8a4b9f4fd5662d828f76bac15365708f"
},
{
"m_Id": "1a3481478340918ca46510c59a1fd132"
},
{
"m_Id": "e0b7a0fb26627f8a90574a37bfd46ef3"
},
{
"m_Id": "5013029479e649839069437352c93cc2"
}
]
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
Expand Down Expand Up @@ -1626,9 +1702,13 @@
"m_GuidSerialized": "a9f8093e-e241-4a55-b1d0-037301857fda"
},
"m_Name": "Smoothness",
"m_DefaultRefNameVersion": 0,
"m_RefNameGeneratedByDisplayName": "",
"m_DefaultReferenceName": "Vector1_11918013",
"m_OverrideReferenceName": "Smoothness",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",
"m_Precision": 0,
"overrideHLSLDeclaration": false,
"hlslDeclarationOverride": 0,
Expand Down Expand Up @@ -1719,9 +1799,13 @@
"m_GuidSerialized": "f9127805-64af-4885-ae2a-e0ef065023b4"
},
"m_Name": "Texture2D",
"m_DefaultRefNameVersion": 0,
"m_RefNameGeneratedByDisplayName": "",
"m_DefaultReferenceName": "Texture2D_4AF90627",
"m_OverrideReferenceName": "",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",
"m_Precision": 0,
"overrideHLSLDeclaration": false,
"hlslDeclarationOverride": 0,
Expand All @@ -1730,6 +1814,8 @@
"m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"276d9e395ae18fe40a9b4988549f2349\",\"type\":3}}",
"m_Guid": ""
},
"isMainTexture": false,
"useTilingAndOffset": false,
"m_Modifiable": true,
"m_DefaultType": 0
}
Expand Down Expand Up @@ -1817,7 +1903,8 @@
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
}
},
"m_EnableGlobalMipBias": false
}

{
Expand Down Expand Up @@ -1983,7 +2070,8 @@
"m_SerializableColors": []
},
"m_TextureType": 1,
"m_NormalMapSpace": 0
"m_NormalMapSpace": 0,
"m_EnableGlobalMipBias": true
}

{
Expand Down Expand Up @@ -2335,9 +2423,13 @@
"m_GuidSerialized": "65c04bbf-f700-47de-8630-f011c1aa9e12"
},
"m_Name": "Rotate",
"m_DefaultRefNameVersion": 0,
"m_RefNameGeneratedByDisplayName": "",
"m_DefaultReferenceName": "Boolean_582FD63D",
"m_OverrideReferenceName": "DoRotate",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",
"m_Precision": 0,
"overrideHLSLDeclaration": false,
"hlslDeclarationOverride": 0,
Expand All @@ -2353,9 +2445,13 @@
"m_GuidSerialized": "45617ab4-4dd4-45f0-8952-b063fcf925e2"
},
"m_Name": "Metallic",
"m_DefaultRefNameVersion": 0,
"m_RefNameGeneratedByDisplayName": "",
"m_DefaultReferenceName": "Vector1_CE8EA66A",
"m_OverrideReferenceName": "Metallic",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",
"m_Precision": 0,
"overrideHLSLDeclaration": false,
"hlslDeclarationOverride": 0,
Expand Down Expand Up @@ -2446,9 +2542,13 @@
"m_GuidSerialized": "dfa24336-cabf-43f9-b98d-9beec5d999bd"
},
"m_Name": "Color",
"m_DefaultRefNameVersion": 0,
"m_RefNameGeneratedByDisplayName": "",
"m_DefaultReferenceName": "Color_1DAF5C7C",
"m_OverrideReferenceName": "",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",
"m_Precision": 0,
"overrideHLSLDeclaration": false,
"hlslDeclarationOverride": 0,
Expand All @@ -2459,6 +2559,7 @@
"b": 0.0,
"a": 0.0
},
"isMainColor": false,
"m_ColorMode": 0
}

Expand Down
Loading