Merge branch 'master' into blender2.8

# Conflicts:
#	source/blender/alembic/intern/abc_exporter.h
#	source/blender/alembic/intern/abc_util.cc

4 files changed, 359 insertions, 1 deletions

diff --git a/tests/gtests/CMakeLists.txt b/tests/gtests/CMakeLists.txt
index 1d363f31119..ad77b1389f6 100644
--- a/tests/gtests/CMakeLists.txt
+++ b/tests/gtests/CMakeLists.txt
@@ -14,5 +14,7 @@ if(WITH_GTESTS)
 	add_subdirectory(blenlib)
 	add_subdirectory(guardedalloc)
 	add_subdirectory(bmesh)
+	if(WITH_ALEMBIC)
+		add_subdirectory(alembic)
+	endif()
 endif()
-
diff --git a/tests/gtests/alembic/CMakeLists.txt b/tests/gtests/alembic/CMakeLists.txt
new file mode 100644
index 00000000000..c1480910d42
--- /dev/null
+++ b/tests/gtests/alembic/CMakeLists.txt
@@ -0,0 +1,51 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2014, Blender Foundation
+# All rights reserved.
+#
+# Contributor(s): Sybren A. Stüvel
+#
+# ***** END GPL LICENSE BLOCK *****
+
+set(INC
+	.
+	..
+	../../../source/blender/blenlib
+	../../../source/blender/alembic
+	${ALEMBIC_INCLUDE_DIRS}
+	${BOOST_INCLUDE_DIR}
+	${HDF5_INCLUDE_DIRS}
+	${OPENEXR_INCLUDE_DIRS}
+)
+
+include_directories(${INC})
+
+setup_libdirs()
+get_property(BLENDER_SORTED_LIBS GLOBAL PROPERTY BLENDER_SORTED_LIBS_PROP)
+
+if(WITH_BUILDINFO)
+	set(_buildinfo_src "$<TARGET_OBJECTS:buildinfoobj>")
+else()
+	set(_buildinfo_src "")
+endif()
+
+# For motivation on doubling BLENDER_SORTED_LIBS, see ../bmesh/CMakeLists.txt
+BLENDER_SRC_GTEST(abc_matrix "abc_matrix_test.cc;${_buildinfo_src}" "${BLENDER_SORTED_LIBS};${BLENDER_SORTED_LIBS}")
+
+unset(_buildinfo_src)
+
+setup_liblinks(abc_matrix_test)
diff --git a/tests/gtests/alembic/abc_matrix_test.cc b/tests/gtests/alembic/abc_matrix_test.cc
new file mode 100644
index 00000000000..08bce1ed50f
--- /dev/null
+++ b/tests/gtests/alembic/abc_matrix_test.cc
@@ -0,0 +1,282 @@
+#include "testing/testing.h"
+
+// Keep first since utildefines defines AT which conflicts with fucking STL
+#include "intern/abc_util.h"
+
+extern "C" {
+#include "BLI_utildefines.h"
+#include "BLI_math.h"
+}
+
+
+TEST(abc_matrix, CreateRotationMatrixY_YfromZ) {
+	// Input variables
+	float rot_x_mat[3][3];
+	float rot_y_mat[3][3];
+	float rot_z_mat[3][3];
+	float euler[3] = {0.f, M_PI_4, 0.f};
+
+	// Construct expected matrices
+	float unit[3][3];
+	float rot_z_min_quart_pi[3][3];  // rotation of -pi/4 radians over z-axis
+
+	unit_m3(unit);
+	unit_m3(rot_z_min_quart_pi);
+	rot_z_min_quart_pi[0][0] = M_SQRT1_2;
+	rot_z_min_quart_pi[0][1] = -M_SQRT1_2;
+	rot_z_min_quart_pi[1][0] = M_SQRT1_2;
+	rot_z_min_quart_pi[1][1] = M_SQRT1_2;
+
+	// Run tests
+	create_swapped_rotation_matrix(rot_x_mat, rot_y_mat, rot_z_mat, euler,
+	                               ABC_YUP_FROM_ZUP);
+
+	EXPECT_M3_NEAR(rot_x_mat, unit, 1e-5f);
+	EXPECT_M3_NEAR(rot_y_mat, unit, 1e-5f);
+	EXPECT_M3_NEAR(rot_z_mat, rot_z_min_quart_pi, 1e-5f);
+}
+
+TEST(abc_matrix, CreateRotationMatrixZ_YfromZ) {
+	// Input variables
+	float rot_x_mat[3][3];
+	float rot_y_mat[3][3];
+	float rot_z_mat[3][3];
+	float euler[3] = {0.f, 0.f, M_PI_4};
+
+	// Construct expected matrices
+	float unit[3][3];
+	float rot_y_quart_pi[3][3];  // rotation of pi/4 radians over y-axis
+
+	unit_m3(unit);
+	unit_m3(rot_y_quart_pi);
+	rot_y_quart_pi[0][0] = M_SQRT1_2;
+	rot_y_quart_pi[0][2] = -M_SQRT1_2;
+	rot_y_quart_pi[2][0] = M_SQRT1_2;
+	rot_y_quart_pi[2][2] = M_SQRT1_2;
+
+	// Run tests
+	create_swapped_rotation_matrix(rot_x_mat, rot_y_mat, rot_z_mat, euler,
+	                               ABC_YUP_FROM_ZUP);
+
+	EXPECT_M3_NEAR(rot_x_mat, unit, 1e-5f);
+	EXPECT_M3_NEAR(rot_y_mat, rot_y_quart_pi, 1e-5f);
+	EXPECT_M3_NEAR(rot_z_mat, unit, 1e-5f);
+}
+
+TEST(abc_matrix, CreateRotationMatrixXYZ_YfromZ) {
+	// Input variables
+	float rot_x_mat[3][3];
+	float rot_y_mat[3][3];
+	float rot_z_mat[3][3];
+	// in degrees: X=10, Y=20, Z=30
+	float euler[3] = {0.17453292012214f, 0.34906581044197f, 0.52359879016876f};
+
+	// Construct expected matrices
+	float rot_x_p10[3][3];  // rotation of +10 degrees over x-axis
+	float rot_y_p30[3][3];  // rotation of +30 degrees over y-axis
+	float rot_z_m20[3][3];  // rotation of -20 degrees over z-axis
+
+	unit_m3(rot_x_p10);
+	rot_x_p10[1][1] =  0.9848077297210693f;
+	rot_x_p10[1][2] =  0.1736481785774231f;
+	rot_x_p10[2][1] = -0.1736481785774231f;
+	rot_x_p10[2][2] =  0.9848077297210693f;
+
+	unit_m3(rot_y_p30);
+	rot_y_p30[0][0] =  0.8660253882408142f;
+	rot_y_p30[0][2] = -0.5f;
+	rot_y_p30[2][0] =  0.5f;
+	rot_y_p30[2][2] =  0.8660253882408142f;
+
+	unit_m3(rot_z_m20);
+	rot_z_m20[0][0] =  0.9396926164627075f;
+	rot_z_m20[0][1] = -0.3420201241970062f;
+	rot_z_m20[1][0] =  0.3420201241970062f;
+	rot_z_m20[1][1] =  0.9396926164627075f;
+
+	// Run tests
+	create_swapped_rotation_matrix(rot_x_mat, rot_y_mat, rot_z_mat, euler,
+	                               ABC_YUP_FROM_ZUP);
+
+	EXPECT_M3_NEAR(rot_x_mat, rot_x_p10, 1e-5f);
+	EXPECT_M3_NEAR(rot_y_mat, rot_y_p30, 1e-5f);
+	EXPECT_M3_NEAR(rot_z_mat, rot_z_m20, 1e-5f);
+}
+
+TEST(abc_matrix, CreateRotationMatrixXYZ_ZfromY) {
+	// Input variables
+	float rot_x_mat[3][3];
+	float rot_y_mat[3][3];
+	float rot_z_mat[3][3];
+	// in degrees: X=10, Y=20, Z=30
+	float euler[3] = {0.1745329201221466f, 0.3490658104419708f, 0.5235987901687622f};
+
+	// Construct expected matrices
+	float rot_x_p10[3][3];  // rotation of +10 degrees over x-axis
+	float rot_y_m30[3][3];  // rotation of -30 degrees over y-axis
+	float rot_z_p20[3][3];  // rotation of +20 degrees over z-axis
+
+	unit_m3(rot_x_p10);
+	rot_x_p10[1][1] =  0.9848077297210693f;
+	rot_x_p10[1][2] =  0.1736481785774231f;
+	rot_x_p10[2][1] = -0.1736481785774231f;
+	rot_x_p10[2][2] =  0.9848077297210693f;
+
+	unit_m3(rot_y_m30);
+	rot_y_m30[0][0] =  0.8660253882408142f;
+	rot_y_m30[0][2] =  0.5f;
+	rot_y_m30[2][0] = -0.5f;
+	rot_y_m30[2][2] =  0.8660253882408142f;
+
+	unit_m3(rot_z_p20);
+	rot_z_p20[0][0] =  0.9396926164627075f;
+	rot_z_p20[0][1] =  0.3420201241970062f;
+	rot_z_p20[1][0] = -0.3420201241970062f;
+	rot_z_p20[1][1] =  0.9396926164627075f;
+
+	// Run tests
+	create_swapped_rotation_matrix(rot_x_mat, rot_y_mat, rot_z_mat, euler,
+	                               ABC_ZUP_FROM_YUP);
+
+	EXPECT_M3_NEAR(rot_x_mat, rot_x_p10, 1e-5f);
+	EXPECT_M3_NEAR(rot_y_mat, rot_y_m30, 1e-5f);
+	EXPECT_M3_NEAR(rot_z_mat, rot_z_p20, 1e-5f);
+}
+
+TEST(abc_matrix, CopyM44AxisSwap_YfromZ) {
+	float result[4][4];
+
+	/* Construct an input matrix that performs a rotation like the tests
+	 * above. This matrix was created by rotating a cube in Blender over
+	 * (X=10, Y=20, Z=30 degrees in XYZ order) and translating over (1, 2, 3) */
+	float input[4][4] = {
+	    { 0.81379765272f, 0.4698463380336f, -0.342020124197f, 0.f},
+	    {-0.44096961617f, 0.8825641274452f,  0.163175910711f, 0.f},
+	    { 0.37852230668f, 0.0180283170193f,  0.925416588783f, 0.f},
+	    {1.f, 2.f, 3.f, 1.f},
+	};
+
+	copy_m44_axis_swap(result, input, ABC_YUP_FROM_ZUP);
+
+	/* Check the resulting rotation & translation. */
+	float trans[4] = {1.f, 3.f, -2.f, 1.f};
+	EXPECT_V4_NEAR(trans, result[3], 1e-5f);
+
+	/* This matrix was created by rotating a cube in Blender over
+	 * (X=10, Y=30, Z=-20 degrees in XZY order) and translating over (1, 3, -2) */
+	float expect[4][4] = {
+	    {0.813797652721f, -0.342020124197f, -0.469846338033f, 0.f},
+	    {0.378522306680f,  0.925416588783f, -0.018028317019f, 0.f},
+	    {0.440969616174f, -0.163175910711f,  0.882564127445f, 0.f},
+	    {1.f, 3.f, -2.f, 1.f},
+	};
+	EXPECT_M4_NEAR(expect, result, 1e-5f);
+}
+
+TEST(abc_matrix, CopyM44AxisSwapWithScale_YfromZ) {
+	float result[4][4];
+
+	/* Construct an input matrix that performs a rotation like the tests
+	 * above. This matrix was created by rotating a cube in Blender over
+	 * (X=10, Y=20, Z=30 degrees in XYZ order), translating over (1, 2, 3),
+	 * and scaling by (4, 5, 6). */
+	float input[4][4] = {
+	    { 3.25519061088f, 1.8793853521347f, -1.368080496788f, 0.f},
+	    {-2.20484805107f, 4.4128208160400f,  0.815879583358f, 0.f},
+	    { 2.27113389968f, 0.1081698983907f,  5.552499771118f, 0.f},
+	    {1.f, 2.f, 3.f, 1.f},
+	};
+
+	copy_m44_axis_swap(result, input, ABC_YUP_FROM_ZUP);
+
+	/* This matrix was created by rotating a cube in Blender over
+	 * (X=10, Y=30, Z=-20 degrees in XZY order), translating over (1, 3, -2)
+	 * and scaling over (4, 6, 5). */
+	float expect[4][4] = {
+	    {3.255190610885f, -1.368080496788f, -1.879385352134f, 0.f},
+	    {2.271133899688f,  5.552499771118f, -0.108169898390f, 0.f},
+	    {2.204848051071f, -0.815879583358f,  4.412820816040f, 0.f},
+	    {1.f, 3.f, -2.f, 1.f},
+	};
+	EXPECT_M4_NEAR(expect, result, 1e-5f);
+}
+
+TEST(abc_matrix, CopyM44AxisSwap_ZfromY) {
+	float result[4][4];
+
+	/* This matrix was created by rotating a cube in Blender over
+	 * (X=10, Y=30, Z=-20 degrees in XZY order) and translating over (1, 3, -2) */
+	float input[4][4] = {
+	    {0.813797652721f, -0.342020124197f, -0.469846338033f, 0.f},
+	    {0.378522306680f,  0.925416588783f, -0.018028317019f, 0.f},
+	    {0.440969616174f, -0.163175910711f,  0.882564127445f, 0.f},
+	    {1.f, 3.f, -2.f, 1.f},
+	};
+
+	copy_m44_axis_swap(result, input, ABC_ZUP_FROM_YUP);
+
+	/* This matrix was created by rotating a cube in Blender over
+	 * (X=10, Y=20, Z=30 degrees in XYZ order) and translating over (1, 2, 3) */
+	float expect[4][4] = {
+	    {0.813797652721f, 0.469846338033f, -0.342020124197f, 0.f},
+	    {-0.44096961617f, 0.882564127445f,  0.163175910711f, 0.f},
+	    {0.378522306680f, 0.018028317019f,  0.925416588783f, 0.f},
+	    {1.f, 2.f, 3.f, 1.f},
+	};
+
+	EXPECT_M4_NEAR(expect, result, 1e-5f);
+}
+
+TEST(abc_matrix, CopyM44AxisSwapWithScale_ZfromY) {
+	float result[4][4];
+
+	/* This matrix was created by rotating a cube in Blender over
+	 * (X=10, Y=30, Z=-20 degrees in XZY order), translating over (1, 3, -2)
+	 * and scaling over (4, 6, 5). */
+	float input[4][4] = {
+	    {3.2551906108f, -1.36808049678f, -1.879385352134f, 0.f},
+	    {2.2711338996f,  5.55249977111f, -0.108169898390f, 0.f},
+	    {2.2048480510f, -0.81587958335f,  4.412820816040f, 0.f},
+	    {1.f, 3.f, -2.f, 1.f},
+	};
+
+	copy_m44_axis_swap(result, input, ABC_ZUP_FROM_YUP);
+
+	/* This matrix was created by rotating a cube in Blender over
+	 * (X=10, Y=20, Z=30 degrees in XYZ order), translating over (1, 2, 3),
+	 * and scaling by (4, 5, 6). */
+	float expect[4][4] = {
+	    {3.25519061088f, 1.879385352134f, -1.36808049678f, 0.f},
+	    {-2.2048480510f, 4.412820816040f,  0.81587958335f, 0.f},
+	    {2.27113389968f, 0.108169898390f,  5.55249977111f, 0.f},
+	    {1.f, 2.f, 3.f, 1.f},
+	};
+
+	EXPECT_M4_NEAR(expect, result, 1e-5f);
+}
+
+TEST(abc_matrix, CopyM44AxisSwapWithScale_gimbal_ZfromY) {
+	float result[4][4];
+
+	/* This matrix represents a rotation over (-90, -0, -0) degrees,
+	 * and a translation over (-0, -0.1, -0). It is in Y=up. */
+	float input[4][4] = {
+	    { 1.000f, 0.000f, 0.000f, 0.000f},
+	    { 0.000f, 0.000f,-1.000f, 0.000f},
+	    { 0.000f, 1.000f, 0.000f, 0.000f},
+	    {-0.000f,-0.100f,-0.000f, 1.000f},
+	};
+
+	copy_m44_axis_swap(result, input, ABC_ZUP_FROM_YUP);
+
+	/* Since the rotation is only over the X-axis, it should not change.
+	 * The translation does change. */
+	float expect[4][4] = {
+	    { 1.000f, 0.000f, 0.000f, 0.000f},
+	    { 0.000f, 0.000f,-1.000f, 0.000f},
+	    { 0.000f, 1.000f, 0.000f, 0.000f},
+	    {-0.000f, 0.000f,-0.100f, 1.000f},
+	};
+
+	EXPECT_M4_NEAR(expect, result, 1e-5f);
+}
diff --git a/tests/gtests/testing/testing.h b/tests/gtests/testing/testing.h
index 1594ed3926c..d5a7b076970 100644
--- a/tests/gtests/testing/testing.h
+++ b/tests/gtests/testing/testing.h
@@ -12,6 +12,29 @@
     EXPECT_NEAR(a[2], b[2], eps); \
   } (void) 0
 
+#define EXPECT_V4_NEAR(a, b, eps) \
+{ \
+	EXPECT_NEAR(a[0], b[0], eps); \
+	EXPECT_NEAR(a[1], b[1], eps); \
+	EXPECT_NEAR(a[2], b[2], eps); \
+	EXPECT_NEAR(a[3], b[3], eps); \
+	} (void) 0
+
+#define EXPECT_M3_NEAR(a, b, eps) \
+do { \
+	EXPECT_V3_NEAR(a[0], b[0], eps); \
+	EXPECT_V3_NEAR(a[1], b[1], eps); \
+	EXPECT_V3_NEAR(a[2], b[2], eps); \
+} while(false);
+
+#define EXPECT_M4_NEAR(a, b, eps) \
+do { \
+	EXPECT_V3_NEAR(a[0], b[0], eps); \
+	EXPECT_V3_NEAR(a[1], b[1], eps); \
+	EXPECT_V3_NEAR(a[2], b[2], eps); \
+	EXPECT_V4_NEAR(a[3], b[3], eps); \
+} while(false);
+
 #define EXPECT_MATRIX_NEAR(a, b, tolerance) \
 do { \
   bool dims_match = (a.rows() == b.rows()) && (a.cols() == b.cols()); \