Commit: 7a937436ab14ec05542b3539a6262c7e78b3929b
Author: Campbell Barton
Date: Wed Mar 20 01:20:46 2019 +1100
Branches: master
https://developer.blender.org/rB7a937436ab14ec05542b3539a6262c7e78b3929b
BLI_kdtree: add 1d kdtree support
Some users only use the tree to store a single value.
===================================================================
M source/blender/blenlib/BLI_kdtree.h
M source/blender/blenlib/CMakeLists.txt
A source/blender/blenlib/intern/kdtree_1d.c
===================================================================
diff --git a/source/blender/blenlib/BLI_kdtree.h
b/source/blender/blenlib/BLI_kdtree.h
index 18f3236a310..4baff208ca7 100644
--- a/source/blender/blenlib/BLI_kdtree.h
+++ b/source/blender/blenlib/BLI_kdtree.h
@@ -22,6 +22,17 @@
* \brief A kd-tree for nearest neighbor search.
*/
+/* 1D version */
+#define KD_DIMS 1
+#define KDTREE_PREFIX_ID BLI_kdtree_1d
+#define KDTree KDTree_1d
+#define KDTreeNearest KDTreeNearest_1d
+#include "BLI_kdtree_impl.h"
+#undef KD_DIMS
+#undef KDTree
+#undef KDTreeNearest
+#undef KDTREE_PREFIX_ID
+
/* 2D version */
#define KD_DIMS 2
#define KDTREE_PREFIX_ID BLI_kdtree_2d
diff --git a/source/blender/blenlib/CMakeLists.txt
b/source/blender/blenlib/CMakeLists.txt
index fef24c059e7..09573d31a76 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -75,6 +75,7 @@ set(SRC
intern/hash_mm2a.c
intern/hash_mm3.c
intern/jitter_2d.c
+ intern/kdtree_1d.c
intern/kdtree_2d.c
intern/kdtree_3d.c
intern/kdtree_4d.c
diff --git a/source/blender/blenlib/intern/kdtree_1d.c
b/source/blender/blenlib/intern/kdtree_1d.c
new file mode 100644
index 00000000000..95d440d3644
--- /dev/null
+++ b/source/blender/blenlib/intern/kdtree_1d.c
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+/** \file
+ * \ingroup bli
+ */
+
+#define KD_DIMS 1
+#define KDTREE_PREFIX_ID BLI_kdtree_1d
+#define KDTree KDTree_1d
+#define KDTreeNearest KDTreeNearest_1d
+# include "kdtree_impl.h"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
