浏览代码

Menu Reorg: Channel & Procedural

/main
Matt Dean 7 年前
当前提交
eeaa57f9
共有 31 个文件被更改,包括 38 次插入20 次删除
  1. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/CheckerboardNode.cs
  2. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/GradientRampNode.cs
  3. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/HexNode.cs
  4. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/ParticleNode.cs
  5. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/LineNode.cs
  6. 6
      MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/SplitNode.cs
  7. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/SwizzleNode.cs
  8. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/UnpackNormalNode.cs
  9. 6
      MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/CombineNode.cs
  10. 9
      MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel.meta
  11. 9
      MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural.meta
  12. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/CheckerboardNode.cs
  13. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/CheckerboardNode.cs.meta
  14. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/GradientRampNode.cs
  15. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/GradientRampNode.cs.meta
  16. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/HexNode.cs
  17. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/HexNode.cs.meta
  18. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/ParticleNode.cs
  19. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/ParticleNode.cs.meta
  20. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/LineNode.cs
  21. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/LineNode.cs.meta
  22. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/SplitNode.cs
  23. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/SplitNode.cs.meta
  24. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/SwizzleNode.cs
  25. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/SwizzleNode.cs.meta
  26. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/UnpackNormalNode.cs
  27. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/UnpackNormalNode.cs.meta
  28. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/CombineNode.cs
  29. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/CombineNode.cs.meta

4
MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/CheckerboardNode.cs


namespace UnityEngine.MaterialGraph
{
[Title("Procedural/Checkerboard Node")]
[Title("Procedural/Checkerboard")]
name = "CheckerboardNode";
name = "Checkerboard";
}
protected override string GetFunctionName()

4
MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/GradientRampNode.cs


namespace UnityEngine.MaterialGraph
{
[Title("Procedural/Gradient Ramp Node")]
[Title("Procedural/Gradient Ramp")]
name = "GradientRampNode";
name = "GradientRamp";
}
protected override string GetFunctionName()

4
MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/HexNode.cs


namespace UnityEngine.MaterialGraph
{
[Title("Procedural/Hex Node")]
[Title("Procedural/Hex")]
name = "HexNode";
name = "Hex";
}
protected override string GetFunctionName()

4
MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/ParticleNode.cs


namespace UnityEngine.MaterialGraph
{
[Title("Procedural/Particle Node")]
[Title("Procedural/Particle")]
name = "ParticleNode";
name = "Particle";
}
protected override string GetFunctionName()

4
MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/LineNode.cs


namespace UnityEngine.MaterialGraph
{
[Title("Procedural/Line Node")]
[Title("Procedural/Line")]
name = "LineNode";
name = "Line";
}
protected override string GetFunctionName()

6
MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/SplitNode.cs


namespace UnityEngine.MaterialGraph
{
[Title("Channel/Split")]
public class SplitChannelsNode : PropertyNode, IGeneratesBodyCode
public class SplitNode : PropertyNode, IGeneratesBodyCode
{
protected const string kInputSlotName = "Input";
protected const string kOutputSlotRName = "R";

public const int OutputSlotRGBId = 5;
public const int OutputSlotRGId = 6;
public SplitChannelsNode()
public SplitNode()
name = "ComponentSplit";
name = "Split";
UpdateNodeAfterDeserialization();
}

4
MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/SwizzleNode.cs


namespace UnityEngine.MaterialGraph
{
[Title("Channels/Swizzle Node")]
[Title("Channel/Swizzle")]
public class SwizzleNode : Function1Input
{
public enum SwizzleChannel

public SwizzleNode()
{
name = "SwizzleNode";
name = "Swizzle";
}
protected override string GetFunctionName()

4
MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/UnpackNormalNode.cs


namespace UnityEngine.MaterialGraph
{
[Title("Channels/Unpack Normal Node")]
[Title("Channel/Unpack Normal")]
name = "UnpackNormalNode";
name = "UnpackNormal";
}
public override bool hasPreview

6
MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/CombineNode.cs


namespace UnityEngine.MaterialGraph
{
[Title("Channel/Combine")]
public class CombineChannelsNode : PropertyNode, IGeneratesBodyCode
public class CombineNode : PropertyNode, IGeneratesBodyCode
{
protected const string kOutputSlot0Id = "Input0";
protected const string kOutputSlot1Id = "Input1";

public const int OutputSlotRGBId = 5;
public const int OutputSlotRGId = 6;
public CombineChannelsNode()
public CombineNode()
name = "ChannelsCombine";
name = "Combine";
UpdateNodeAfterDeserialization();
}

9
MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel.meta


fileFormatVersion: 2
guid: 9e3d3d0ce68bbc843b9b8734ab8d4f02
folderAsset: yes
timeCreated: 1495531110
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

9
MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural.meta


fileFormatVersion: 2
guid: e74e11761cab2b446b96ce63e2d657b3
folderAsset: yes
timeCreated: 1495530729
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

/MaterialGraphProject/Assets/Brandon/CheckerboardNode.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/CheckerboardNode.cs

/MaterialGraphProject/Assets/Brandon/CheckerboardNode.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/CheckerboardNode.cs.meta

/MaterialGraphProject/Assets/Brandon/GradientRampNode.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/GradientRampNode.cs

/MaterialGraphProject/Assets/Brandon/GradientRampNode.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/GradientRampNode.cs.meta

/MaterialGraphProject/Assets/Brandon/HexNode.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/HexNode.cs

/MaterialGraphProject/Assets/Brandon/HexNode.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/HexNode.cs.meta

/MaterialGraphProject/Assets/Brandon/ParticleNode.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/ParticleNode.cs

/MaterialGraphProject/Assets/Brandon/ParticleNode.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/ParticleNode.cs.meta

/MaterialGraphProject/Assets/Brandon/LineNode.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/LineNode.cs

/MaterialGraphProject/Assets/Brandon/LineNode.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Procedural/LineNode.cs.meta

/MaterialGraphProject/Assets/Matt&Andre/SplitChannelsNode.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/SplitNode.cs

/MaterialGraphProject/Assets/Matt&Andre/SplitChannelsNode.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/SplitNode.cs.meta

/MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/SwizzleNode.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/SwizzleNode.cs

/MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/SwizzleNode.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/SwizzleNode.cs.meta

/MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/UnpackNormalNode.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/UnpackNormalNode.cs

/MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/UnpackNormalNode.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/UnpackNormalNode.cs.meta

/MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/CombineChannelsNode.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/CombineNode.cs

/MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/CombineChannelsNode.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Channel/CombineNode.cs.meta

正在加载...
取消
保存