浏览代码
Merge branch 'master' into node-settings
Merge branch 'master' into node-settings
# Conflicts: # com.unity.shadergraph/Editor/Data/MasterNodes/PBRMasterNode.cs # com.unity.shadergraph/Editor/Util/UIUtilities.cs/main
Martin Thorzen
7 年前
当前提交
731a2018
共有 234 个文件被更改,包括 742 次插入 和 81 次删除
-
13README.md
-
3TestbedAssets/Beachball.ShaderGraph.meta
-
3TestbedAssets/Oilish.ShaderGraph.meta
-
3TestbedAssets/PartyPreview.ShaderGraph.meta
-
3TestbedAssets/Vector1PropGraph.ShaderGraph.meta
-
3Testing/IntegrationTests/Graphs/Add.ShaderGraph.meta
-
7build.py
-
59com.unity.shadergraph/Editor/Data/Graphs/AbstractMaterialGraph.cs
-
7com.unity.shadergraph/Editor/Data/Graphs/BitangentMaterialSlot.cs
-
2com.unity.shadergraph/Editor/Data/Graphs/MaterialSlot.cs
-
8com.unity.shadergraph/Editor/Data/Graphs/NormalMaterialSlot.cs
-
8com.unity.shadergraph/Editor/Data/Graphs/PositionMaterialSlot.cs
-
39com.unity.shadergraph/Editor/Data/Graphs/SerializableCubemap.cs
-
39com.unity.shadergraph/Editor/Data/Graphs/SerializableMesh.cs
-
40com.unity.shadergraph/Editor/Data/Graphs/SerializableTexture.cs
-
8com.unity.shadergraph/Editor/Data/Graphs/TangentMaterialSlot.cs
-
7com.unity.shadergraph/Editor/Data/Graphs/VertexColorMaterialSlot.cs
-
7com.unity.shadergraph/Editor/Data/Graphs/ViewDirectionMaterialSlot.cs
-
16com.unity.shadergraph/Editor/Data/MasterNodes/AlphaMode.cs
-
56com.unity.shadergraph/Editor/Data/MasterNodes/PBRMasterNode.cs
-
44com.unity.shadergraph/Editor/Data/MasterNodes/UnlitMasterNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/ChannelMixerNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/ContrastNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/HueNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/InvertColorsNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/ReplaceColorNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/SaturationNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/WhiteBalanceNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Artistic/Blend/BlendNode.cs
-
6com.unity.shadergraph/Editor/Data/Nodes/Artistic/Filter/DitherNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Artistic/Mask/ChannelMaskNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Artistic/Mask/ColorMaskNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalBlendNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalCreateNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalStrengthNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalUnpackNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Artistic/Utility/ColorspaceConversion.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Channel/CombineNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Channel/FlipNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Channel/SplitNode.cs
-
15com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/BooleanNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/ColorNode.cs
-
8com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/ConstantNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/IntegerNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/SliderNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/TimeNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector1Node.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector2Node.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector3Node.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector4Node.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/BitangentVectorNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/NormalVectorNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/PositionNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/ScreenPositionNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/TangentVectorNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/UVNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/VertexColorNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/ViewDirectionNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/Matrix2Node.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/Matrix3Node.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/Matrix4Node.cs
-
8com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/TransformationMatrixNode.cs
-
8com.unity.shadergraph/Editor/Data/Nodes/Input/PBR/DielectricSpecularNode.cs
-
8com.unity.shadergraph/Editor/Data/Nodes/Input/PBR/MetalReflectanceNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/PropertyNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/AmbientNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/CameraNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/FogNode.cs
-
7com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/LightProbeNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/ObjectNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/ReflectionProbeNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/ScreenNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/CubemapAssetNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleCubemapNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SamplerStateNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/Texture2DAssetNode.cs
-
36com.unity.shadergraph/Editor/Data/Nodes/MasterNode.cs
-
2com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/MultiplyNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixConstructionNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixDeterminantNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixSplitNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixTransposeNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Round/CeilingNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Round/FloorNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Round/RoundNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Round/SignNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Round/StepNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Round/TruncateNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/ArccosineNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/ArcsineNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/Arctangent2Node.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/ArctangentNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/CosineNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/DegreesToRadiansNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/HyperbolicCosineNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/HyperbolicSineNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/HyperbolicTangentNode.cs
-
5com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/RadiansToDegreesNode.cs
|
|||
# Shader Graph |
|||
|
|||
![alt text](https://forum.unity.com/proxy.php?image=https%3A%2F%2Flh5.googleusercontent.com%2FUhB18UehZFk8jMo_2V3GW-hD2wARAcQWu6FGzcUvTByHNc51w_mLZBvB6Re5GcTHJQlPHOtzi14wUPvi_yUgWTAp3-HZU463JmxL9NSjJS5yALBSAj1Bdk8yL8zXkRVe-0crKz5F&hash=49458e7088a5be61b288167af65b6faf "Shader Graph") |
|||
![Screenshot of Shader Graph](https://forum.unity.com/proxy.php?image=https%3A%2F%2Flh5.googleusercontent.com%2FUhB18UehZFk8jMo_2V3GW-hD2wARAcQWu6FGzcUvTByHNc51w_mLZBvB6Re5GcTHJQlPHOtzi14wUPvi_yUgWTAp3-HZU463JmxL9NSjJS5yALBSAj1Bdk8yL8zXkRVe-0crKz5F&hash=49458e7088a5be61b288167af65b6faf "Shader Graph") |
|||
This repository is under active development. Everything is subject to change. |
|||
|
|||
This repository is under active development. Everything is subject to change. The `master` branch is our current development branch and may not work on the latest publicly available version of Unity. Unless you intend to modify Shader Graph or want to try out the very latest and unsupported features, we recommend that you acquire Shader Graph through the Unity Package Manager. |
|||
|
|||
At the moment we recommend using Shader Graph through the [SRP repository](https://github.com/Unity-Technologies/ScriptableRenderPipeline), which has the Shader Graph submodule setup as a submodule. Otherwise you will not have any Master Node backends available and thus your shaders will be pink. This also ensure that you get a compatible set of render pipeline and Shader Graph versions. Otherwise, carry on with the following instructions. |
|||
* Clone branch `master` |
|||
* Open contained folder `MaterialGraphProject` as a Unity Project |
|||
* Quickstart guide can be found [here](https://forum.unity.com/threads/feedback-wanted-shader-graph.511960/) |
|||
* Create a new project (or use an existing) |
|||
* Clone branch `2018.1` into the `Assets` folder of your project, such that the repository is contained in a sub-folder of the `Assets` folder |
|||
* Quick start guide can be found [here](https://forum.unity.com/threads/feedback-wanted-shader-graph.511960/) |
|
|||
fileFormatVersion: 2 |
|||
guid: b141c720617d37f45a2fd27af59ccf42 |
|||
ScriptedImporter: |
|||
fileIDToRecycleName: |
|||
4800000: MainAsset |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
fileFormatVersion: 2 |
|||
guid: abcabb4945a2d6c4aa605f870d393d02 |
|||
ScriptedImporter: |
|||
fileIDToRecycleName: |
|||
4800000: MainAsset |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
fileFormatVersion: 2 |
|||
guid: e67b8be7b087145ab87b7ae0a690c35e |
|||
ScriptedImporter: |
|||
fileIDToRecycleName: |
|||
4800000: MainAsset |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
fileFormatVersion: 2 |
|||
guid: 7d765c30286182d4a9e23edbdaf01865 |
|||
ScriptedImporter: |
|||
fileIDToRecycleName: |
|||
4800000: MainAsset |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
fileFormatVersion: 2 |
|||
guid: 5afb17f32b499314c8744c5ee1859a0d |
|||
ScriptedImporter: |
|||
fileIDToRecycleName: |
|||
4800000: MainAsset |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
using System; |
|||
|
|||
namespace UnityEditor.ShaderGraph { |
|||
public enum AlphaMode |
|||
namespace UnityEditor.ShaderGraph |
|||
{ |
|||
public enum SurfaceType |
|||
AlphaBlend, |
|||
AdditiveBlend |
|||
Transparent |
|||
} |
|||
|
|||
public enum AlphaMode |
|||
{ |
|||
Alpha, |
|||
Premultiply, |
|||
Additive, |
|||
Multiply |
|||
} |
|||
} |
部分文件因为文件数量过多而无法显示
撰写
预览
正在加载...
取消
保存
Reference in new issue