7301ac69
Moving more nodes
7 年前
3f34639b
Fixes for subgraph, preview and property nodes
7 年前
00f3fcff
Merge branch 'master' into node-validate-current
7 年前
0eec5e4e
Merge pull request #95 from Unity-Technologies/node-validate-current
Validate all current nodes
7 年前
ca5e100b
Merge branch 'master' into node-input-scene
7 年前
67d2fd02
Merge master
7 年前
81940dcd
Add object control back to SubGraphNode for now ( fixes #112 )
7 年前
e3bd536c
Merge branch 'master' into HDMaster
7 年前
5546123e
Merge branch 'master' into node-bugfixes
7 年前
38e4110f
Move static methods out of AbstractMaterialNode
7 年前
5c979fc8
Merge master
7 年前
09d669c8
Various refactorings and improvements ( #139 )
* Move previewMode to RenderData instead of ShaderData (still some to do here, as apparently there's still a RenderData _and a_ ShaderData per node, but the intention was to have a RenderData per node and then share ShaderData between those)
* Introduce a temporary identifier for nodes. The first part of this identifier is an index (`int`) which is assigned linearly. When a node is deleted, its identifier as added to a free list. Each identifier also contains a version (`int`), which is incremented when the identifier is re-used. This allows us to replace usage of Dictionary with List in a lot of places.
* Introduce IndexSet for efficiently storing and manipulating a list of indices (e.g. from temp IDs). Internally this stores a list of 32-bit integers and uses each bit to represent 1 index. The operations of `ISet<int>` are implemented for this type, although that interface does not exist in Unity. The operations are very fast and cac...
7 年前
5c86f77c
Merge master
7 年前
8aab03fe
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
259c7ce1
Changing sub graphs to use functions instead of inlining.
7 年前
8342aa12
Finish refactoring subgraphs.
7 年前
2888f1c2
-When we validate a subgraph node we also need to validate the subgraph (generates the concrete values).
-Allow promotion of vector types. v2->v3/v4 v3->v4. Rule is alpha channel gets 1, other channels get 0.
7 年前
455b4075
Merge pull request #145 from Unity-Technologies/FixingSubGraphs
Fixing sub graphs (+ fix 2D/3D preview bug)
7 年前
93fa2455
Merge remote-tracking branch 'origin/master' into inspector-window
7 年前
2ed31ce4
Add Comparison node
- Add boolean field for property list
- Fix missing ConcreteValueTypeToString entry
7 年前
bbd475d5
Add Branch node
- Fix compatible types
- Fix default property name
7 年前
e7ccc01e
Fixes
- Change Comparison node to Vec1 inputs
- Change Branch node logic to avoid another if statement
7 年前
dbaf707b
Add All, Any, IsInfinite and IsNaN nodes
7 年前
7c4730ca
PR Fixes
- Add boolean slot control view
- Add nodes And/Nand/Or
- Fix Branch node defaults
- Add USS for boolean slot
7 年前
a3be4eae
Add Not node
7 年前
b1dc4ab4
Change Comparison func convert to switch
7 年前
d6b2ca25
Fix vector lengths
7 年前
b72d0466
Merge pull request #150 from Unity-Technologies/compare-and-branch
Comparison, Branch and Boolean
7 年前
d00ca780
Merge branch 'master' into blackboard
7 年前
739c124a
Merge branch 'master' into sliders
7 年前
8984577a
Merge branch 'master' into node-input
7 年前
fb49e741
Merge remote-tracking branch 'origin/master' into inspector-window
7 年前
4ad43705
Vector1 property refactor and types
7 年前
d2f86285
Merge pull request #192 from Unity-Technologies/node-bugfixes
Property type refactor and Blackboard extension
7 年前
c0c00ec0
Merge branch 'master' into node-matrix
7 年前
6cb97136
Update Is NaN node for GLES and D3D
Fixes #218
7 年前
91b5a7ad
Merge pull request #233 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
57a0eab1
Remove unused imports in entire solution
7 年前
cdc03be9
Merge pull request #244 from Unity-Technologies/fix-all-warnings
Fix all warnings
7 年前
f5ae4e88
Merge with master
7 年前
0a72fe97
When saving a sub graph, we now go through all the shader graphs and updated them if they are using this sub graph.
Not allowed to have sub graph inside a sub graph
Removed sub graph from searh window when in subgraph
Prompting the user when removing slots and properties from the sub graph.
7 年前
1f3d0114
Minor node fixes
- Update Dot Product to use Dynamic Vectors
- Change Branch evaluation to lerp
7 年前
5ba70535
Merge pull request #264 from Unity-Technologies/node-bugfixes
Minor node fixes
7 年前
394320a1
Add documentation links for all nodes
7 年前
edb12553
[FIX] #272 This will prefix the generated code with "sg_"
7 年前
f9797583
Fixed the feedback from GIT
7 年前
e7b2f640
Merge pull request #276 from Unity-Technologies/fix-subgraph-name-start-with-number
[FIX] #272 This will prefix the generated code with "sg_"
7 年前
bad5cbcd
Merge pull request #277 from Unity-Technologies/doc-links
Add documentation links for all nodes
7 年前
0b584564
Merge with master
7 年前
3de3ae25
Merge pull request #262 from Unity-Technologies/rebuild-all-dependant-shaders-from-subgraph
When saving a sub graph, we now go through all the shader graphs and …
7 年前
a029858d
Merge branch 'master' into fix-postlayoutevent
# Conflicts:
# com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs
7 年前
731a2018
Merge branch 'master' into node-settings
# Conflicts:
# com.unity.shadergraph/Editor/Data/MasterNodes/PBRMasterNode.cs
# com.unity.shadergraph/Editor/Util/UIUtilities.cs
7 年前
589cb99a
Add changes from previous branch
7 年前
f6380703
Merge pull request #310 from Unity-Technologies/gradient-nodes
Gradient Nodes
7 年前
8076c27e
Merge branch 'master' into copy-property-nodes
7 年前
60639f41
Merge branch 'master' into editable-property-reference-names
7 年前
4dfbc988
Fix per-stage requirements and translations part 1
- Separate Master node requirements into per-slot stages
- Add shader stage option to IMayRequire interfaces
- Remove uneeded intermediate spaces from surface description
- Change orthonormal basis to world
7 年前
35c8e0e3
Temporarily remove vertex capability from Subgraphs
7 年前
42b09806
Add first pass Texture2DArray and Texture3D support
7 年前
ae1dff05
Merge pull request #1358 from Unity-Technologies/sg/vertex-modification
Vertex Modification
7 年前
3be7d580
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
9498fe0b
Merge branch 'master' into stacklit
7 年前
26a4b39a
HD subshaders branch rebuild
7 年前
cd218826
Merge pull request #1376 from Unity-Technologies/sg/hdsubshaders
HD Master Node Support
7 年前
0d975dea
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
36a0484f
Merge remote-tracking branch 'origin/master' into sg/texture-types
7 年前
c0461407
Merge branch 'master' into Add-support-of-per-light-shadow-mask-control
7 年前
a958b031
Rename PropertyType.Texture to Texture2D
7 年前
7f5da648
Merge branch 'master' into sg/show-generated-code
7 年前
f8e5ff57
Merge pull request #1377 from Unity-Technologies/sg/texture-types
Texture2D Array and Texture 3D
7 年前
2c4a517b
Merge remote-tracking branch 'origin/master' into build/automation
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/sub-package.json
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShadowPass.cs.meta
# ScriptableRenderPipeline/Ligh...
7 年前
fafb59af
Run code formatter.
7 年前
4d7f78f1
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/BuildPlayer/HDRPVariantStripper.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
7 年前
7c397424
Addded cache for subgraph. Before it was deserializing on every frame.
7 年前
048a40af
Removed Legacy Code
7 年前
11cbbe0d
Removed the ObjectControl and added ( sub) to the name of the sub graph node
7 年前
8f9bff6a
Merge pull request #1423 from Unity-Technologies/sg/fix-for-subgraphs-inside-main-graph
Fixes for Subgraph
7 年前
7f024953
Implement dependency tracking for sub graphs
7 年前
2a7ab752
Move IsFrontFace node
7 年前
58fd779d
Merge pull request #1435 from Unity-Technologies/sg/import-dependencies
Import dependencies
7 年前
51a1873e
Merge branch 'master' into update-changelog
7 年前
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
900da40e
Merge pull request #1430 from Unity-Technologies/sg/facesign
Add Face Sign functionality
7 年前
4a622009
Merge branch 'master' into refactor-shader-variant-per-material
7 年前
3a15d806
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
7 年前
7bf53f3c
Merge branch 'master' into HDRP-Tests
7 年前
7933fd8d
Merge branch 'master' into StackLit2
7 年前
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
6c870111
Merge branch 'master' into FalseColorMode
7 年前
961e2a42
Merge pull request #1497 from Unity-Technologies/FalseColorMode
Added false color debug mode
7 年前
c95b7c47
Merge branch 'master' into normal-buffer-support
7 年前
29ce571e
Merge branch 'master' into decals/ss3_channel_mask
7 年前
f82aef0c
Merge branch 'master' into VisualizeShadowMasks
7 年前
7842bbf8
Merge remote-tracking branch 'mainrepo/master' into StackLit2
7 年前
ecdbdcab
Merge branch 'StackLit2' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into StackLit2
7 年前
98989fb6
Merge branch 'master' into HDRP-Tests
7 年前
7193e88e
Merge branch 'master' into lw/bugfixes
# Conflicts:
# com.unity.render-pipelines.lightweight/CHANGELOG.md
7 年前
01ee049b
Merge branch 'master' into gfx-tests-postfx
7 年前
6408007a
Merge branch 'master' into hdrpcleanup
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
7 年前
3a6a4e59
Merge branch 'master' into sg/spheremasknode
7 年前
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
358cdac8
Fix texture and boolean property types in subgraphs
7 年前
7d8789d6
Merge pull request #1458 from Unity-Technologies/sg/fix-subgraph-properties
Fix texture and boolean property types in subgraphs
7 年前
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
7 年前
cc9ae6f7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
9b69a952
Merge xrconfig branch into xrsettings
7 年前
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
7281fe31
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
6 年前
73aab246
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
6 年前
Matt Dean
GitHub
Jens Holm
Peter Bay Bastian
Tim Cooper
Martin Thorzen
Alex Lian
Stephane Laroche
sebastienlagarde
Frédéric Vauchelles
Oliver Schnabel
Remy
Paul Melamed
Sebastien Lagarde
Felipe Lira
Thomas
Chris Tchou
Nerites
Aleksandr Kirillov