Shading: Extend Noise node to other dimenstions.

This patch extends perlin noise to operate in 1D, 2D, 3D, and 4D
space. The noise code has also been refactored to be more readable.

The Color output and distortion patterns changed, so this patch
breaks backward compatibility. This is due to the fact that we
now use random offsets as noise seeds, as opposed to swizzling
and constants offsets.

Reviewers: brecht, JacquesLucke

Differential Revision: https://developer.blender.org/D5560

1 files changed, 291 insertions, 0 deletions

diff --git a/intern/cycles/kernel/shaders/vector2.h b/intern/cycles/kernel/shaders/vector2.h
new file mode 100644
index 00000000000..c524735d892
--- /dev/null
+++ b/intern/cycles/kernel/shaders/vector2.h
@@ -0,0 +1,291 @@
+// Open Shading Language : Copyright (c) 2009-2017 Sony Pictures Imageworks Inc., et al.
+// https://github.com/imageworks/OpenShadingLanguage/blob/master/LICENSE
+
+#pragma once
+#define VECTOR2_H
+
+// vector2 is a 2D vector
+struct vector2 {
+  float x;
+  float y;
+};
+
+//
+// For vector2, define math operators to match vector
+//
+
+vector2 __operator__neg__(vector2 a)
+{
+  return vector2(-a.x, -a.y);
+}
+
+vector2 __operator__add__(vector2 a, vector2 b)
+{
+  return vector2(a.x + b.x, a.y + b.y);
+}
+
+vector2 __operator__add__(vector2 a, int b)
+{
+  return a + vector2(b, b);
+}
+
+vector2 __operator__add__(vector2 a, float b)
+{
+  return a + vector2(b, b);
+}
+
+vector2 __operator__add__(int a, vector2 b)
+{
+  return vector2(a, a) + b;
+}
+
+vector2 __operator__add__(float a, vector2 b)
+{
+  return vector2(a, a) + b;
+}
+
+vector2 __operator__sub__(vector2 a, vector2 b)
+{
+  return vector2(a.x - b.x, a.y - b.y);
+}
+
+vector2 __operator__sub__(vector2 a, int b)
+{
+  return a - vector2(b, b);
+}
+
+vector2 __operator__sub__(vector2 a, float b)
+{
+  return a - vector2(b, b);
+}
+
+vector2 __operator__sub__(int a, vector2 b)
+{
+  return vector2(a, a) - b;
+}
+
+vector2 __operator__sub__(float a, vector2 b)
+{
+  return vector2(a, a) - b;
+}
+
+vector2 __operator__mul__(vector2 a, vector2 b)
+{
+  return vector2(a.x * b.x, a.y * b.y);
+}
+
+vector2 __operator__mul__(vector2 a, int b)
+{
+  return a * vector2(b, b);
+}
+
+vector2 __operator__mul__(vector2 a, float b)
+{
+  return a * vector2(b, b);
+}
+
+vector2 __operator__mul__(int a, vector2 b)
+{
+  return b * vector2(a, a);
+}
+
+vector2 __operator__mul__(float a, vector2 b)
+{
+  return b * vector2(a, a);
+}
+
+vector2 __operator__div__(vector2 a, vector2 b)
+{
+  return vector2(a.x / b.x, a.y / b.y);
+}
+
+vector2 __operator__div__(vector2 a, int b)
+{
+  float b_inv = 1 / b;
+  return a * vector2(b_inv, b_inv);
+}
+
+vector2 __operator__div__(vector2 a, float b)
+{
+  float b_inv = 1 / b;
+  return a * vector2(b_inv, b_inv);
+}
+
+vector2 __operator__div__(int a, vector2 b)
+{
+  return vector2(a, a) / b;
+}
+
+vector2 __operator__div__(float a, vector2 b)
+{
+  return vector2(a, a) / b;
+}
+
+int __operator__eq__(vector2 a, vector2 b)
+{
+  return (a.x == b.x) && (a.y == b.y);
+}
+
+int __operator__ne__(vector2 a, vector2 b)
+{
+  return (a.x != b.x) || (a.y != b.y);
+}
+
+//
+// For vector2, define most of the stdosl functions to match vector
+//
+
+vector2 abs(vector2 a)
+{
+  return vector2(abs(a.x), abs(a.y));
+}
+
+vector2 ceil(vector2 a)
+{
+  return vector2(ceil(a.x), ceil(a.y));
+}
+
+vector2 floor(vector2 a)
+{
+  return vector2(floor(a.x), floor(a.y));
+}
+
+vector2 sqrt(vector2 a)
+{
+  return vector2(sqrt(a.x), sqrt(a.y));
+}
+
+vector2 exp(vector2 a)
+{
+  return vector2(exp(a.x), exp(a.y));
+}
+
+vector2 log(vector2 a)
+{
+  return vector2(log(a.x), log(a.y));
+}
+
+vector2 log2(vector2 a)
+{
+  return vector2(log2(a.x), log2(a.y));
+}
+
+vector2 mix(vector2 a, vector2 b, float x)
+{
+  return vector2(mix(a.x, b.x, x), mix(a.y, b.y, x));
+}
+
+float dot(vector2 a, vector2 b)
+{
+  return (a.x * b.x + a.y * b.y);
+}
+
+float length(vector2 a)
+{
+  return hypot(a.x, a.y);
+}
+
+vector2 smoothstep(vector2 low, vector2 high, vector2 in)
+{
+  return vector2(smoothstep(low.x, high.x, in.x), smoothstep(low.y, high.y, in.y));
+}
+
+vector2 smoothstep(float low, float high, vector2 in)
+{
+  return vector2(smoothstep(low, high, in.x), smoothstep(low, high, in.y));
+}
+
+vector2 clamp(vector2 in, vector2 low, vector2 high)
+{
+  return vector2(clamp(in.x, low.x, high.x), clamp(in.y, low.y, high.y));
+}
+
+vector2 clamp(vector2 in, float low, float high)
+{
+  return clamp(in, vector2(low, low), vector2(high, high));
+}
+
+vector2 max(vector2 a, vector2 b)
+{
+  return vector2(max(a.x, b.x), max(a.y, b.y));
+}
+
+vector2 max(vector2 a, float b)
+{
+  return max(a, vector2(b, b));
+}
+
+vector2 normalize(vector2 a)
+{
+  return a / length(a);
+}
+
+vector2 min(vector2 a, vector2 b)
+{
+  return vector2(min(a.x, a.x), min(b.y, b.y));
+}
+
+vector2 min(vector2 a, float b)
+{
+  return min(a, vector2(b, b));
+}
+
+vector2 fmod(vector2 a, vector2 b)
+{
+  return vector2(fmod(a.x, b.x), fmod(a.y, b.y));
+}
+
+vector2 fmod(vector2 a, float b)
+{
+  return fmod(a, vector2(b, b));
+}
+
+vector2 pow(vector2 in, vector2 amount)
+{
+  return vector2(pow(in.x, amount.x), pow(in.y, amount.y));
+}
+
+vector2 pow(vector2 in, float amount)
+{
+  return pow(in, vector2(amount, amount));
+}
+
+vector2 sign(vector2 a)
+{
+  return vector2(sign(a.x), sign(a.y));
+}
+
+vector2 sin(vector2 a)
+{
+  return vector2(sin(a.x), sin(a.y));
+}
+
+vector2 cos(vector2 a)
+{
+  return vector2(cos(a.x), cos(a.y));
+}
+
+vector2 tan(vector2 a)
+{
+  return vector2(tan(a.x), tan(a.y));
+}
+
+vector2 asin(vector2 a)
+{
+  return vector2(asin(a.x), asin(a.y));
+}
+
+vector2 acos(vector2 a)
+{
+  return vector2(acos(a.x), acos(a.y));
+}
+
+vector2 atan2(vector2 a, float f)
+{
+  return vector2(atan2(a.x, f), atan2(a.y, f));
+}
+
+vector2 atan2(vector2 a, vector2 b)
+{
+  return vector2(atan2(a.x, b.x), atan2(a.y, b.y));
+}