diff --git a/Nodes/Complex/ComplexNodes.cs b/Nodes/Complex/ComplexNodes.cs index bd3dcf0..156d382 100644 --- a/Nodes/Complex/ComplexNodes.cs +++ b/Nodes/Complex/ComplexNodes.cs @@ -6,7 +6,7 @@ [Title("Math", "Complex", "Complex Conjugate")] -public class ComplexConjugateNode : CodeFunctionNode { +internal class ComplexConjugateNode : CodeFunctionNode { public ComplexConjugateNode() { name = "Complex Conjugate"; } @@ -26,7 +26,7 @@ static string ComplexConjugate([Slot(0, Binding.None)] Vector2 A, [Slot(1, Bindi } [Title("Math", "Complex", "Complex Reciprocal")] -public class ComplexReciprocalNode : CodeFunctionNode { +internal class ComplexReciprocalNode : CodeFunctionNode { public ComplexReciprocalNode() { name = "Complex Reciprocal"; } @@ -46,7 +46,7 @@ static string ComplexReciprocal([Slot(0, Binding.None)] Vector2 A, [Slot(1, Bind } [Title("Math", "Complex", "Complex Multiply")] -public class ComplexMultiplyNode : CodeFunctionNode { +internal class ComplexMultiplyNode : CodeFunctionNode { public ComplexMultiplyNode() { name = "Complex Multiply"; } @@ -66,7 +66,7 @@ static string ComplexMultiply([Slot(0, Binding.None)] Vector2 A, [Slot(1, Bindin } [Title("Math", "Complex", "Complex Divide")] -public class ComplexDivideNode : CodeFunctionNode { +internal class ComplexDivideNode : CodeFunctionNode { public ComplexDivideNode() { name = "Complex Divide"; } @@ -86,7 +86,7 @@ static string ComplexDivide([Slot(0, Binding.None)] Vector2 A, [Slot(1, Binding. } [Title("Math", "Complex", "Complex Exponential")] -public class ComplexExponentialNode : CodeFunctionNode { +internal class ComplexExponentialNode : CodeFunctionNode { public ComplexExponentialNode() { name = "Complex Exponential"; } @@ -108,7 +108,7 @@ static string ComplexExponential([Slot(0, Binding.None)] Vector2 A, [Slot(1, Bin } [Title("Math", "Complex", "Complex Logarithm")] -public class ComplexLogarithmNode : CodeFunctionNode { +internal class ComplexLogarithmNode : CodeFunctionNode { public ComplexLogarithmNode() { name = "Complex Logarithm"; } @@ -128,7 +128,7 @@ static string ComplexLogarithm([Slot(0, Binding.None)] Vector2 A, [Slot(1, Bindi } [Title("Math", "Complex", "Complex Power")] -public class ComplexPowerNode : CodeFunctionNode { +internal class ComplexPowerNode : CodeFunctionNode { public ComplexPowerNode() { name = "Complex Power"; } diff --git a/Nodes/Composite/CompositeNodes.cs b/Nodes/Composite/CompositeNodes.cs index 02378be..cbe7935 100644 --- a/Nodes/Composite/CompositeNodes.cs +++ b/Nodes/Composite/CompositeNodes.cs @@ -17,7 +17,7 @@ public enum CompositeMode } [Title("Compositing", "Composite")] -public class CompositeNode : CodeFunctionNode { +internal class CompositeNode : CodeFunctionNode { [SerializeField] private CompositeMode m_CompositeMode = CompositeMode.Over; diff --git a/Nodes/Gilescoope.ShaderGraphNodes.Internal.asmref b/Nodes/Gilescoope.ShaderGraphNodes.Internal.asmref new file mode 100644 index 0000000..6f5b7c2 --- /dev/null +++ b/Nodes/Gilescoope.ShaderGraphNodes.Internal.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:be0903cd8e1546f498710afdc59db5eb" +} \ No newline at end of file diff --git a/Nodes/Gilescoope.ShaderGraphNodes.Internal.asmref.meta b/Nodes/Gilescoope.ShaderGraphNodes.Internal.asmref.meta new file mode 100644 index 0000000..2b15f0e --- /dev/null +++ b/Nodes/Gilescoope.ShaderGraphNodes.Internal.asmref.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9ec9568158df4a24a9c70fd5f68c34b5 +AssemblyDefinitionReferenceImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Nodes/Halftone/HalftoneNodes.cs b/Nodes/Halftone/HalftoneNodes.cs index 18d5051..4d0ec40 100644 --- a/Nodes/Halftone/HalftoneNodes.cs +++ b/Nodes/Halftone/HalftoneNodes.cs @@ -14,7 +14,7 @@ public enum HalftoneMode { } [Title("Halftone", "Halftone Monochrome")] -public class HalftoneMonochromeNode : CodeFunctionNode { +internal class HalftoneMonochromeNode : CodeFunctionNode { [SerializeField] private HalftoneMode m_HalftoneMode = HalftoneMode.Circle; public HalftoneMonochromeNode() { @@ -85,7 +85,7 @@ private static string HalftoneMonochrome_Square([Slot(0, Binding.None)] Vector1 } [Title("Halftone", "Halftone Color")] -public class HalftoneColorNode : CodeFunctionNode { +internal class HalftoneColorNode : CodeFunctionNode { [SerializeField] private HalftoneMode m_HalftoneMode = HalftoneMode.Circle; public HalftoneColorNode() { diff --git a/Nodes/Lab Color/LabColorNodes.cs b/Nodes/Lab Color/LabColorNodes.cs index afd6815..5585845 100644 --- a/Nodes/Lab Color/LabColorNodes.cs +++ b/Nodes/Lab Color/LabColorNodes.cs @@ -7,7 +7,7 @@ using UnityEngine; [Title("Artistic", "Utility", "Color Scheme Complimentary")] -public class ComplimentaryNode : CodeFunctionNode { +internal class ComplimentaryNode : CodeFunctionNode { public ComplimentaryNode() { name = "Color Scheme Complimentary"; } @@ -45,7 +45,7 @@ private static string Complimentary([Slot(0, Binding.None)] Vector4 In, [Slot(1, } [Title("Artistic", "Utility", "Color Scheme Split")] -public class SplitNode : CodeFunctionNode { +internal class SplitNode : CodeFunctionNode { public SplitNode() { name = "Color Scheme Split"; } @@ -93,7 +93,7 @@ private static string Split([Slot(0, Binding.None)] Vector4 In, [Slot(1, Binding } [Title("Artistic", "Utility", "Color Scheme Dual")] -public class DualNode : CodeFunctionNode { +internal class DualNode : CodeFunctionNode { public DualNode() { name = "Color Scheme Dual"; } @@ -177,7 +177,7 @@ Enum IEnumConversion.to { } [Title("Artistic", "Utility", "Lab Colorspace Conversion")] -public class LabColorspaceConversionNode : CodeFunctionNode { +internal class LabColorspaceConversionNode : CodeFunctionNode { [SerializeField] private LabColorspaceConversion m_Conversion = new LabColorspaceConversion(LabColorspace.RGB, LabColorspace.RGB); public LabColorspaceConversionNode() { diff --git a/Nodes/Pattern/PatternNodes.cs b/Nodes/Pattern/PatternNodes.cs index b6f703c..b9e465e 100644 --- a/Nodes/Pattern/PatternNodes.cs +++ b/Nodes/Pattern/PatternNodes.cs @@ -4,7 +4,7 @@ using UnityEngine; [Title("Pattern", "Zig Zag")] -public class ZigZagNode : CodeFunctionNode { +internal class ZigZagNode : CodeFunctionNode { public ZigZagNode() { name = "Zig Zag"; } @@ -27,7 +27,7 @@ static string ZigZag([Slot(0, Binding.WorldSpacePosition)] Vector2 UV, [Slot(1, } [Title("Pattern", "Sine Waves")] -public class SineWavesNode : CodeFunctionNode { +internal class SineWavesNode : CodeFunctionNode { public SineWavesNode() { name = "Sine Waves"; } @@ -51,7 +51,7 @@ static string SineWaves([Slot(0, Binding.WorldSpacePosition)] Vector2 UV, [Slot( } [Title("Pattern", "Round Waves")] -public class RoundWavesNode : CodeFunctionNode { +internal class RoundWavesNode : CodeFunctionNode { public RoundWavesNode() { name = "Round Waves"; } @@ -81,7 +81,7 @@ static string RoundWaves([Slot(0, Binding.WorldSpacePosition)] Vector2 UV, [Slot } [Title("Pattern", "Dots")] -public class DotsNode : CodeFunctionNode { +internal class DotsNode : CodeFunctionNode { public DotsNode() { name = "Dots"; } @@ -110,7 +110,7 @@ static string Dots([Slot(0, Binding.WorldSpacePosition)] Vector2 UV, [Slot(1, Bi } [Title("Pattern", "Spiral")] -public class SpiralNode : CodeFunctionNode { +internal class SpiralNode : CodeFunctionNode { public SpiralNode() { name = "Spiral"; } @@ -135,7 +135,7 @@ static string Spiral([Slot(0, Binding.WorldSpacePosition)] Vector2 UV, [Slot(1, [Title("Pattern", "Whirl")] -public class WhirlNode : CodeFunctionNode { +internal class WhirlNode : CodeFunctionNode { public WhirlNode() { name = "Whirl"; } diff --git a/Nodes/Pixel Perfect/PixelPerfectNodes.cs b/Nodes/Pixel Perfect/PixelPerfectNodes.cs index 143aa42..5b02f08 100644 --- a/Nodes/Pixel Perfect/PixelPerfectNodes.cs +++ b/Nodes/Pixel Perfect/PixelPerfectNodes.cs @@ -4,7 +4,7 @@ using UnityEngine; [Title("Pixel Perfect", "Pixel Point")] -public class PixelPointNode : CodeFunctionNode { +internal class PixelPointNode : CodeFunctionNode { public PixelPointNode() { name = "Pixel Point"; } @@ -32,7 +32,7 @@ static string PixelPoint([Slot(0, Binding.WorldSpacePosition)] Vector2 UV, [Slot } [Title("Pixel Perfect", "Pixel Point Grid")] -public class PixelPointGridNode : CodeFunctionNode { +internal class PixelPointGridNode : CodeFunctionNode { public PixelPointGridNode() { name = "Pixel Point Grid"; } @@ -62,7 +62,7 @@ static string PixelPointGrid([Slot(0, Binding.WorldSpacePosition)] Vector2 UV, [ } [Title("Pixel Perfect", "Pixel Ray")] -public class PixelRayNode : CodeFunctionNode { +internal class PixelRayNode : CodeFunctionNode { public PixelRayNode() { name = "Pixel Ray"; } @@ -89,7 +89,7 @@ static string PixelRay([Slot(0, Binding.WorldSpacePosition)] Vector2 UV, [Slot(1 } [Title("Pixel Perfect", "Pixel Rays")] -public class PixelRaysNode : CodeFunctionNode { +internal class PixelRaysNode : CodeFunctionNode { public PixelRaysNode() { name = "Pixel Rays"; } @@ -119,7 +119,7 @@ static string PixelRays([Slot(0, Binding.WorldSpacePosition)] Vector2 UV, [Slot( } [Title("Pixel Perfect", "Pixel Line")] -public class PixelLineNode : CodeFunctionNode { +internal class PixelLineNode : CodeFunctionNode { public PixelLineNode() { name = "Pixel Line"; } @@ -153,7 +153,7 @@ static string PixelLine([Slot(0, Binding.WorldSpacePosition)] Vector2 UV, [Slot( } [Title("Pixel Perfect", "Pixel Lines")] -public class PixelLinesNode : CodeFunctionNode { +internal class PixelLinesNode : CodeFunctionNode { public PixelLinesNode() { name = "Pixel Lines"; } @@ -190,7 +190,7 @@ static string PixelLines([Slot(0, Binding.WorldSpacePosition)] Vector2 UV, [Slot } [Title("Pixel Perfect", "Pixel Circle")] -public class PixelCircleNode : CodeFunctionNode { +internal class PixelCircleNode : CodeFunctionNode { public PixelCircleNode() { name = "Pixel Circle"; } @@ -222,7 +222,7 @@ static string PixelCircle([Slot(0, Binding.WorldSpacePosition)] Vector2 UV, [Slo } [Title("Pixel Perfect", "Pixel Polygon")] -public class PixelPolygonNode : CodeFunctionNode { +internal class PixelPolygonNode : CodeFunctionNode { public PixelPolygonNode() { name = "Pixel Polygon"; } diff --git a/Nodes/Quaternion/QuaternionNodes.cs b/Nodes/Quaternion/QuaternionNodes.cs index da6680f..d88c031 100644 --- a/Nodes/Quaternion/QuaternionNodes.cs +++ b/Nodes/Quaternion/QuaternionNodes.cs @@ -4,7 +4,7 @@ using UnityEngine; [Title("Math", "Quaternion", "Quaternion Inverse")] -public class QuaternionInverseNode : CodeFunctionNode { +internal class QuaternionInverseNode : CodeFunctionNode { public QuaternionInverseNode() { name = "Quaternion Inverse"; } @@ -25,7 +25,7 @@ static string QuaternionInverse([Slot(0, Binding.None, 0, 0, 0, 1)] Vector4 Q, [ } [Title("Math", "Quaternion", "Quaternion From Euler")] -public class QuaternionFromEulerNode : CodeFunctionNode { +internal class QuaternionFromEulerNode : CodeFunctionNode { public QuaternionFromEulerNode() { name = "Quaternion From Euler"; } @@ -50,7 +50,7 @@ static string QuaternionFromEuler([Slot(0, Binding.None)] Vector3 V, [Slot(1, Bi } [Title("Math", "Quaternion", "Quaternion From Angle Axis")] -public class QuaternionFromAngleAxisNode : CodeFunctionNode { +internal class QuaternionFromAngleAxisNode : CodeFunctionNode { public QuaternionFromAngleAxisNode() { name = "Quaternion From Angle Axis"; } @@ -73,7 +73,7 @@ static string QuaternionFromAngleAxis([Slot(0, Binding.None)] Vector1 Angle, [Sl } [Title("Math", "Quaternion", "Quaternion To Angle Axis")] -public class QuaternionToAngleAxisNode : CodeFunctionNode { +internal class QuaternionToAngleAxisNode : CodeFunctionNode { public QuaternionToAngleAxisNode() { name = "Quaternion To Angle Axis"; } @@ -95,7 +95,7 @@ static string QuaternionToAngleAxis([Slot(0, Binding.None, 0, 0, 0, 1)] Vector4 } [Title("Math", "Quaternion", "Quaternion From To Rotation")] -public class QuaternionFromToRotationNode : CodeFunctionNode { +internal class QuaternionFromToRotationNode : CodeFunctionNode { public QuaternionFromToRotationNode() { name = "Quaternion From To Rotation Node"; } @@ -116,7 +116,7 @@ static string QuaternionFromToRotation([Slot(0, Binding.None)] Vector3 From, [Sl } [Title("Math", "Quaternion", "Quaternion Multiply")] -public class QuaternionMultiplyNode : CodeFunctionNode { +internal class QuaternionMultiplyNode : CodeFunctionNode { public QuaternionMultiplyNode() { name = "Quaternion Multiply"; } @@ -137,7 +137,7 @@ static string QuaternionMultiply([Slot(0, Binding.None, 0, 0, 0, 1)] Vector4 P, } [Title("Math", "Quaternion", "Quaternion Rotate Vector")] -public class QuaternionRotateVectorNode : CodeFunctionNode { +internal class QuaternionRotateVectorNode : CodeFunctionNode { public QuaternionRotateVectorNode() { name = "Quaternion Rotate Vector"; } @@ -158,7 +158,7 @@ static string QuaternionRotateVector([Slot(0, Binding.None)] Vector3 V, [Slot(1, } [Title("Math", "Quaternion", "Quaternion Slerp")] -public class QuaternionSlerpNode : CodeFunctionNode { +internal class QuaternionSlerpNode : CodeFunctionNode { public QuaternionSlerpNode() { name = "Quaternion Slerp"; } diff --git a/Nodes/Random/RandomNodes.cs b/Nodes/Random/RandomNodes.cs index 8dd4700..3c4fb02 100644 --- a/Nodes/Random/RandomNodes.cs +++ b/Nodes/Random/RandomNodes.cs @@ -9,7 +9,7 @@ [Title("Math", "Random", "Random Integer Range")] -public class RandomIntegerNode : CodeFunctionNode { +internal class RandomIntegerNode : CodeFunctionNode { public RandomIntegerNode() { name = "Random Integer Range"; } @@ -37,7 +37,7 @@ public enum RandomMode { } [Title("Math", "Random", "Random Circle")] -public class RandomCircleNode : CodeFunctionNode { +internal class RandomCircleNode : CodeFunctionNode { [SerializeField] private RandomMode m_RandomMode = RandomMode.In; public RandomCircleNode() { @@ -89,7 +89,7 @@ static string RandomCircle_On([Slot(0, Binding.None)] Vector2 Seed, [Slot(1, Bin } [Title("Math", "Random", "Random Sphere")] -public class RandomSphereNode : CodeFunctionNode { +internal class RandomSphereNode : CodeFunctionNode { [SerializeField] private RandomMode m_RandomMode = RandomMode.In; public RandomSphereNode() { @@ -145,7 +145,7 @@ static string RandomSphere_On([Slot(0, Binding.None)] Vector2 Seed, [Slot(1, Bin } [Title("Math", "Random", "Random Rotation")] -public class RandomRotationNode : CodeFunctionNode { +internal class RandomRotationNode : CodeFunctionNode { public RandomRotationNode() { name = "Random Rotation"; } @@ -169,7 +169,7 @@ static string RandomRotation([Slot(0, Binding.None)] Vector2 Seed, [Slot(1, Bind } [Title("Math", "Random", "Random Color")] -public class RandomColorNode : CodeFunctionNode { +internal class RandomColorNode : CodeFunctionNode { public RandomColorNode() { name = "Random Color"; } diff --git a/Nodes/SDF/SDFNodes.cs b/Nodes/SDF/SDFNodes.cs index d048f17..3cb8ac8 100644 --- a/Nodes/SDF/SDFNodes.cs +++ b/Nodes/SDF/SDFNodes.cs @@ -7,7 +7,7 @@ using UnityEngine; [Title("SDF", "SDF Line")] -public class SDFLineNode: CodeFunctionNode { +internal class SDFLineNode: CodeFunctionNode { public SDFLineNode() { name = "SDF Line"; } @@ -27,7 +27,7 @@ private static string SDFLine([Slot(0, Binding.WorldSpacePosition)] Vector2 UV, } [Title("SDF", "SDF Circle")] -public class SDFCircleNode: CodeFunctionNode { +internal class SDFCircleNode: CodeFunctionNode { public SDFCircleNode() { name = "SDF Circle"; } @@ -47,7 +47,7 @@ private static string SDFCircle([Slot(0, Binding.WorldSpacePosition)] Vector2 UV } [Title("SDF", "SDF Rectangle")] -public class SDFRectangleNode: CodeFunctionNode { +internal class SDFRectangleNode: CodeFunctionNode { public SDFRectangleNode() { name = "SDF Rectangle"; } @@ -69,7 +69,7 @@ private static string SDFRectangle([Slot(0, Binding.WorldSpacePosition)] Vector2 } [Title("SDF", "SDF Polygon")] -public class SDFPolygonNode: CodeFunctionNode { +internal class SDFPolygonNode: CodeFunctionNode { public SDFPolygonNode() { name = "SDF Polygon"; } @@ -101,7 +101,7 @@ private static string SDFPolygon([Slot(0, Binding.WorldSpacePosition)] Vector2 U } [Title("SDF", "SDF Sample")] -public class SDFSampleNode: CodeFunctionNode { +internal class SDFSampleNode: CodeFunctionNode { public SDFSampleNode() { name = "SDF Sample"; } @@ -122,7 +122,7 @@ private static string SDFSample([Slot(0, Binding.None)] Vector1 SDF, [Slot(1, Bi } [Title("SDF", "SDF Sample Strip")] -public class SDFSampleStripNode: CodeFunctionNode { +internal class SDFSampleStripNode: CodeFunctionNode { public SDFSampleStripNode() { name = "SDF Sample Strip"; } @@ -150,7 +150,7 @@ public enum BooleanMode } [Title("SDF", "SDF Boolean")] -public class SDFBooleanNode: CodeFunctionNode { +internal class SDFBooleanNode: CodeFunctionNode { [SerializeField] private BooleanMode m_BooleanMode = BooleanMode.Union; @@ -211,7 +211,7 @@ private static string SDFBoolean_Difference([Slot(0, Binding.None)] Vector1 A, [ } [Title("SDF", "SDF Boolean Soft")] -public class SDFBooleanSoftNode: CodeFunctionNode { +internal class SDFBooleanSoftNode: CodeFunctionNode { [SerializeField] private BooleanMode m_BooleanMode = BooleanMode.Union; diff --git a/Nodes/Symmetry/SymmetryNodes.cs b/Nodes/Symmetry/SymmetryNodes.cs index bdfe29e..e1627cc 100644 --- a/Nodes/Symmetry/SymmetryNodes.cs +++ b/Nodes/Symmetry/SymmetryNodes.cs @@ -7,7 +7,7 @@ using UnityEngine; [Title("Symmetry", "Reflection Symmetry")] -public class ReflectionNode: CodeFunctionNode { +internal class ReflectionNode: CodeFunctionNode { public ReflectionNode() { name = "Reflection Symmetry"; } @@ -32,7 +32,7 @@ private static string Reflection([Slot(0, Binding.None)] Vector2 UV, [Slot(1, Bi } [Title("Symmetry", "Rotation Symmetry")] -public class RotationNode: CodeFunctionNode { +internal class RotationNode: CodeFunctionNode { public RotationNode() { name = "Rotation Symmetry"; } @@ -69,7 +69,7 @@ public enum TilingMode { [Title("Symmetry", "Tiling Symmetry")] -public class TilingNode : CodeFunctionNode { +internal class TilingNode : CodeFunctionNode { [SerializeField] private TilingMode m_TilingMode = TilingMode.Square; public TilingNode() { diff --git a/Nodes/Truchet/TruchetNodes.cs b/Nodes/Truchet/TruchetNodes.cs index 6ab6fca..bf9e125 100644 --- a/Nodes/Truchet/TruchetNodes.cs +++ b/Nodes/Truchet/TruchetNodes.cs @@ -15,7 +15,7 @@ public enum TruchetMode { } [Title("Truchet", "Truchet")] -public class TruchetNode : CodeFunctionNode { +internal class TruchetNode : CodeFunctionNode { [SerializeField] private TruchetMode m_TruchetMode = TruchetMode.Square; public TruchetNode() { diff --git a/README.md b/README.md index c1a87e5..713b733 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,11 @@ # shader-graph-nodes -Custom Nodes for Unity Shader Graph, to be used in Unity 2018.2 with the scriptable render pipeline. +Custom Nodes for Unity Shader Graph, to be used in newer Unity versions with the SRP / URP / HDRP.\ +It uses CodeFunctionNode API, which was made internal in 2018.2, but is now accessible using +[AsmRef](https://docs.unity.cn/2019.4/Documentation/Manual/class-AssemblyDefinitionReferenceImporter.html). + +**Requires Unity 2019.4 or higher.**\ +If you wish to use it in older versions, you'll need to remove .asmref file in Nodes folder. [SDF](https://github.com/gilescoope/shader-graph-nodes/tree/master/Nodes/SDF)