[Bf-blender-cvs] [fef2b9e2eba] soc-2020-io-performance: Fix new obj exporter curve test.

Howard Trickey noreply at git.blender.org
Sun Aug 1 02:58:45 CEST 2021


Commit: fef2b9e2ebae64cbb5fe19b01cc18dee8d50089d
Author: Howard Trickey
Date:   Sat Jul 31 20:57:42 2021 -0400
Branches: soc-2020-io-performance
https://developer.blender.org/rBfef2b9e2ebae64cbb5fe19b01cc18dee8d50089d

Fix new obj exporter curve test.

Due to a previous fix I made to the transform matrix code,
the golden data for the curve coordinates were incorrect.

===================================================================

M	source/blender/io/wavefront_obj/tests/obj_exporter_tests.hh

===================================================================

diff --git a/source/blender/io/wavefront_obj/tests/obj_exporter_tests.hh b/source/blender/io/wavefront_obj/tests/obj_exporter_tests.hh
index 6cc2abcf605..def70eff0ee 100644
--- a/source/blender/io/wavefront_obj/tests/obj_exporter_tests.hh
+++ b/source/blender/io/wavefront_obj/tests/obj_exporter_tests.hh
@@ -103,29 +103,29 @@ struct OBJExportParamsDefault {
 };
 
 const std::vector<std::vector<array_float_3>> coordinates_NurbsCurve{
-    {{9.947419, 0.000000, 0.000000},
-     {9.447419, 0.000000, 1.000000},
-     {7.447419, 0.000000, 1.000000},
-     {6.947419, 0.000000, 0.000000}}};
+    {{6.94742, 0.000000, 0.000000},
+     {7.44742, 0.000000, -1.000000},
+     {9.44742, 0.000000, -1.000000},
+     {9.94742, 0.000000, 0.000000}}};
 const std::vector<std::vector<array_float_3>> coordinates_NurbsCircle{
-    {{11.463165, 0.000000, -1.000000},
-     {12.463165, 0.000000, -1.000000},
-     {12.463165, 0.000000, 0.000000},
-     {12.463165, 0.000000, 1.000000},
-     {11.463165, 0.000000, 1.000000},
+    {{11.463165, 0.000000, 1.000000},
      {10.463165, 0.000000, 1.000000},
      {10.463165, 0.000000, 0.000000},
-     {10.463165, 0.000000, -1.000000}}};
+     {10.463165, 0.000000, -1.000000},
+     {11.463165, 0.000000, -1.000000},
+     {12.463165, 0.000000, -1.000000},
+     {12.463165, 0.000000, 0.000000},
+     {12.463165, 0.000000, 1.000000}}};
 const std::vector<std::vector<array_float_3>> coordinates_NurbsPathCurve{
-    {{17.690557, 0.000000, 0.000000},
-     {16.690557, 0.000000, 0.000000},
-     {15.690557, 0.000000, 0.000000},
+    {{13.690557, 0.000000, 0.000000},
      {14.690557, 0.000000, 0.000000},
-     {13.690557, 0.000000, 0.000000}},
-    {{17.188307, 0.000000, 0.000000},
-     {16.688307, 0.000000, 1.000000},
-     {14.688307, 0.000000, 1.000000},
-     {14.188307, 0.000000, 0.000000}}};
+     {15.690557, 0.000000, 0.000000},
+     {16.690557, 0.000000, 0.000000},
+     {17.690557, 0.000000, 0.000000}},
+    {{14.192808, 0.000000, 0.000000},
+     {14.692808, 0.000000, -1.000000},
+     {16.692808, 0.000000, -1.000000},
+     {17.192808, 0.000000, 0.000000}}};
 
 const std::map<std::string, std::unique_ptr<NurbsObject>> all_nurbs_truth = []() {
   std::map<std::string, std::unique_ptr<NurbsObject>> all_nurbs;



More information about the Bf-blender-cvs mailing list