From 88b2afa28fe7ab91596d3d2517e0eb24545846fb Mon Sep 17 00:00:00 2001
From: Yuri Roubinsky <chaosus89@gmail.com>
Date: Fri, 28 Jan 2022 21:36:10 +0300
Subject: [VisualShader] Merge scalar and vector derivative functions into one

---
 doc/classes/VisualShaderNodeDerivativeFunc.xml     | 42 ++++++++++++++++++++++
 .../VisualShaderNodeScalarDerivativeFunc.xml       | 30 ----------------
 .../VisualShaderNodeVectorDerivativeFunc.xml       | 30 ----------------
 3 files changed, 42 insertions(+), 60 deletions(-)
 create mode 100644 doc/classes/VisualShaderNodeDerivativeFunc.xml
 delete mode 100644 doc/classes/VisualShaderNodeScalarDerivativeFunc.xml
 delete mode 100644 doc/classes/VisualShaderNodeVectorDerivativeFunc.xml

(limited to 'doc/classes')

diff --git a/doc/classes/VisualShaderNodeDerivativeFunc.xml b/doc/classes/VisualShaderNodeDerivativeFunc.xml
new file mode 100644
index 0000000000..f7edac8597
--- /dev/null
+++ b/doc/classes/VisualShaderNodeDerivativeFunc.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="VisualShaderNodeDerivativeFunc" inherits="VisualShaderNode" version="4.0">
+	<brief_description>
+		Calculates a derivative within the visual shader graph.
+	</brief_description>
+	<description>
+		This node is only available in [code]Fragment[/code] and [code]Light[/code] visual shaders.
+	</description>
+	<tutorials>
+	</tutorials>
+	<members>
+		<member name="function" type="int" setter="set_function" getter="get_function" enum="VisualShaderNodeDerivativeFunc.Function" default="0">
+			A derivative function type. See [enum Function] for options.
+		</member>
+		<member name="op_type" type="int" setter="set_op_type" getter="get_op_type" enum="VisualShaderNodeDerivativeFunc.OpType" default="0">
+			A type of operands and returned value. See [enum OpType] for options.
+		</member>
+	</members>
+	<constants>
+		<constant name="OP_TYPE_SCALAR" value="0" enum="OpType">
+			A floating-point scalar.
+		</constant>
+		<constant name="OP_TYPE_VECTOR" value="1" enum="OpType">
+			A 3D vector type.
+		</constant>
+		<constant name="OP_TYPE_MAX" value="2" enum="OpType">
+			Represents the size of the [enum OpType] enum.
+		</constant>
+		<constant name="FUNC_SUM" value="0" enum="Function">
+			Sum of absolute derivative in [code]x[/code] and [code]y[/code].
+		</constant>
+		<constant name="FUNC_X" value="1" enum="Function">
+			Derivative in [code]x[/code] using local differencing.
+		</constant>
+		<constant name="FUNC_Y" value="2" enum="Function">
+			Derivative in [code]y[/code] using local differencing.
+		</constant>
+		<constant name="FUNC_MAX" value="3" enum="Function">
+			Represents the size of the [enum Function] enum.
+		</constant>
+	</constants>
+</class>
diff --git a/doc/classes/VisualShaderNodeScalarDerivativeFunc.xml b/doc/classes/VisualShaderNodeScalarDerivativeFunc.xml
deleted file mode 100644
index 8d108a5d28..0000000000
--- a/doc/classes/VisualShaderNodeScalarDerivativeFunc.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeScalarDerivativeFunc" inherits="VisualShaderNode" version="4.0">
-	<brief_description>
-		Calculates a scalar derivative within the visual shader graph.
-	</brief_description>
-	<description>
-		This node is only available in [code]Fragment[/code] and [code]Light[/code] visual shaders.
-	</description>
-	<tutorials>
-	</tutorials>
-	<members>
-		<member name="function" type="int" setter="set_function" getter="get_function" enum="VisualShaderNodeScalarDerivativeFunc.Function" default="0">
-			The derivative type. See [enum Function] for options.
-		</member>
-	</members>
-	<constants>
-		<constant name="FUNC_SUM" value="0" enum="Function">
-			Sum of absolute derivative in [code]x[/code] and [code]y[/code].
-		</constant>
-		<constant name="FUNC_X" value="1" enum="Function">
-			Derivative in [code]x[/code] using local differencing.
-		</constant>
-		<constant name="FUNC_Y" value="2" enum="Function">
-			Derivative in [code]y[/code] using local differencing.
-		</constant>
-		<constant name="FUNC_MAX" value="3" enum="Function">
-			Represents the size of the [enum Function] enum.
-		</constant>
-	</constants>
-</class>
diff --git a/doc/classes/VisualShaderNodeVectorDerivativeFunc.xml b/doc/classes/VisualShaderNodeVectorDerivativeFunc.xml
deleted file mode 100644
index e0c7c8618c..0000000000
--- a/doc/classes/VisualShaderNodeVectorDerivativeFunc.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVectorDerivativeFunc" inherits="VisualShaderNode" version="4.0">
-	<brief_description>
-		Calculates a vector derivative within the visual shader graph.
-	</brief_description>
-	<description>
-		This node is only available in [code]Fragment[/code] and [code]Light[/code] visual shaders.
-	</description>
-	<tutorials>
-	</tutorials>
-	<members>
-		<member name="function" type="int" setter="set_function" getter="get_function" enum="VisualShaderNodeVectorDerivativeFunc.Function" default="0">
-			A derivative type. See [enum Function] for options.
-		</member>
-	</members>
-	<constants>
-		<constant name="FUNC_SUM" value="0" enum="Function">
-			Sum of absolute derivative in [code]x[/code] and [code]y[/code].
-		</constant>
-		<constant name="FUNC_X" value="1" enum="Function">
-			Derivative in [code]x[/code] using local differencing.
-		</constant>
-		<constant name="FUNC_Y" value="2" enum="Function">
-			Derivative in [code]y[/code] using local differencing.
-		</constant>
-		<constant name="FUNC_MAX" value="3" enum="Function">
-			Represents the size of the [enum Function] enum.
-		</constant>
-	</constants>
-</class>
-- 
cgit v1.2.3