[Bf-blender-cvs] [4708ee96e76] temp-T97352-3d-texturing-seam-bleeding-b: Remove old test cases.
Jeroen Bakker
noreply at git.blender.org
Fri May 20 15:38:53 CEST 2022
Commit: 4708ee96e76e4c48d3a2afa48e655b5f679d9015
Author: Jeroen Bakker
Date: Fri May 20 15:38:39 2022 +0200
Branches: temp-T97352-3d-texturing-seam-bleeding-b
https://developer.blender.org/rB4708ee96e76e4c48d3a2afa48e655b5f679d9015
Remove old test cases.
===================================================================
M source/blender/blenkernel/CMakeLists.txt
D source/blender/blenkernel/intern/uv_islands_test.cc
===================================================================
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index e8609ba5592..0b4f81df452 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -834,10 +834,6 @@ if(WITH_GTESTS)
intern/lib_remap_test.cc
intern/tracking_test.cc
)
- # Temp override test_src to speedup linking.
- set(TEST_SRC
- intern/uv_islands_test.cc
- )
set(TEST_INC
../editors/include
)
diff --git a/source/blender/blenkernel/intern/uv_islands_test.cc b/source/blender/blenkernel/intern/uv_islands_test.cc
deleted file mode 100644
index 11994685ea6..00000000000
--- a/source/blender/blenkernel/intern/uv_islands_test.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-#include "testing/testing.h"
-
-#include "BKE_uv_islands.hh"
-
-namespace blender::bke::uv_islands::tests {
-
-TEST(uv_island, join)
-{
- Primitive primitive(0,
- UVIslandEdge(float2(0.625000, 0.500000), float2(0.875000, 0.750000)),
- UVIslandEdge(float2(0.875000, 0.750000), float2(0.625000, 0.750000)),
- UVIslandEdge(float2(0.625000, 0.750000), float2(0.625000, 0.500000)));
- UVIsland island1;
- island1.add(UVIslandEdge(float2(0.375000, 0.000000), float2(0.625000, 0.000000))); // 0
- island1.add(UVIslandEdge(float2(0.625000, 0.000000), float2(0.625000, 0.250000))); // 1
- island1.add(UVIslandEdge(float2(0.625000, 0.250000), float2(0.625000, 0.500000))); // 2
- island1.add(UVIslandEdge(float2(0.625000, 0.500000), float2(0.875000, 0.750000))); // 3
- island1.add(UVIslandEdge(float2(0.875000, 0.750000), float2(0.625000, 0.750000))); // 4
- island1.add(UVIslandEdge(float2(0.625000, 0.750000), float2(0.625000, 1.000000))); // 5
- island1.add(UVIslandEdge(float2(0.625000, 1.000000), float2(0.375000, 1.000000))); // 6
- island1.add(UVIslandEdge(float2(0.375000, 1.000000), float2(0.375000, 0.750000))); // 7
- island1.add(UVIslandEdge(float2(0.375000, 0.750000), float2(0.125000, 0.750000))); // 8
- island1.add(UVIslandEdge(float2(0.125000, 0.750000), float2(0.125000, 0.500000))); // 9
- island1.add(UVIslandEdge(float2(0.125000, 0.500000), float2(0.375000, 0.500000))); // 10
- island1.add(UVIslandEdge(float2(0.375000, 0.500000), float2(0.375000, 0.250000))); // 11
- island1.add(UVIslandEdge(float2(0.375000, 0.250000), float2(0.375000, 0.000000))); // 12
-
- UVIsland island2;
- island2.add(UVIslandEdge(float2(0.625000, 0.500000), float2(0.875000, 0.500000))); // 0
- island2.add(UVIslandEdge(float2(0.875000, 0.500000), float2(0.875000, 0.750000))); // 1
- island2.add(UVIslandEdge(float2(0.875000, 0.750000), float2(0.625000, 0.750000))); // 2
- island2.add(UVIslandEdge(float2(0.625000, 0.750000), float2(0.625000, 0.500000))); // 3
-
- island1.join(island2, primitive);
-}
-
-TEST(uv_islands, join_22_reversed_winding_order)
-{
- Primitive primitive(0,
- UVIslandEdge(float2(0.750000, 0.500000), float2(0.718750, 0.562500)),
- UVIslandEdge(float2(0.718750, 0.562500), float2(0.718750, 0.500000)),
- UVIslandEdge(float2(0.718750, 0.500000), float2(0.750000, 0.500000)));
- UVIsland island1;
- island1.add(UVIslandEdge(float2(0.750000, 0.437500), float2(0.750000, 0.500000)));
- island1.add(UVIslandEdge(float2(0.750000, 0.500000), float2(0.718750, 0.562500))); // 0
- island1.add(UVIslandEdge(float2(0.718750, 0.562500), float2(0.718750, 0.500000))); // 1
- island1.add(UVIslandEdge(float2(0.718750, 0.500000), float2(0.718750, 0.437500)));
- island1.add(UVIslandEdge(float2(0.718750, 0.437500), float2(0.718750, 0.375000)));
- island1.add(UVIslandEdge(float2(0.718750, 0.375000), float2(0.718750, 0.312500)));
- island1.add(UVIslandEdge(float2(0.718750, 0.312500), float2(0.750000, 0.312500)));
- island1.add(UVIslandEdge(float2(0.750000, 0.312500), float2(0.750000, 0.375000)));
- island1.add(UVIslandEdge(float2(0.750000, 0.375000), float2(0.750000, 0.437500)));
-
- UVIsland island2;
- island2.add(UVIslandEdge(float2(0.750000, 0.562500), float2(0.750000, 0.625000)));
- island2.add(UVIslandEdge(float2(0.750000, 0.625000), float2(0.718750, 0.625000)));
- island2.add(UVIslandEdge(float2(0.718750, 0.625000), float2(0.718750, 0.562500)));
- island2.add(UVIslandEdge(float2(0.718750, 0.562500), float2(0.718750, 0.500000))); // 1r
- island2.add(UVIslandEdge(float2(0.718750, 0.500000), float2(0.750000, 0.500000))); // 0r
- island2.add(UVIslandEdge(float2(0.750000, 0.500000), float2(0.750000, 0.562500)));
-
- island1.join(island2, primitive);
-
- /* expected
- UVIsland island1;
- island1.add(UVIslandEdge(float2(0.750000, 0.437500), float2(0.750000, 0.500000)));
-
- island2.add(UVIslandEdge(float2(0.750000, 0.500000), float2(0.750000, 0.562500)));
- island2.add(UVIslandEdge(float2(0.750000, 0.562500), float2(0.750000, 0.625000)));
- island2.add(UVIslandEdge(float2(0.750000, 0.625000), float2(0.718750, 0.625000)));
- island2.add(UVIslandEdge(float2(0.718750, 0.625000), float2(0.718750, 0.562500)));
-
- island1.add(UVIslandEdge(float2(0.718750, 0.562500), float2(0.718750, 0.500000))); // 1
- island1.add(UVIslandEdge(float2(0.718750, 0.500000), float2(0.718750, 0.437500)));
- island1.add(UVIslandEdge(float2(0.718750, 0.437500), float2(0.718750, 0.375000)));
- island1.add(UVIslandEdge(float2(0.718750, 0.375000), float2(0.718750, 0.312500)));
- island1.add(UVIslandEdge(float2(0.718750, 0.312500), float2(0.750000, 0.312500)));
- island1.add(UVIslandEdge(float2(0.750000, 0.312500), float2(0.750000, 0.375000)));
- island1.add(UVIslandEdge(float2(0.750000, 0.375000), float2(0.750000, 0.437500)));
-
- */
-}
-
-} // namespace blender::bke::uv_islands::tests
More information about the Bf-blender-cvs
mailing list