move pbvh into BKE, it used many BKE bad level includes.

now blenlib/BLI doesn't depend on any blenkern/BKE functions,
there are still some bad level includes but these are only to access G.background and the blender version define.

1 files changed, 0 insertions, 270 deletions

diff --git a/source/blender/blenlib/BLI_pbvh.h b/source/blender/blenlib/BLI_pbvh.h
deleted file mode 100644
index 59ecdb359c9..00000000000
--- a/source/blender/blenlib/BLI_pbvh.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * ***** 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.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef __BLI_PBVH_H__
-#define __BLI_PBVH_H__
-
-/** \file BLI_pbvh.h
- *  \ingroup bli
- *  \brief A BVH for high poly meshes.
- */
-
-#include "BLI_bitmap.h"
-
-struct CCGElem;
-struct CCGKey;
-struct CustomData;
-struct DMFlagMat;
-struct DMGridAdjacency;
-struct ListBase;
-struct MFace;
-struct MVert;
-struct PBVH;
-struct PBVHNode;
-
-typedef struct PBVH PBVH;
-typedef struct PBVHNode PBVHNode;
-
-typedef struct {
-	float (*co)[3];
-} PBVHProxyNode;
-
-/* Callbacks */
-
-/* returns 1 if the search should continue from this node, 0 otherwise */
-typedef int (*BLI_pbvh_SearchCallback)(PBVHNode *node, void *data);
-
-typedef void (*BLI_pbvh_HitCallback)(PBVHNode *node, void *data);
-typedef void (*BLI_pbvh_HitOccludedCallback)(PBVHNode *node, void *data, float *tmin);
-
-/* Building */
-
-PBVH *BLI_pbvh_new(void);
-void BLI_pbvh_build_mesh(PBVH *bvh, struct MFace *faces, struct MVert *verts,
-                         int totface, int totvert, struct CustomData *vdata);
-void BLI_pbvh_build_grids(PBVH *bvh, struct CCGElem **grid_elems,
-                          struct DMGridAdjacency *gridadj, int totgrid,
-                          struct CCGKey *key, void **gridfaces, struct DMFlagMat *flagmats,
-                          unsigned int **grid_hidden);
-void BLI_pbvh_free(PBVH *bvh);
-
-/* Hierarchical Search in the BVH, two methods:
- * - for each hit calling a callback
- * - gather nodes in an array (easy to multithread) */
-
-void BLI_pbvh_search_callback(PBVH *bvh,
-                              BLI_pbvh_SearchCallback scb, void *search_data,
-                              BLI_pbvh_HitCallback hcb, void *hit_data);
-
-void BLI_pbvh_search_gather(PBVH *bvh,
-                            BLI_pbvh_SearchCallback scb, void *search_data,
-                            PBVHNode ***array, int *tot);
-
-/* Raycast
- * the hit callback is called for all leaf nodes intersecting the ray;
- * it's up to the callback to find the primitive within the leaves that is
- * hit first */
-
-void BLI_pbvh_raycast(PBVH *bvh, BLI_pbvh_HitOccludedCallback cb, void *data,
-                      const float ray_start[3], const float ray_normal[3],
-                      int original);
-
-int BLI_pbvh_node_raycast(PBVH *bvh, PBVHNode *node, float (*origco)[3],
-                          const float ray_start[3], const float ray_normal[3],
-                          float *dist);
-
-/* Drawing */
-
-void BLI_pbvh_node_draw(PBVHNode *node, void *data);
-void BLI_pbvh_draw(PBVH *bvh, float (*planes)[4], float (*face_nors)[3],
-                   int (*setMaterial)(int, void *attribs));
-
-/* PBVH Access */
-typedef enum {
-	PBVH_FACES,
-	PBVH_GRIDS,
-} PBVHType;
-
-PBVHType BLI_pbvh_type(const PBVH *bvh);
-
-/* multires hidden data, only valid for type == PBVH_GRIDS */
-unsigned int **BLI_pbvh_grid_hidden(const PBVH *bvh);
-
-/* multires level, only valid for type == PBVH_GRIDS */
-void BLI_pbvh_get_grid_key(const PBVH *pbvh, struct CCGKey *key);
-
-/* Node Access */
-
-typedef enum {
-	PBVH_Leaf = 1,
-
-	PBVH_UpdateNormals = 2,
-	PBVH_UpdateBB = 4,
-	PBVH_UpdateOriginalBB = 8,
-	PBVH_UpdateDrawBuffers = 16,
-	PBVH_UpdateRedraw = 32,
-
-	PBVH_RebuildDrawBuffers = 64,
-	PBVH_FullyHidden = 128
-} PBVHNodeFlags;
-
-void BLI_pbvh_node_mark_update(PBVHNode *node);
-void BLI_pbvh_node_mark_rebuild_draw(PBVHNode *node);
-void BLI_pbvh_node_fully_hidden_set(PBVHNode *node, int fully_hidden);
-
-void BLI_pbvh_node_get_grids(PBVH *bvh, PBVHNode *node,
-                             int **grid_indices, int *totgrid, int *maxgrid, int *gridsize,
-                             struct CCGElem ***grid_elems, struct DMGridAdjacency **gridadj);
-void BLI_pbvh_node_num_verts(PBVH *bvh, PBVHNode *node,
-                             int *uniquevert, int *totvert);
-void BLI_pbvh_node_get_verts(PBVH *bvh, PBVHNode *node,
-                             int **vert_indices, struct MVert **verts);
-
-void BLI_pbvh_node_get_BB(PBVHNode * node, float bb_min[3], float bb_max[3]);
-void BLI_pbvh_node_get_original_BB(PBVHNode * node, float bb_min[3], float bb_max[3]);
-
-float BLI_pbvh_node_get_tmin(PBVHNode *node);
-
-/* test if AABB is at least partially inside the planes' volume */
-int BLI_pbvh_node_planes_contain_AABB(PBVHNode *node, void *data);
-/* test if AABB is at least partially outside the planes' volume */
-int BLI_pbvh_node_planes_exclude_AABB(PBVHNode *node, void *data);
-
-/* Update Normals/Bounding Box/Draw Buffers/Redraw and clear flags */
-
-void BLI_pbvh_update(PBVH *bvh, int flags, float (*face_nors)[3]);
-void BLI_pbvh_redraw_BB(PBVH * bvh, float bb_min[3], float bb_max[3]);
-void BLI_pbvh_get_grid_updates(PBVH *bvh, int clear, void ***gridfaces, int *totface);
-void BLI_pbvh_grids_update(PBVH *bvh, struct CCGElem **grid_elems,
-                           struct DMGridAdjacency *gridadj, void **gridfaces,
-                           struct DMFlagMat *flagmats, unsigned int **grid_hidden);
-
-/* vertex deformer */
-float (*BLI_pbvh_get_vertCos(struct PBVH *pbvh))[3];
-void BLI_pbvh_apply_vertCos(struct PBVH *pbvh, float (*vertCos)[3]);
-int BLI_pbvh_isDeformed(struct PBVH *pbvh);
-
-
-/* Vertex Iterator */
-
-/* this iterator has quite a lot of code, but it's designed to:
- * - allow the compiler to eliminate dead code and variables
- * - spend most of the time in the relatively simple inner loop */
-
-/* note: PBVH_ITER_ALL does not skip hidden vertices,
- * PBVH_ITER_UNIQUE does */
-#define PBVH_ITER_ALL       0
-#define PBVH_ITER_UNIQUE    1
-
-typedef struct PBVHVertexIter {
-	/* iteration */
-	int g;
-	int width;
-	int height;
-	int gx;
-	int gy;
-	int i;
-
-	/* grid */
-	struct CCGElem **grids;
-	struct CCGElem *grid;
-	struct CCGKey *key;
-	BLI_bitmap *grid_hidden, gh;
-	int *grid_indices;
-	int totgrid;
-	int gridsize;
-
-	/* mesh */
-	struct MVert *mverts;
-	int totvert;
-	int *vert_indices;
-	float *vmask;
-
-	/* result: these are all computed in the macro, but we assume
-	 * that compiler optimization's will skip the ones we don't use */
-	struct MVert *mvert;
-	float *co;
-	short *no;
-	float *fno;
-	float *mask;
-} PBVHVertexIter;
-
-#ifdef _MSC_VER
-#pragma warning (disable:4127) // conditional expression is constant
-#endif
-
-void pbvh_vertex_iter_init(PBVH *bvh, PBVHNode *node,
-                           PBVHVertexIter *vi, int mode);
-
-#define BLI_pbvh_vertex_iter_begin(bvh, node, vi, mode) \
-	pbvh_vertex_iter_init(bvh, node, &vi, mode); \
-	 \
-	for (vi.i = 0, vi.g = 0; vi.g < vi.totgrid; vi.g++) { \
-		if (vi.grids) { \
-			vi.width = vi.gridsize; \
-			vi.height = vi.gridsize; \
-			vi.grid = vi.grids[vi.grid_indices[vi.g]]; \
-			if (mode == PBVH_ITER_UNIQUE) \
-				vi.gh = vi.grid_hidden[vi.grid_indices[vi.g]];   \
-		} \
-		else { \
-			vi.width = vi.totvert; \
-			vi.height = 1; \
-		} \
-		 \
-		for (vi.gy = 0; vi.gy < vi.height; vi.gy++) { \
-			for (vi.gx = 0; vi.gx < vi.width; vi.gx++, vi.i++) { \
-				if (vi.grid) { \
-					vi.co = CCG_elem_co(vi.key, vi.grid); \
-					vi.fno = CCG_elem_no(vi.key, vi.grid); \
-					vi.mask = vi.key->has_mask ? CCG_elem_mask(vi.key, vi.grid) : NULL; \
-					vi.grid = CCG_elem_next(vi.key, vi.grid); \
-					if (vi.gh) { \
-						if (BLI_BITMAP_GET(vi.gh, vi.gy * vi.gridsize + vi.gx)) \
-							continue; \
-					} \
-				} \
-				else { \
-					vi.mvert = &vi.mverts[vi.vert_indices[vi.gx]]; \
-					if (mode == PBVH_ITER_UNIQUE && vi.mvert->flag & ME_HIDE) \
-						continue; \
-					vi.co = vi.mvert->co; \
-					vi.no = vi.mvert->no; \
-					if (vi.vmask) \
-						vi.mask = &vi.vmask[vi.vert_indices[vi.gx]]; \
-				} \
-
-#define BLI_pbvh_vertex_iter_end \
-			} \
-		} \
-	}
-
-void BLI_pbvh_node_get_proxies(PBVHNode *node, PBVHProxyNode **proxies, int *proxy_count);
-void BLI_pbvh_node_free_proxies(PBVHNode *node);
-PBVHProxyNode *BLI_pbvh_node_add_proxy(PBVH *bvh, PBVHNode *node);
-void BLI_pbvh_gather_proxies(PBVH *pbvh, PBVHNode ***nodes,  int *totnode);
-
-//void BLI_pbvh_node_BB_reset(PBVHNode *node);
-//void BLI_pbvh_node_BB_expand(PBVHNode *node, float co[3]);
-
-void pbvh_show_diffuse_color_set(PBVH *bvh, int show_diffuse_color);
-
-#endif /* __BLI_PBVH_H__ */
-