Skip to content

[VFX] small uss fixes + package description #1324

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 86 commits into from
Jul 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
645a10e
property attributes not serialized (#253)
julienf-unity Mar 23, 2020
f0e09f2
Remove shader warnings (#261)
julienf-unity Mar 27, 2020
ba38685
Vfx/feature/filter enum (#243)
iTris666 Mar 30, 2020
c0e13e5
Remove raytracing enumerator filter as it was removed from HDRP enum
julienf-unity Mar 31, 2020
6aac856
Remove irrelevant render queues from some HDRP outputs (#263)
julienf-unity Apr 3, 2020
d64a8bd
Fixed Flipbook Texture Names
peeweek Apr 17, 2020
45ab417
Update CHANGELOG.md
Apr 20, 2020
257a4de
Merge pull request #9 from unity/vfx/fix/flipbook-asset-names
Apr 20, 2020
8c9c4b7
Merge remote-tracking branch 'srp/master' into vfx/staging
julienf-unity Apr 20, 2020
3734160
Fix exception when creating new category on new visual effect asset.
iTris666 Apr 21, 2020
6f4f572
Forward port - Dont remove suboutputs objects if it cannot be deseria…
julienf-unity Apr 22, 2020
b0c452e
Merge branch 'master' into vfx/staging
PaulDemeulenaere Apr 24, 2020
c63e6d9
Fix to graft : support for flag enum in inspector
PaulDemeulenaere Apr 29, 2020
3390036
*Update changelog
PaulDemeulenaere Apr 29, 2020
f1f7f8c
Merge pull request #11 from unity/vfx/fix/new-category
iTris666 Apr 29, 2020
4c49282
Merge pull request #13 from unity/vfx/fix/enum-flag-in-inspector
PaulDemeulenaere Apr 30, 2020
f26a487
Revert "Fix Enum Flag" (#15)
PaulDemeulenaere Apr 30, 2020
18803f2
"Fix Enum Flag" (#16)
PaulDemeulenaere Apr 30, 2020
adfdce9
Fix for Initial Event field height, (#17)
iTris666 May 4, 2020
dd47610
Merge remote-tracking branch 'srp/master' into vfx/staging
julienf-unity May 4, 2020
9b568b6
Vfx/fix colorfield height (#19)
iTris666 May 13, 2020
c0f5529
Mesh Sampling (revival) (#1)
PaulDemeulenaere May 14, 2020
b8ec5e0
Update experimental disclaimers (#367)
JordanL8 May 14, 2020
99aacf9
Merge branch 'vfx/staging' of github.com:Unity-Technologies/Graphics …
julienf-unity May 14, 2020
1405b00
[HDRP] MSAA & MotionVector (#12)
PaulDemeulenaere May 14, 2020
0779451
Allow an object slot to have null as its value (#25)
iTris666 May 14, 2020
990ee1c
Vfx/fix/prevent capacity change locked (#24)
iTris666 May 14, 2020
2ad32f1
Merge branch 'master' into vfx/staging
PaulDemeulenaere May 14, 2020
e7f360c
*Update all vfx (had to do it manually...)
PaulDemeulenaere May 14, 2020
ba1d189
Restore missing enty in hdrp changelog (bad resolve conflict from me)
PaulDemeulenaere May 14, 2020
103d2d3
Fix 1233044 - capacity cannot be zero (#21)
julienf-unity May 14, 2020
3463f0c
Vfx/fix/param order (#22)
iTris666 May 14, 2020
3735779
Fix minor issue with VFXPreviousPositionBinder.cs (#23)
PaulDemeulenaere May 14, 2020
fa9dfce
Vfx/fix/sgoperator create context drag (#28)
iTris666 May 18, 2020
0654337
Vfx/fix/context no blocks (#27)
iTris666 May 18, 2020
733b227
PropertyBinder : Minor Fixes (#29)
PaulDemeulenaere May 18, 2020
657a61f
Add Update Modes & Time Access (revival) (#4)
PaulDemeulenaere May 25, 2020
db7d767
Fix editor test
PaulDemeulenaere May 25, 2020
8cab507
Read Attribute in Spawn Context (#6)
PaulDemeulenaere Jun 2, 2020
907b889
Merge branch 'master' into vfx/staging
julienf-unity Jun 7, 2020
2f49340
Update VFX
julienf-unity Jun 7, 2020
78ee098
Misc small fixes (#36)
julienf-unity Jun 11, 2020
eef590a
Test for Override resetted (#26)
PaulDemeulenaere Jun 11, 2020
66aa776
Add test to cover https://fogbugz.unity3d.com/f/cases/1232862/ (#20)
PaulDemeulenaere Jun 11, 2020
7ae1939
New Test : total time is sum of delta time (#7)
PaulDemeulenaere Jun 12, 2020
e7e4645
Merge branch 'master' into vfx/staging
PaulDemeulenaere Jun 12, 2020
ecfc936
Merge branch 'master' into vfx/staging
PaulDemeulenaere Jun 15, 2020
ab25368
[Fix] Disable reset option (#41)
PaulDemeulenaere Jun 15, 2020
d8e8fca
Fix minor issue with PreviousPropertyBinder (bis) (#31)
PaulDemeulenaere Jun 15, 2020
d5c8f55
Fix culture issues when generating attributes defines in shaders (#40)
julienf-unity Jun 15, 2020
6bf79b5
[PropertyBinder] Move Update to LateUpdate (#38)
PaulDemeulenaere Jun 15, 2020
687b56c
Call resyncslots on shadergraph dependent models. (#10)
iTris666 Jun 15, 2020
f376be5
update vfx and settings
julienf-unity Jun 15, 2020
f4a5b2f
Renable 009_MultiCamera in URP project
PaulDemeulenaere Jun 15, 2020
e0c4e37
Easy Wins (Small Workflow / Cosmetic fixes) (#37)
Jun 16, 2020
9f60bf0
Vfx/docs/compatability disclaimer (#43)
Jun 16, 2020
c4865df
Save a specific vfx asset and its sugraphs only (#35)
iTris666 Jun 18, 2020
f4bc4bc
Remove some unecessary compilation (not all) (#46)
julienf-unity Jun 24, 2020
a3bc32d
New TransformVector4 and GetTextureDimensions operators (#18)
julienf-unity Jun 26, 2020
e11292a
Merge remote-tracking branch 'graphics/master' into vfx/staging
julienf-unity Jun 29, 2020
eb3d805
Merge remote-tracking branch 'graphics/master' into vfx/staging
julienf-unity Jun 29, 2020
6ff5aff
Output Event (#5)
PaulDemeulenaere Jun 29, 2020
2b603be
*Fix build
PaulDemeulenaere Jun 29, 2020
0dbb008
Vfx/feature/enum parameter (#8)
iTris666 Jun 29, 2020
0940ed3
Merge branch 'vfx/staging' of github.cds.internal.unity3d.com:unity/v…
julienf-unity Jun 29, 2020
17cf298
Merge branch 'master' into vfx/staging
julienf-unity Jun 29, 2020
4d05d31
Merge remote-tracking branch 'graphics/virtualtexturing-shader-lib-fi…
julienf-unity Jun 30, 2020
5fc843d
Vfx/docs/new operator docs (#50)
Jun 30, 2020
b78a9a6
Fix creation of StringPropertyRM (#51)
iTris666 Jun 30, 2020
30f8704
Fix input of event emitting block beeing to small because of output
iTris666 Jun 30, 2020
36078e9
Multi-mesh output, LODs and compute culling (#14)
julienf-unity Jul 1, 2020
5f6c25b
Simulate headers on enum values in SlotContainerEditor (#49)
iTris666 Jul 1, 2020
dabba9d
Merge remote-tracking branch 'graphics/master' into vfx/staging
julienf-unity Jul 2, 2020
af03309
Update VFX
julienf-unity Jul 2, 2020
a526606
Fix for blackboard scrollable element hidden by resize.
iTris666 Jul 2, 2020
23b0db0
Disable LOD test for XR
julienf-unity Jul 2, 2020
1f5a122
Fix test threshold that was reset to 0...
julienf-unity Jul 3, 2020
fe156b6
Ignoer graphviz folder
julienf-unity Jul 3, 2020
650ffc2
Merge branch 'vfx/staging' of github.cds.internal.unity3d.com:unity/v…
iTris666 Jul 6, 2020
4003aeb
Target Gameobject windows resize doesn't go too far above scrollbars
iTris666 Jul 6, 2020
cfdda19
Merge branch 'master' into vfx/staging
PaulDemeulenaere Jul 9, 2020
e3ba0e6
Missing or incorrect unit in uss.
iTris666 Jul 10, 2020
53a3ca8
fix for reference image "VFX/Execution" not updated to new path ( war…
iTris666 Jul 10, 2020
716c649
Merge branch 'vfx/staging' of github.cds.internal.unity3d.com:unity/v…
iTris666 Jul 16, 2020
e1deab6
Merge remote-tracking branch 'graphics/master' into vfx/staging
julienf-unity Jul 17, 2020
da23eb9
Change description in package.json to reflect VFX is not out of previ…
julienf-unity Jul 17, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@ ShaderGraph/DebugOutput.meta
ShaderGraph/DebugOutput/**
ShaderGraph/Testing/IntegrationTests/.Failed
TestProjects/*/ProjectSettings/ProjectVersion.txt
TestProjects/VisualEffectGraph_HDRP/GraphViz/
node_modules
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,8 @@ Matrix4x4PropertyRM.propertyrm VFXMatrix4x4Field

.ListPropertyRM > .ReorderableList
{
margin-top:4;
margin-left:4;
margin-right:4;
margin-top:4px;
margin-left:4px;
margin-right:4px;
flex:1 1 auto;
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
.blackboard *
VFXBlackboard.blackboard
{
font-size: 11px;
background-color: rgba(0,0,0,0);
border-color: rgba(0,0,0,0);
}

.blackboard > .mainContainer
{
background-color: #2b2b2b;
border-color: #191919;
margin-left:6px;
margin-right:6px;
margin-top:6px;
margin-bottom:6px;
border-radius: 5px;
}

#vfx-properties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,29 @@ VFXComponentBoard.graphElement
{
position:Absolute;

background-color: #2b2b2b;
border-color: #191919;

padding-left:0;
padding-right:0;
padding-top:0;
padding-bottom:0;




min-width: 286px;
min-height: 100px;
}

VFXComponentBoard.graphElement > .mainContainer
{
flex: 1 1 auto;
background-color: #2b2b2b;
border-color: #191919;
margin-left:6px;
margin-right:6px;
margin-top:6px;
margin-bottom:6px;
}

*
{
font-size: 11px;
Expand Down Expand Up @@ -54,9 +65,9 @@ VFXComponentBoard, #component-container
border-color: #212121;
border-top-right-radius: 4px;
border-top-left-radius: 4px;
padding-left: 1px;
padding-top: 4px;
padding-bottom: 2px;
padding-left: 8px;
padding-top: 8px;
padding-bottom: 8px;
}
#header > #labelContainer {
flex:1 0 auto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ VFXContextUI #header-space.spaceWorld

VFXContextUI #footer #icon
{
--unity-image:resource("VFX/Execution");
--unity-image: url("project:///Packages/com.unity.visualeffectgraph/Editor Default Resources/VFX/Execution.png");
}

VFXContextUI #block-container {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,62 +1,63 @@
<UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xmlns:gv="UnityEditor.Experimental.GraphView">

<ui:VisualElement name="header" pickingMode="Ignore">
<ui:VisualElement name="labelContainer" pickingMode="Ignore">
<ui:Label name="titleLabel" text="Target visual effect GameObject" tooltip="Select a visual effect gameobject in the scenes and attach for additionnal control."/>
<ui:Label name="subTitleLabel" />
</ui:VisualElement>
</ui:VisualElement>
<ui:ScrollView class="stretchContentWidth">
<ui:VisualElement name="attach-container">
<ui:Button name="attach" text="Attach" />
<ui:Label name="component-path" text="" pickingMode="Ignore"/>
<ui:Button name="select" text="select" />
<ui:VisualElement class="mainContainer">
<ui:VisualElement name="header" pickingMode="Ignore">
<ui:VisualElement name="labelContainer" pickingMode="Ignore">
<ui:Label name="titleLabel" text="Target visual effect GameObject" tooltip="Select a visual effect gameobject in the scenes and attach for additionnal control."/>
<ui:Label name="subTitleLabel" />
</ui:VisualElement>
</ui:VisualElement>
<ui:VisualElement name="divider" class="horizontal"/>
<ui:VisualElement name="component-container">
<ui:VisualElement name="parameter-container" pickingMode="Ignore"/>
<!--<ui:VisualElement name="particle-count-container" pickingMode="Ignore">
<ui:Label text="Particle Count" pickingMode="Ignore"/>
<ui:Label name="particle-count" text="1337000" pickingMode="Ignore"/>
</ui:VisualElement>-->
<ui:VisualElement pickingMode="Ignore" >
<ui:VisualElement name="toolbar" pickingMode="Ignore" >
<ui:Button name="stop">
<ui:Image name="icon"/>
</ui:Button>
<ui:Button name="play">
<ui:Image name="icon"/>
</ui:Button>
<ui:Button name="step">
<ui:Image name="icon"/>
</ui:Button>
<ui:Button name="restart">
<ui:Image name="icon"/>
</ui:Button>
</ui:VisualElement>
<ui:VisualElement name="play-rate-container" pickingMode="Ignore" >
<ui:Label text="Play Rate" />
<ui:Slider name="play-rate-slider" direction="Horizontal" />
<uie:IntegerField name="play-rate-field"/>
<ui:Button name="play-rate-menu" text="Set" class="MiniDropDown"/>
</ui:VisualElement>
<ui:VisualElement>
<ui:VisualElement name="divider" class="horizontal"/>
<ui:Label name="events-label" text="Events" />
<ui:VisualElement pickingMode="Ignore" style="flex-direction:row">
<ui:Button name="on-play-button" text="OnPlay" style="flex:1"/>
<ui:Button name="on-stop-button" text="OnStop" style="flex:1"/>
<ui:ScrollView class="stretchContentWidth">
<ui:VisualElement name="attach-container">
<ui:Button name="attach" text="Attach" />
<ui:Label name="component-path" text="" pickingMode="Ignore"/>
<ui:Button name="select" text="select" />
</ui:VisualElement>
<ui:VisualElement name="divider" class="horizontal"/>
<ui:VisualElement name="component-container">
<ui:VisualElement name="parameter-container" pickingMode="Ignore"/>
<!--<ui:VisualElement name="particle-count-container" pickingMode="Ignore">
<ui:Label text="Particle Count" pickingMode="Ignore"/>
<ui:Label name="particle-count" text="1337000" pickingMode="Ignore"/>
</ui:VisualElement>-->
<ui:VisualElement pickingMode="Ignore" >
<ui:VisualElement name="toolbar" pickingMode="Ignore" >
<ui:Button name="stop">
<ui:Image name="icon"/>
</ui:Button>
<ui:Button name="play">
<ui:Image name="icon"/>
</ui:Button>
<ui:Button name="step">
<ui:Image name="icon"/>
</ui:Button>
<ui:Button name="restart">
<ui:Image name="icon"/>
</ui:Button>
</ui:VisualElement>
<ui:Label name="debug-label" text="Debug"/>
<ui:VisualElement name="debug-container" pickingMode="Ignore">
<ui:Button name="debug-modes" text="Debug modes" class="DropDown"/>
<ui:VisualElement name="debug-modes-container" />
<ui:VisualElement name="play-rate-container" pickingMode="Ignore" >
<ui:Label text="Play Rate" />
<ui:Slider name="play-rate-slider" direction="Horizontal" />
<uie:IntegerField name="play-rate-field"/>
<ui:Button name="play-rate-menu" text="Set" class="MiniDropDown"/>
</ui:VisualElement>
<ui:VisualElement name="events-container" pickingMode="Ignore" >
<ui:VisualElement>
<ui:VisualElement name="divider" class="horizontal"/>
<ui:Label name="events-label" text="Events" />
<ui:VisualElement pickingMode="Ignore" style="flex-direction:row">
<ui:Button name="on-play-button" text="OnPlay" style="flex:1"/>
<ui:Button name="on-stop-button" text="OnStop" style="flex:1"/>
</ui:VisualElement>
<ui:Label name="debug-label" text="Debug"/>
<ui:VisualElement name="debug-container" pickingMode="Ignore">
<ui:Button name="debug-modes" text="Debug modes" class="DropDown"/>
<ui:VisualElement name="debug-modes-container" />
</ui:VisualElement>
<ui:VisualElement name="events-container" pickingMode="Ignore" >
</ui:VisualElement>
</ui:VisualElement>
</ui:VisualElement>
</ui:VisualElement>
</ui:VisualElement>
</ui:ScrollView>
</ui:ScrollView>
</ui:VisualElement>
<gv:ResizableElement pickingMode="Ignore" />
</UXML>
2 changes: 1 addition & 1 deletion com.unity.visualeffectgraph/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "10.0.0-preview.14",
"unity": "2020.2",
"unityRelease": "0a17",
"description": "The Visual Effect Graph is a node based visual effect editor. It allows you to author next generation visual effects that Unity simulates directly on the GPU.",
"description": "The Visual Effect Graph is a node based visual effect editor. It allows you to author next generation visual effects that Unity simulates directly on the GPU. The Visual Effect Graph is production-ready for the High Definition Render Pipeline and runs on all platforms supported by it. Full support for the Universal Render Pipeline and compatible mobile devices is still in development.",
"keywords": [
"vfx",
"visualeffect",
Expand Down