Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
208 commits
Select commit Hold shift + click to select a range
f4de605
Exposre SG editor assemblies to VFX so that it can use its code gener…
johnpars Dec 8, 2020
5661267
Add a new path to VFX shader generation to use ShaderGraph generator.
johnpars Dec 8, 2020
d5a4778
Add a new VFX compatibility interface and have HDTarget implement it.
johnpars Dec 9, 2020
53324e4
Override pass creation
johnpars Dec 9, 2020
8d7c738
Splicing support for VFX cbuffer properties
johnpars Dec 9, 2020
0c8b519
Generate VFX Shader Properties for Shader Graph
johnpars Dec 9, 2020
863b766
Add VFX sub shader post processing, attributes struct generation from…
johnpars Dec 10, 2020
1474497
Enable debug symbols
johnpars Dec 10, 2020
b29e639
Source attributes struct generation from context
johnpars Dec 11, 2020
91a47c8
Begin moving static function into a VFX helper class
johnpars Dec 11, 2020
ab6511f
Revert previous commit, was causing unexpected issues and will be dea…
johnpars Dec 11, 2020
3f9e1df
Introduce Additional Commands for VFX splice support
johnpars Dec 11, 2020
d6383ad
Initial usage of additional commands within the generator
johnpars Dec 11, 2020
41d82ea
Add the apply VFX modification
johnpars Dec 11, 2020
cf850d0
Add block generation
johnpars Dec 11, 2020
b09c26f
Merge Master
johnpars Jan 4, 2021
6f3fdc2
Append VFX Interpolators to the VaryingMeshToPS
johnpars Jan 5, 2021
39ca061
Interpolants generation
johnpars Jan 5, 2021
3ffa73b
Add interpolation modifier support for struct field generation
johnpars Jan 5, 2021
ba95a01
Initial generation of VFX FragInputs
johnpars Jan 7, 2021
5d47b67
Generate frag inputs assignment, surface description generation, intr…
johnpars Jan 14, 2021
58a8e5e
Splice vfx space define and fix VFX world position
johnpars Jan 14, 2021
bf3addf
Accidentally was including the local graphics package
johnpars Jan 14, 2021
3e2022d
Cleanup unused function in generation util
johnpars Jan 19, 2021
0866bed
Initial progress to configure render state with a transient material
johnpars Jan 22, 2021
94c7ec7
Introduction of serialized truncated material
johnpars Jan 26, 2021
baf3d70
Invalidate the context on material change
johnpars Jan 26, 2021
1fff258
Introduce VFX ShaderGraph GUI
johnpars Jan 26, 2021
c1317a6
Introduce VFX material collection to manage multiple materials per sy…
johnpars Jan 28, 2021
3f4ebd7
Manually serialize material render state properties into the vfx asset
johnpars Jan 28, 2021
a2dd151
Provide comment on vfx material mechanism
johnpars Jan 28, 2021
227ca78
Append the render state mapping to the additional parameters
johnpars Jan 28, 2021
a6c6748
Force material setup in case of no keywords
johnpars Jan 28, 2021
4a5e6f3
Configure CPU Expression mapping of material render state props
johnpars Jan 28, 2021
7fadceb
Write the render state properties to the task parameters
johnpars Jan 28, 2021
211ab6d
Inject the remaining material state info (pass, queue)
johnpars Jan 31, 2021
5b73242
Begin to collapse the VFX code into a feature so that we can merge in…
johnpars Feb 1, 2021
df00b7e
Remove the explicit vfx property declaraction in SG generator in favo…
johnpars Feb 1, 2021
f583724
merge everything into ShaderPass.template and remove ShaderPassVFX.te…
johnpars Feb 1, 2021
5801933
Make PostProcessSubShaderVFX reuseable
johnpars Feb 4, 2021
be93c71
Add support for all HDRP sub targets
johnpars Feb 5, 2021
8245aa6
Merge master for bugfixes
johnpars Feb 5, 2021
392fae9
Add vfx support option to system data
johnpars Feb 8, 2021
9ad3c1e
Add the supports VFX toggle to HDRP target
johnpars Feb 8, 2021
f8c1979
Only offer the vfx graph support if the preference is enabled
johnpars Feb 9, 2021
ee18527
Reorganize some VFX HDRP files into the proper directory
johnpars Feb 9, 2021
46f24d3
Splice all VFX context defines
johnpars Feb 9, 2021
789f9a3
Fixup the context inspector if no shadergraph is linked
johnpars Feb 9, 2021
6086114
Begin initial support for the various VFX primitives
johnpars Feb 9, 2021
1fba1ce
Begin to use generation predicates to support the primitive types
johnpars Feb 9, 2021
47fd079
Do not append fields if not configured
johnpars Feb 9, 2021
608f4cd
Initial support for planar primitives + particle strip quads
johnpars Feb 9, 2021
9a90eff
Support the rest of the planar primitives (UV, Normal, Position)
johnpars Feb 10, 2021
20d983c
Skip the lit/unlit check if the SGVFX asset is marked for SG generation
johnpars Feb 10, 2021
18f932d
Add back the support for debug
johnpars Feb 11, 2021
bc3c765
Merge master for latest vfx staging
johnpars Feb 11, 2021
768ccee
Small change to regain compatibility with merged vfx work
johnpars Feb 11, 2021
67ad00e
Initial commit adding vertex transformation flow for VFX (motion vect…
johnpars Feb 17, 2021
77e5204
Refactor vertex transformations so that particle space is considered …
johnpars Feb 17, 2021
617c907
Reintroduce culling for dead particle vertices
johnpars Feb 17, 2021
debc4b2
Splice in the last of the VFX defines (source/current directives)
johnpars Feb 17, 2021
63dd2aa
Refactor for attributeselement container (to pass around strip data e…
johnpars Feb 17, 2021
8ec0e48
Disable motion vectors on a material level
johnpars Feb 17, 2021
da73ba8
Fixed issue with VFXTarget not using the previous generation path
johnpars Feb 18, 2021
a168f5e
Integrate SG vertex properties for VFX
johnpars Feb 18, 2021
b4c60fd
Support vertex graph support for per-element data
johnpars Feb 19, 2021
161a48b
Sanitize branch of stale functionality (no longer used).
johnpars Feb 22, 2021
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
b2ae9c1
Remove redundant zero initialize
johnpars Mar 8, 2021
093c87f
Updated the shared output settings with the shader graph property
JordanL8 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
f6fe0d9
Merge branch 'HDRP/sg-vfx-integration-improved' of https://github.com…
johnpars 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
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
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
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
69ba752
interpolation modifiers without a semantic now generate one to avoid …
Apr 20, 2021
8034ae7
Fix the graphics test
johnpars 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
78dc9f1
Temporary: Statically define particle matrices until shader graph hot…
johnpars Apr 21, 2021
2fa130e
Update test scene and reference images
johnpars Apr 22, 2021
e555f92
Always modify the VFX vertex invocation (regardless of graphics API)
johnpars Apr 22, 2021
0cba360
Revert the SG hotfix for now
johnpars Apr 22, 2021
ee16f4c
Merge master to hopefully make the nightly yamato green
johnpars Apr 23, 2021
b864478
Material inspector unfolded by default
johnpars Apr 23, 2021
38cc25d
Merge branch 'HDRP/sg-vfx-integration-improved' of https://github.com…
johnpars Apr 23, 2021
63615af
Update graphics test images and settings
johnpars Apr 23, 2021
8a20d46
Add the FTP test for SG generation, with hopes that it will be more s…
johnpars Apr 23, 2021
6423145
Add the FTP test for SG generation, with hopes that it will be more s…
johnpars Apr 23, 2021
be98796
Merge latest
johnpars Apr 23, 2021
b3d1335
update FTP test reference images
johnpars Apr 23, 2021
e223cc3
Fix instance ID for XR
johnpars Apr 26, 2021
dc0f89b
Remove debug symbols from the shader template
johnpars Apr 26, 2021
ccfb846
Add the package version preprocessor for the deprecated VFXTarget
johnpars Apr 28, 2021
5e335c0
Merge branch 'HDRP/sg-vfx-integration-improved' of https://github.com…
johnpars Apr 28, 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

namespace UnityEditor.VFX.Test
{
class DummyMaterialSettingsContainerModel : VFXModel
{
public VFXMaterialSerializedSettings materialSettings;
}
}

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
Shader "Hidden/MaterialPropertiesTest"
{
Properties
{
[HideInInspector]
floatProperty1("property1", Float) = 1.0
[HideInInspector]
floatProperty2("property2", Float) = 2.0
floatProperty3_Visible("property3", Float) = 3.0
[HideInInspector, PerRendererData]
floatProperty4_PerRenderer("property4", Float) = 4.0
vectorProperty("property5", Vector) = (5.1,5.2,5.3,5.4)
}

SubShader
{
Pass
{
HLSLPROGRAM
#pragma vertex vert
#pragma fragment frag

float4 vert() : SV_POSITION
{
return (float4)0;
}

float4 frag(float4 i : SV_POSITION) : SV_Target
{
return (float4)0;
}
ENDHLSL
}
}
}

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

Loading