3958bdb1
[Material Graph]Rearrange project.
8 年前
2645e25c
[Material Graph] split into runtime vs editor. Create UI delegation to handle node drawing nicely.
8 年前
a2d8ad62
Add drawing of custom node preview
Delegate drawing to a custom drawer class that is looked up via
attribute, it will search for most specific drawer first, then walk up
the inheritence chain.
8 年前
01366ee3
Custom UI for PixelShaderNode.
Add Slot priority + tests
Make shader generation static functions (they do not need to be members
8 年前
26c129c0
[Material Graph] Sub graph / subgraph input nodes are can be added now, need to work on slots still
8 年前
d9619701
[material graph] Tidy up API for slot management (make generic).
8 年前
addd6c34
[Material Graph]Write tests / fix issues as encountered
8 年前
62377747
[Material graph] Working subGraph now. Copies function / properties etc.
8 年前
6ef35ae3
[Material Graph]Use slotid's instead of slots.
8 年前
0e9ee494
[Material Graph]Tidy + small Refactorings. Add more tests.
8 年前
cc192491
[Material Graph]Adding property node tests + pixel node tests + tidy API as I go (light functions specifically)
8 年前
553fedbf
[Format]Run code formatting
8 年前
95b250d2
[material graph] Fix newline issues.
8 年前
b6ca28a2
[material graph]Make newline platform standard.
8 年前
5055d67e
[Material graph]More testing + fix things that are broken with the tests.
8 年前
31fa7c60
[Material Graph]Readd export button. Fix issue with sub graph exports.
8 年前
c565a8d4
fix formatting
8 年前
1b049752
[Material Graph] Rename and reorganise the repository.
8 年前
39086dd7
[Mat Graph]Remove light functions and instead have multiple master nodes.
8 年前
313777e5
[Mat Graph] Master Node Inversion refactor
8 年前
3a45f192
[mat graph]Fix up previews a bit more.
8 年前
1172640f
Merge pull request #1 from stramit/MasterNode
Master node
8 年前
dc7e686b
Merge pull request #2 from stramit/NewUI
New ui
8 年前
9ea47ed4
working on shader compiler issues
8 年前
53ae5d47
Merge branch 'fixingshadercompiler' into HEAD
# Conflicts:
# MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Manipulators/NodeExpander.cs.meta
# MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Styles/SerializableGraph.uss.imported.asset.meta
# MaterialGraphProject/Assets/NewUI/Editor/Views/GraphView.uss.imported.asset.meta
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Styles/MaterialGraph.uss.imported.asset
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Styles/MaterialGraph.uss.imported.asset.meta
# MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/TextureNode.cs
8 年前
93902ec9
[material graph] Pad v1 -> v4 properly.
8 年前
bc6130d7
Fix nodes so that the master node now can do a mapping from vertex input to usage by the master node.
8 年前
2629abf3
Avoid adding twice the same property (we should also have a test for that)
8 年前
42eb0e0c
Merge branch 'master' of github.com:stramit/MaterialGraph
8 年前
94f746ff
- Avoid add null shaderChunks
- Public for normal slot (useful for default input)
8 年前
51383cec
Add world tangent node (with IRequireTangent behavior)
8 年前
c1f9ae7d
Add WorldBitangentNode (with IMayRequireBitangent behavior)
8 年前
2c0192a0
Add VertexColorNode & Fix missing bitangent in AbstractSurfaceMasterNode.cs
8 年前
8592d7d0
Add an index to RequiresMeshUV, allows require UV1 to UV3
8 年前
0a990a6d
allow specifying the UV channel on the UV node.
8 年前
2dbd4aa3
Added nodes
-Ceil
-Exponential
-Floor
-Frac
-HSVtoRGB
-Hue
-InverseLerp
-OneMinus
-Remap
-RGBtoHCV
-RGBtoHSV
-Round
-Sign
-SquareRoot
-Step
-Trunc
-FMod
-Log
WIP Nodes
-ComponentSplitNode
-Cubemap
-Function1in3out
7 年前
6edcd801
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
9ac0408c
Adding support for IMayRequireViewDirectionTangentSpace, and a simple Parallax node to use it. Node seems to have the correct behavior, but not fully tested.
7 年前
ec474be5
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
82da97c0
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
72252143
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
ee0f0bf6
Tweaked toggle node, now shows on shader as checkbox
Added expose and HDR check box to colour node
Initial work on float types
7 年前
2df2cc2b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
eeb9f4ff
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
c99dc5e2
REPO FIX
7 年前
718af347
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
475f5e3b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
fe87f870
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
c5984a7b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
0336445f
fix node adaption so casting works as expected
7 年前
178cb981
Extension method for `INode.RequiresTime`
7 年前
f9acfdc0
Missing change for previous commit
7 年前
7e160ce8
Run `hg format` on repository
7 年前
6eea794b
Remove scale and offset from shader inspector
7 年前
8a87c992
More refactoring.
7 年前
be067cc2
first real working shader in the 'new' model.
7 年前
0818f178
temp
7 年前
735c401b
Working: Properties window + new master node.
7 年前
5f6271d2
Merge pull request #67 from stramit/refactor-properties
Refactor properties
7 年前
fb21bff8
Working lightweight metallic master node.
7 年前
0b56c45b
first pass.
7 年前
8d5e6fd1
texture exposition working
7 年前
779d0288
[MatGraph]Use generated names for properties so that they do not conflict and are formatted properly.
7 年前
e5c78ee9
Separate usage of 'graph requirements' from 'model requirements' to not pollute the surface input structure.
7 年前
f2cae710
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
7 年前
66cf728c
Tidy up transforms so that graphs have a 'prefered' space to work in.
7 年前
b2eceafe
Improve 'geometry' based nodes so they can do space translations internally.
7 年前
5bc05ae7
tidy up code
7 年前
52f89bea
Merge branch 'spacetranslation' into master2
7 年前
21a946ef
Merge pull request #73 from Unity-Technologies/master
Merge master
7 年前
f3353a02
Input Part 2
Input/Geometry
7 年前
f95f8c27
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
7 年前
abed850e
Merge master
And fix conflicts
7 年前
3039671f
Merge master
7 年前
de93c238
Merge trunk
7 年前
fc3caa89
Merge commit '0a54bdcf00befab61d3a0bbec18c543478eb086d' into fixing
7 年前
045d568e
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
2fa06117
Implemented uber shader
7 年前
dd6f9d47
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
7 年前
b5df720c
Move output selection in uber shader to an earlier place, to benefit from less register usage and early exit
7 年前
d7f591a9
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Resources/Styles/MaterialGraph.uss
# MaterialGraphProject/UnityPackageManager/manifest.json
7 年前
8e410579
Merge branch 'master' into node-artistic-adjustment
7 年前
ec95c348
Add template path export.
7 年前
03becbc9
Add shadergraph package
7 年前
54ac74c0
Merge branch 'master' into node-input-scene
7 年前
16640c42
Run code format tool
7 年前
2731487c
Merge branch 'master' into node-input-scene
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Vector/TransformNode.cs
7 年前
da0d10c8
Massively decreased amount of allocations in preview rendering (~440 kB -> ~23 kB per frame)
7 年前
00f3fcff
Merge branch 'master' into node-validate-current
7 年前
ca5e100b
Merge branch 'master' into node-input-scene
7 年前
67d2fd02
Merge master
7 年前
c827f632
Fix non-modifiable cubemap data
7 年前
db7fee2a
Fix object and world position affine check
7 年前
ae8e0962
starting to update nodes to new library.
7 年前
6a80fdeb
Merge pull request #122 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
7a9a255f
More work on porting node library across to new shader library.
7 年前
7995a0e9
upgrading to new shader library.
7 年前
f2413918
fix up typo.
7 年前
bf727807
Fix lightmapping issue.
7 年前
1a08b1b1
Add DynamicMatrixMaterialSlot and fix all Matrix input types
7 年前
d1d69177
Merge pull request #131 from Unity-Technologies/LinearColorFix
Linear color fix
7 年前
929cf786
Add ShaderStringBuilder and change non-CodeFunctionNodes to use it
7 年前
b2224d93
Move remaining files out of SerializableGraph folder and remove a few unused files
7 年前
1ebe97b0
Merge pull request #132 from Unity-Technologies/squash-serializablegraph
Squash SerializableGraph into AbstractMaterialGraph
7 年前
8e31e809
Merge branch 'master' into inspector-preview-mesh
7 年前
83c052cb
Various clean-ups to make code a bit more neat
7 年前
d5813d06
Move legacy type remapping code outside of AbstractMaterialGraph and cache the result in a static field
7 年前
5ef7f04d
Move GetRequirements into ShaderGraphRequirements and give it a nicer name
7 年前
0055dc00
Rename LegacyAttribute to FormerNameAttribute
7 年前
41e06942
Change IGeneratesFunction such that a name is provided to a registry, which only allows 1 implementation per name. Includes a validation mode that checks that multiple given functions with the same name are actually the same.
7 年前
38e4110f
Move static methods out of AbstractMaterialNode
7 年前
eb5b5a85
Shader source mapping for node functions ( #137 )
7 年前
e1ebec49
Merge master
7 年前
5c979fc8
Merge master
7 年前
25b66c4b
fixing merge
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 年前
ad906af4
Creating mini shader graph library / fixing gamma -> linear colours
7 年前
5c86f77c
Merge master
7 年前
8aab03fe
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
5c4cbe12
For LW use the proper shader paths that get exported from the LW package..
7 年前
c3ae833e
Merge pull request #144 (Upgrade to use new shader library)
Also includes WIP HD Unlit Master Node
7 年前
259c7ce1
Changing sub graphs to use functions instead of inlining.
7 年前
4f8a273e
Fix UV bindings for preview shader and Unlit master
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 年前
87638b44
Merge pull request #149 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
25109a19
Extend PBR master functionality
- Add Fade and Multiply blend modes
- Expose culling options
- Change UV enum to caps
- Add camel case string converter to utils
- Convert camel case on CodeFunctionNode
7 年前
7c4099ec
Fix Screen Position and Reflection Probe nodes
- Requires reorder of preview shader includes
- Requires adding EntityLighting.hlsl to preview shader includes (For DecodeHDREnvironment)
- Requires addeing unity_SpecCube0 (texture, sampler and instruction) to ShaderVariables.hlsl (for Preview shader)
- Added "legacy" ComputeScreenPos function
7 年前
ff6d2e4d
Change ComputeScreenPos to use projection sign as an argument
7 年前
c763baf4
Merge pull request #163 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
f43e0a6f
Merge branch 'master' into node-input
7 年前
352a061a
Merge branch 'master' into compare-and-branch
7 年前
55b86ced
Merge branch 'master' into inspector-window
7 年前
9e8d791f
[FIX]#105 properly adapt input to master node when going from v2->v3/4
7 年前
179e0ef0
[FIX]#168 Add alpha into unlit node.
7 年前
8e8beb43
Merge pull request #174 from Unity-Technologies/tim-bug-fixes
Misc bug fixes
7 年前
725a1ea9
Merge branch 'master' into sliders
7 年前
d00ca780
Merge branch 'master' into blackboard
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 年前
de7e2997
Addition of ScreenPositionSlotControlView
- Added ScreenPositionSlotControlView and its style element (USS).
- Moved ScreenSpaceType enum definition to ScreenSpaceType.cs and added
ScreenSpaceTypeExtensions that provides extension methods for the enum.
- Updated the existing implementation to work with
ScreenPositionSlotControlView.
7 年前
d2945014
Merge pull request #219 from keijiro/screenspace-slot
Addition of ScreenPositionSlotControlView
7 年前
7c973636
Merge branch 'master' into node-bugfixes
7 年前
8dc99cbc
*Fefactor subshader / master node generation to be more uniform
*Add subshader generator as a 'real' thing, need to hook up UI now so that these can be added and removed.
7 年前
e986db46
Merge pull request #223 from Unity-Technologies/tim-fixes
Tim fixes
6 年前
7b5ca064
Merge with master
6 年前
9641212d
Merge pull request #224 from Unity-Technologies/node-matrix
Node Matrix
6 年前
57a0eab1
Remove unused imports in entire solution
6 年前
cdc03be9
Merge pull request #244 from Unity-Technologies/fix-all-warnings
Fix all warnings
6 年前
00564880
Fix shader include paths, update gitignore, add meta files and replace UNITY_SHADERGRAPH_DEVMODE with an optional DebugOutput directory
6 年前
286d82a6
Merge pull request #249 from Unity-Technologies/submodularize
Submodularize
6 年前
5399d0b1
Update LW master nodes to work with latest SRP repo
6 年前
f5ae4e88
Merge with master
6 年前
b3551b81
Master node improvements part 1
- Add two sided option
- Add multiply blend mode
- Rename blend modes
- Add master node parameter labels
6 年前
b73b2432
Add Transparent (premultiply alpha) blend mode
6 年前
fcd875c3
Split blend enum into two
6 年前
5e8fdfe2
Merge pull request #259 from Unity-Technologies/node-bugfixes
Master node improvements
6 年前
8de769dd
Move lightweight sub-shaders and templates to SRP repository
6 年前
b3445484
Add wrapper for `Assembly.GetTypes()` which won't throw an exception
6 年前
df788737
Merge pull request #275 from Unity-Technologies/integrate-sg-subshaders
Move lightweight sub-shaders and templates to SRP repository
6 年前
0b584564
Merge with master
6 年前
a029858d
Merge branch 'master' into fix-postlayoutevent
# Conflicts:
# com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs
6 年前
731a2018
Merge branch 'master' into node-settings
# Conflicts:
# com.unity.shadergraph/Editor/Data/MasterNodes/PBRMasterNode.cs
# com.unity.shadergraph/Editor/Util/UIUtilities.cs
6 年前
f1a39c3d
Add input slots from the SubGraphOutputNode in the preveiw shader generation
6 年前
312d23e1
Merge pull request #304 from Unity-Technologies/sub-graph-preview-fix
Sub graph preview fix
6 年前
9cc55c03
Merge branch 'master' into path-for-shaders
6 年前
0c641d4b
Fixed warnings from generated transform code
6 年前
11c1b9be
Fix all Shader Graph tests (including integration graphs)
6 年前
49ac046f
Add funciton to handle duplicate naming
6 年前
f1e0d4a5
Add docstring to the sanitize function
6 年前
6b96c163
Merge pull request #324 from Unity-Technologies/fix-tests
Fix tests
6 年前
8076c27e
Merge branch 'master' into copy-property-nodes
6 年前
60639f41
Merge branch 'master' into editable-property-reference-names
6 年前
9696a5d1
Merge pull request #326 from Unity-Technologies/editable-property-reference-names
Editable property reference names
6 年前
8fcaa92a
Merge branch 'master' into warning-incompatible-pipeline
6 年前
e7f9893d
Rebuild previous branch (see comments)
Also:
- Add cull control to shadow and depth
- Add clip define (need to add clip to shadow/depth frag)
- Add HD pipeline tag to unlit subshader
6 年前
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
6 年前
a107a23e
Major shader generation refactor part 1
6 年前
c3134b61
Refactor GenerateStandardTransforms
6 年前
a7789fc7
PR fixes #1
- Change output shader layout to fix subgraphs
6 年前
3eef43d8
Added name to abstract material graph. This one is the name from the materialgraph on disk. Added a write file and open file in graph utils. Changed the converttoshader functionality to return a string so it could be re-used in implementation for writing a file.
6 年前
42b09806
Add first pass Texture2DArray and Texture3D support
6 年前
ae1dff05
Merge pull request #1358 from Unity-Technologies/sg/vertex-modification
Vertex Modification
6 年前
3be7d580
Merge remote-tracking branch 'origin/master' into build/automation
6 年前
9498fe0b
Merge branch 'master' into stacklit
6 年前
26a4b39a
HD subshaders branch rebuild
6 年前
cd218826
Merge pull request #1376 from Unity-Technologies/sg/hdsubshaders
HD Master Node Support
6 年前
0d975dea
Merge remote-tracking branch 'origin/master' into build/automation
6 年前
36a0484f
Merge remote-tracking branch 'origin/master' into sg/texture-types
6 年前
bb48e6ea
Move new files merged from master
For file re-org, catch up files
6 年前
c0461407
Merge branch 'master' into Add-support-of-per-light-shadow-mask-control
6 年前
6db9deb9
Make PreviewProperty check a bit nicer and fix a warning
6 年前
06d2091a
Merge pull request #1383 from Unity-Technologies/Add-support-of-per-light-shadow-mask-control
Add support of per light shadow mask control
6 年前
7f5da648
Merge branch 'master' into sg/show-generated-code
6 年前
f8e5ff57
Merge pull request #1377 from Unity-Technologies/sg/texture-types
Texture2D Array and Texture 3D
6 年前
57c37d06
Merge pull request #1355 from Unity-Technologies/sg/show-generated-code
Show generated code for shader graph
6 年前
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...
6 年前
fafb59af
Run code formatter.
6 年前
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
6 年前
ad13e4b0
Add Face Sign functionality to LWRP, HDRP and preview subshaders
6 年前
f37d6cf2
First pass HDRP lit vertex anim
Works, issues to fix:
screen position and view direction are not accesible in vertex shader
unlit shader needs update
6 年前
887571b9
Fix ScreenPosition transformation
6 年前
7777e6e0
Merge branch 'vertexAnimHDRP' into vertexAnimHDRP2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
6 年前
d3bcb929
Fixes for vertex animation velocity buffer, screen position
And some refactoring
6 年前
9f55549e
Fix for HD Unlit master node screen position and advanced features.
Cleanup of generated code -- putting debug output on an internal switch.
6 年前
f0f49516
Merge pull request #1461 from Unity-Technologies/sg/fix-screen-position
Fix ScreenPosition transformation
6 年前
f4d8c338
Merge pull request #1449 from Unity-Technologies/vertexAnimHDRP2
Vertex anim HDRP
6 年前
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
6 年前
900da40e
Merge pull request #1430 from Unity-Technologies/sg/facesign
Add Face Sign functionality
6 年前
4a622009
Merge branch 'master' into refactor-shader-variant-per-material
6 年前
3a15d806
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
6 年前
7bf53f3c
Merge branch 'master' into HDRP-Tests
6 年前
7933fd8d
Merge branch 'master' into StackLit2
6 年前
797daf79
Merge branch 'master' into decals/ss3_channel_mask
6 年前
6c870111
Merge branch 'master' into FalseColorMode
6 年前
16cef1a8
Update include generator to use space instead of tabs
6 年前
2ed78d94
Merge pull request #1500 from Unity-Technologies/Update-generator
Update include generator to use space instead of tabs
6 年前
c95b7c47
Merge branch 'master' into normal-buffer-support
6 年前
29ce571e
Merge branch 'master' into decals/ss3_channel_mask
6 年前
f82aef0c
Merge branch 'master' into VisualizeShadowMasks
6 年前
7842bbf8
Merge remote-tracking branch 'mainrepo/master' into StackLit2
6 年前
ecdbdcab
Merge branch 'StackLit2' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into StackLit2
6 年前
98989fb6
Merge branch 'master' into HDRP-Tests
6 年前
7193e88e
Merge branch 'master' into lw/bugfixes
# Conflicts:
# com.unity.render-pipelines.lightweight/CHANGELOG.md
6 年前
01ee049b
Merge branch 'master' into gfx-tests-postfx
6 年前
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
6 年前
19222bee
Merge pull request #1518 from Unity-Technologies/hdrpcleanup
HDRP cleanup -- Consolidating shared HDRP code to utility class, cleaning up output shader code by removing debug comments (on internal bool switch)
6 年前
516b896c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
a49a696e
Merge branch 'master' into StackLit2
6 年前
9db2a137
Merge branch 'master' into HDRP-Tests
6 年前
3a6a4e59
Merge branch 'master' into sg/spheremasknode
6 年前
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
953cdf48
Fix normalizations in Shader Graph with LWRP ( #1571 )
* Remove double normalization
* Update changelog
* Normalize tangent and bitangent in pixel remap
* Fixes for PR
- Do correct normalization
- Update changelog
- Update importer version
* Missing post-processing submodule update
* Fixes to changelog
6 年前
2883e443
Merge branch 'master' into tests/hdrp/distortion
6 年前
4c6e512a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
7a18f28e
Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"
This reverts commit b4235a00abc6fa6e57b0ec4e3b9ac5476a00483b, reversing
changes made to 9f8c48222c8e832dafba28a61d7eb38a18a5f9c8.
6 年前
5182ab18
Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings""
This reverts commit ec4368043e0e48024a999926b30a6d885a9c6d5d.
6 年前
74d0a872
Merge pull request #1745 from Unity-Technologies/master
Merge from master
6 年前
5bfcc8cd
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
f0c6fbeb
Remove all legacy matrices from Shader Graph ( #1652 )
* Removed all legacy matrices from Shader Graph
* Change None enum entry to -1
* Fixes for PR
6 年前
71ec7369
Merge HDRP/staging
6 年前
b364cfd3
Merge branch 'hdrp/staging' into tests/hdrp/distortion
6 年前
a11976bf
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
6d4f0be7
New template parser ( #1532 )
* Converting template parser to a class to enable recursive $include in the near future
* New template parser working with $include, $splice
Including dependency tracking on $include
* Adding $buildType template command, and cleaning up the code around that.
* Bump major version number. Using ShaderStringBuilder.
* Don't build slot list twice
* Fix view space position for FB case 1064118
6 年前
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
0267674b
Merge branch 'master' into HDRP/staging
6 年前
ee4e73a4
Merge branch 'HDRP/staging' into RemoveSkyInLuxMeter
6 年前
f75e94af
Merge branch 'HDRP/staging' into HDRP/fix/ObliqueLightLoop
6 年前
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
05036cac
Merge branch 'HDRP/staging' into HDLightExplorerExtension
6 年前
ce4065fd
Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
05f23629
Merge branch 'HDRP/refactor-reflectionProbe/merge-probe-editors' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
9dbd8998
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
# com.unity.render-pipelines.high-definition/HDRP/RenderPipelineResources/RenderPipelineResources.cs
6 年前
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前
f44d2214
Bump post version ( #1883 )
* Bump shader graph version dependency.
* Fix shader compile warnings
6 年前
170858df
Merge master
6 年前
5eed6e3a
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
Tim Cooper
GitHub
Paul Demeulenaere
Peter Bay Bastian
Andre McGrail
Florent Guinier
ChrisTchou
bfogerty
Jennifer Nordwall
Matt Dean
RinaldoTjan
Patrick Fournier
mathieum-unity
Jens Holm
Keijiro Takahashi
Martin Thorzen
Alex Lian
Stephane Laroche
sebastienlagarde
Frédéric Vauchelles
Chris Tchou
Oliver Schnabel
Remy
Paul Melamed
Sebastien Lagarde
Felipe Lira
Thomas
Antoine Lelievre
Nerites
Aleksandr Kirillov
Julien Ignace
Yao Xiaoling
RSlysz
Yao Xiao Ling
egomeh