Matt Dean
5bed2efc
Menu Reorg: Input
8 年前
Eduardo Chaves
5eca2dca
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bfogerty
9d1506f2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
RinaldoTjan
41da8598
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Peter Bay Bastian
7e160ce8
Run `hg format` on repository
7 年前
Peter Bay Bastian
d69d3c1d
Move IMayRequireNormal into own file
7 年前
Peter Bay Bastian
ed185a44
Preliminary vertex shader support
7 年前
Tim Cooper
be067cc2
first real working shader in the 'new' model.
7 年前
Tim Cooper
735c401b
Working: Properties window + new master node.
7 年前
GitHub
5f6271d2
Merge pull request #67 from stramit/refactor-properties
Refactor properties
7 年前
Tim Cooper
29754ac3
Working light weight unlit master node
7 年前
Tim Cooper
580b206b
missed files
7 年前
Tim Cooper
fb21bff8
Working lightweight metallic master node.
7 年前
Tim Cooper
0b56c45b
first pass.
7 年前
Tim Cooper
f2cae710
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
7 年前
Tim Cooper
215e1b6a
Refactoring slot types.
7 年前
Peter Bay Bastian
f695b6fa
Enum attribute control
7 年前
Peter Bay Bastian
9f5fba90
Merge branch 'attribute-controls'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
damian
83548475
Merging master.
7 年前
Matt Dean
3ca3abee
Maths Part 2
- Maths/Interpolation
- Maths/Round
- Fix merge conflict for PR
7 年前
Matt Dean
b4599393
Fix merge conflicts for PR
7 年前
Matt Dean
31068f89
More PR fixes
7 年前
Tim Cooper
a5c9b0ce
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/Matrix/Matrix2Node.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/Matrix/Matrix3Node.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraphIONode.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraphIONode.cs.meta
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/AbstractMaterialGraphEditWindow.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialGraphPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Nodes/SubgraphIONodePresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Runtime/SubGraph/SubGraphOutputNode.cs
7 年前
GitHub
1d08cd88
Merge pull request #70 from Unity-Technologies/tidyup
Tidyup
7 年前
Peter Bay Bastian
b75b4c04
Merge branch 'master' into no-presenters
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialNodePresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/GraphEditorView.cs
# MaterialGraphProject/Assets/fresnelstuff.ShaderSubGraph.meta
7 年前
Tim Cooper
66cf728c
Tidy up transforms so that graphs have a 'prefered' space to work in.
7 年前
Tim Cooper
b2eceafe
Improve 'geometry' based nodes so they can do space translations internally.
7 年前
Tim Cooper
52f89bea
Merge branch 'spacetranslation' into master2
7 年前
Matt Dean
f3353a02
Input Part 2
Input/Geometry
7 年前
Peter Bay Bastian
f95f8c27
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
7 年前
Matt Dean
abed850e
Merge master
And fix conflicts
7 年前
Matt Dean
a02b954a
Input Part 3
- Final for now
- No texture nodes
- No gradient nodes
- Havent check parity
- Fixes for PR
7 年前
Tim Cooper
3039671f
Merge master
7 年前
Patrick Fournier
de93c238
Merge trunk
7 年前
Matt Dean
e44629cb
Fixes for PR
- Rename Tangent/Normal/Bitangent nodes
- Make GetHLSLSafeNAme static
- Rename MatrixCommonNode > TransformationMatrixNode
- Rename enums for Log and Exponential base
- String interpolation > Switch statement
- Full names for all Trigonometry nodes
- Rename Reflect/Project/Reject > Reflection/Projection/Rejection
- Rename Fresnel/FresnelEffect
- Rename unit enum in RotateNode (remove duplicate in UVTransform)
- Add min/max clamp to Gradient2D evaluation
7 年前
Tim Cooper
fc3caa89
Merge commit '0a54bdcf00befab61d3a0bbec18c543478eb086d' into fixing
7 年前
mathieum-unity
045d568e
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
Matt Dean
627c384a
Fixes to Screen Position Node
- Added Raw type (no divide by w, needed for uv projection)
- Removed unused method
- Switched output to vec4
- Renamed slot vars
- Fixed output
7 年前
GitHub
35129ab8
Merge pull request #91 from Unity-Technologies/node-bugfixes
Node Bugfixes
7 年前
Tim Cooper
54ac74c0
Merge branch 'master' into node-input-scene
7 年前
Tim Cooper
16640c42
Run code format tool
7 年前
Tim Cooper
2731487c
Merge branch 'master' into node-input-scene
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Vector/TransformNode.cs
7 年前
Peter Bay Bastian
1cf9ffde
Update node titles to use new array-based grouping `[Title("UV/Flipbook")]` -> `[Title("UV", "Flipbook")]`
7 年前
Peter Bay Bastian
da0d10c8
Massively decreased amount of allocations in preview rendering (~440 kB -> ~23 kB per frame)
7 年前
Matt Dean
00f3fcff
Merge branch 'master' into node-validate-current
7 年前
Matt Dean
ca5e100b
Merge branch 'master' into node-input-scene
7 年前
Jens Holm
67d2fd02
Merge master
7 年前
Peter Bay Bastian
409a35e4
Add LegacyAttribute for declaring old class names directly on the node class
7 年前
Peter Bay Bastian
0055dc00
Rename LegacyAttribute to FormerNameAttribute
7 年前
Tim Cooper
5c979fc8
Merge master
7 年前
GitHub
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 年前
Jens Holm
5c86f77c
Merge master
7 年前
Tim Cooper
8aab03fe
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
Tim Cooper
259c7ce1
Changing sub graphs to use functions instead of inlining.
7 年前
GitHub
455b4075
Merge pull request #145 from Unity-Technologies/FixingSubGraphs
Fixing sub graphs (+ fix 2D/3D preview bug)
7 年前
Jens Holm
93fa2455
Merge remote-tracking branch 'origin/master' into inspector-window
7 年前
Matt Dean
eeae2f11
Fix Screen Position node
7 年前
Matt Dean
6d66cb6a
Revert Screen Position node changes
7 年前
Matt Dean
e5024bd2
Cosmetic (name) changes
7 年前
Matt Dean
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 年前
Matt Dean
41300be2
Fix Screen Position Tile mode
7 年前
GitHub
c763baf4
Merge pull request #163 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
Matt Dean
f43e0a6f
Merge branch 'master' into node-input
7 年前
Matt Dean
352a061a
Merge branch 'master' into compare-and-branch
7 年前
Jens Holm
55b86ced
Merge branch 'master' into inspector-window
7 年前
Matt Dean
725a1ea9
Merge branch 'master' into sliders
7 年前
Matt Dean
28672efd
Add a frac to Tiled Screen Position
Because it looks like it doesnt work and I keep forgetting that it actually does...
7 年前
GitHub
df1a52fd
Merge pull request #187 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
Matt Dean
c0c00ec0
Merge branch 'master' into node-matrix
7 年前
Tim Cooper
025d9ffb
UVNode now outputs vector4 UV's
7 年前
Keijiro Takahashi
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 年前
GitHub
d2945014
Merge pull request #219 from keijiro/screenspace-slot
Addition of ScreenPositionSlotControlView
7 年前
Matt Dean
7c973636
Merge branch 'master' into node-bugfixes
7 年前
GitHub
e986db46
Merge pull request #223 from Unity-Technologies/tim-fixes
Tim fixes
7 年前
Martin Thorzen
7b5ca064
Merge with master
7 年前
Peter Bay Bastian
57a0eab1
Remove unused imports in entire solution
7 年前
GitHub
cdc03be9
Merge pull request #244 from Unity-Technologies/fix-all-warnings
Fix all warnings
7 年前
Martin Thorzen
f5ae4e88
Merge with master
7 年前
Matt Dean
394320a1
Add documentation links for all nodes
7 年前
GitHub
bad5cbcd
Merge pull request #277 from Unity-Technologies/doc-links
Add documentation links for all nodes
7 年前
Peter Bay Bastian
0b584564
Merge with master
7 年前
Peter Bay Bastian
a029858d
Merge branch 'master' into fix-postlayoutevent
# Conflicts:
# com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs
7 年前
Martin Thorzen
731a2018
Merge branch 'master' into node-settings
# Conflicts:
# com.unity.shadergraph/Editor/Data/MasterNodes/PBRMasterNode.cs
# com.unity.shadergraph/Editor/Util/UIUtilities.cs
7 年前
Peter Bay Bastian
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 年前
GitHub
ae1dff05
Merge pull request #1358 from Unity-Technologies/sg/vertex-modification
Vertex Modification
7 年前
Alex Lian
3be7d580
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
Stephane Laroche
9498fe0b
Merge branch 'master' into stacklit
7 年前
Matt Dean
36a0484f
Merge remote-tracking branch 'origin/master' into sg/texture-types
7 年前
GitHub
7f5da648
Merge branch 'master' into sg/show-generated-code
7 年前
Matt Dean
ad13e4b0
Add Face Sign functionality to LWRP, HDRP and preview subshaders
7 年前
Matt Dean
aa2a3ad7
Update slot name
7 年前
Matt Dean
de873ebd
Fixes to IsFrontFace node
7 年前
Matt Dean
8204a168
Rename IsFrontFace node
7 年前
Matt Dean
2a7ab752
Move IsFrontFace node
7 年前