Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-03-18 03:22:48 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-03-19 16:30:45 +0300
commit0719d5fa0c8244feb70efa330b10f103a6da2f3c (patch)
tree60eda71273eeeaacbaadf61fa68f95b876032f87 /source/blender/blenlib/CMakeLists.txt
parente72dc667c4d3ef0b4a4c306dd6b12cae9d37287b (diff)
BLI_kdtree: refactor to support different numbers of dimensions
This moves logic into kdtree_impl.h which is included in a source file that defines the number of dimensions - so we can easily support different numbers of dimensions as needed (currently 3D and 4D are supported). Macro use isn't so nice but avoids a lot of duplicate code.
Diffstat (limited to 'source/blender/blenlib/CMakeLists.txt')
-rw-r--r--source/blender/blenlib/CMakeLists.txt9
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index f1aac6cd5b2..d740fa03e70 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -45,7 +45,6 @@ set(SRC
intern/BLI_heap.c
intern/BLI_heap_simple.c
intern/BLI_kdopbvh.c
- intern/BLI_kdtree.c
intern/BLI_linklist.c
intern/BLI_linklist_lockfree.c
intern/BLI_memarena.c
@@ -76,8 +75,9 @@ set(SRC
intern/hash_mm2a.c
intern/hash_mm3.c
intern/jitter_2d.c
+ intern/kdtree_3d.c
+ intern/kdtree_4d.c
intern/lasso_2d.c
- intern/list_sort_impl.h
intern/listbase.c
intern/math_base.c
intern/math_base_inline.c
@@ -124,6 +124,10 @@ set(SRC
intern/winstuff.c
intern/winstuff_dir.c
+ # Header as source (included in C files above).
+ intern/kdtree_impl.h
+ intern/list_sort_impl.h
+
BLI_alloca.h
BLI_args.h
BLI_array.h
@@ -167,6 +171,7 @@ set(SRC
BLI_jitter_2d.h
BLI_kdopbvh.h
BLI_kdtree.h
+ BLI_kdtree_impl.h
BLI_lasso_2d.h
BLI_link_utils.h
BLI_linklist.h