[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44524] trunk/blender/source/blender: bmesh: re-arrange headers
Campbell Barton
ideasman42 at gmail.com
Tue Feb 28 17:47:13 CET 2012
Revision: 44524
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44524
Author: campbellbarton
Date: 2012-02-28 16:47:12 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
bmesh: re-arrange headers
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/CMakeLists.txt
trunk/blender/source/blender/bmesh/bmesh.h
trunk/blender/source/blender/bmesh/bmesh_operator_api.h
trunk/blender/source/blender/bmesh/intern/bmesh_walkers_private.h
trunk/blender/source/blender/editors/mesh/bmesh_select.c
trunk/blender/source/blender/editors/mesh/bmesh_tools.c
Added Paths:
-----------
trunk/blender/source/blender/bmesh/intern/bmesh_interp.h
trunk/blender/source/blender/bmesh/intern/bmesh_iterators.h
trunk/blender/source/blender/bmesh/intern/bmesh_marking.h
trunk/blender/source/blender/bmesh/intern/bmesh_operators.h
trunk/blender/source/blender/bmesh/intern/bmesh_queries.h
trunk/blender/source/blender/bmesh/intern/bmesh_walkers.h
Removed Paths:
-------------
trunk/blender/source/blender/bmesh/bmesh_iterators.h
trunk/blender/source/blender/bmesh/bmesh_marking.h
trunk/blender/source/blender/bmesh/bmesh_operators.h
trunk/blender/source/blender/bmesh/bmesh_queries.h
trunk/blender/source/blender/bmesh/bmesh_walkers.h
Modified: trunk/blender/source/blender/bmesh/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/bmesh/CMakeLists.txt 2012-02-28 16:45:08 UTC (rev 44523)
+++ trunk/blender/source/blender/bmesh/CMakeLists.txt 2012-02-28 16:47:12 UTC (rev 44524)
@@ -81,24 +81,30 @@
operators/bmo_utils.c
intern/bmesh_construct.c
+ intern/bmesh_core.c
intern/bmesh_inline.c
intern/bmesh_interp.c
+ intern/bmesh_interp.h
intern/bmesh_iterators.c
+ intern/bmesh_iterators.h
intern/bmesh_iterators_inline.c
intern/bmesh_marking.c
+ intern/bmesh_marking.h
intern/bmesh_mesh.c
intern/bmesh_mods.c
- intern/bmesh_core.c
intern/bmesh_opdefines.c
intern/bmesh_operator_api_inline.c
intern/bmesh_operators.c
+ intern/bmesh_operators.h
intern/bmesh_operators_private.h
intern/bmesh_polygon.c
intern/bmesh_private.h
intern/bmesh_queries.c
+ intern/bmesh_queries.h
intern/bmesh_structure.c
intern/bmesh_structure.h
intern/bmesh_walkers.c
+ intern/bmesh_walkers.h
intern/bmesh_walkers_impl.c
intern/bmesh_walkers_private.h
@@ -107,13 +113,7 @@
bmesh.h
bmesh_class.h
bmesh_error.h
- bmesh_interp.h
- bmesh_iterators.h
- bmesh_marking.h
bmesh_operator_api.h
- bmesh_operators.h
- bmesh_queries.h
- bmesh_walkers.h
)
add_definitions(-DGLEW_STATIC)
Modified: trunk/blender/source/blender/bmesh/bmesh.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh.h 2012-02-28 16:45:08 UTC (rev 44523)
+++ trunk/blender/source/blender/bmesh/bmesh.h 2012-02-28 16:47:12 UTC (rev 44524)
@@ -460,14 +460,17 @@
#define BM_NGON_MAX 100000
/* include the rest of the API */
-#include "bmesh_marking.h"
#include "bmesh_operator_api.h"
-#include "bmesh_operators.h"
#include "bmesh_error.h"
-#include "bmesh_queries.h"
-#include "bmesh_interp.h"
-#include "bmesh_iterators.h"
-#include "bmesh_walkers.h"
+
+#include "intern/bmesh_interp.h"
+#include "intern/bmesh_iterators.h"
+#include "intern/bmesh_marking.h"
+#include "intern/bmesh_operators.h"
+#include "intern/bmesh_queries.h"
+#include "intern/bmesh_walkers.h"
+#include "intern/bmesh_walkers.h"
+
#include "intern/bmesh_inline.c"
#include "intern/bmesh_operator_api_inline.c"
Deleted: trunk/blender/source/blender/bmesh/bmesh_iterators.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_iterators.h 2012-02-28 16:45:08 UTC (rev 44523)
+++ trunk/blender/source/blender/bmesh/bmesh_iterators.h 2012-02-28 16:47:12 UTC (rev 44524)
@@ -1,147 +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.
- *
- * Contributor(s): Joseph Eagar.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef __BMESH_ITERATORS_H__
-#define __BMESH_ITERATORS_H__
-
-/** \file blender/bmesh/bmesh_iterators.h
- * \ingroup bmesh
- */
-
-/*
- * BMESH ITERATORS
- *
- * The functions and structures in this file
- * provide a unified method for iterating over
- * the elements of a mesh and answering simple
- * adjacency queries. Tool authors should use
- * the iterators provided in this file instead
- * of inspecting the structure directly.
- *
-*/
-
-#include "BLI_mempool.h"
-
-/* Defines for passing to BM_iter_new.
- *
- * "OF" can be substituted for "around"
- * so BM_VERTS_OF_FACE means "vertices
- * around a face."
- */
-
-/* these iterator over all elements of a specific
- * type in the mesh.
- *
- * be sure to keep 'bm_iter_itype_htype_map' in sync with any changes */
-typedef enum BMIterType {
- BM_VERTS_OF_MESH = 1,
- BM_EDGES_OF_MESH = 2,
- BM_FACES_OF_MESH = 3,
- /* these are topological iterators. */
- BM_EDGES_OF_VERT = 4,
- BM_FACES_OF_VERT = 5,
- BM_LOOPS_OF_VERT = 6,
- BM_VERTS_OF_EDGE = 7, /* just v1, v2: added so py can use generalized sequencer wrapper */
- BM_FACES_OF_EDGE = 8,
- BM_VERTS_OF_FACE = 9,
- BM_EDGES_OF_FACE = 10,
- BM_LOOPS_OF_FACE = 11,
- /* returns elements from all boundaries, and returns
- * the first element at the end to flag that we're entering
- * a different face hole boundary*/
- BM_ALL_LOOPS_OF_FACE = 12,
- /* iterate through loops around this loop, which are fetched
- * from the other faces in the radial cycle surrounding the
- * input loop's edge.*/
- BM_LOOPS_OF_LOOP = 13,
- BM_LOOPS_OF_EDGE = 14
-} BMIterType;
-
-#define BM_ITYPE_MAX 15
-
-/* the iterator htype for each iterator */
-extern const char bm_iter_itype_htype_map[BM_ITYPE_MAX];
-
-
-#define BM_ITER(ele, iter, bm, itype, data) \
- ele = BM_iter_new(iter, bm, itype, data); \
- for ( ; ele; ele = BM_iter_step(iter))
-
-#define BM_ITER_INDEX(ele, iter, bm, itype, data, indexvar) \
- ele = BM_iter_new(iter, bm, itype, data); \
- for (indexvar = 0; ele; indexvar++, ele = BM_iter_step(iter))
-
-/*Iterator Structure*/
-typedef struct BMIter {
- BLI_mempool_iter pooliter;
-
- BMVert *firstvert, *nextvert, *vdata;
- BMEdge *firstedge, *nextedge, *edata;
- BMLoop *firstloop, *nextloop, *ldata, *l;
- BMFace *firstpoly, *nextpoly, *pdata;
- BMesh *bm;
- void (*begin)(struct BMIter *iter);
- void *(*step)(struct BMIter *iter);
- union {
- void *p;
- int i;
- long l;
- float f;
- } filter;
- int count;
- char itype;
-} BMIter;
-
-void *BM_iter_at_index(BMesh *bm, const char itype, void *data, int index);
-int BM_iter_as_array(BMesh *bm, const char itype, void *data, void **array, const int len);
-
-/* private for bmesh_iterators_inline.c */
-void bmiter__vert_of_mesh_begin(struct BMIter *iter);
-void *bmiter__vert_of_mesh_step(struct BMIter *iter);
-void bmiter__edge_of_mesh_begin(struct BMIter *iter);
-void *bmiter__edge_of_mesh_step(struct BMIter *iter);
-void bmiter__face_of_mesh_begin(struct BMIter *iter);
-void *bmiter__face_of_mesh_step(struct BMIter *iter);
-void bmiter__edge_of_vert_begin(struct BMIter *iter);
-void *bmiter__edge_of_vert_step(struct BMIter *iter);
-void bmiter__face_of_vert_begin(struct BMIter *iter);
-void *bmiter__face_of_vert_step(struct BMIter *iter);
-void bmiter__loop_of_vert_begin(struct BMIter *iter);
-void *bmiter__loop_of_vert_step(struct BMIter *iter);
-void bmiter__loops_of_edge_begin(struct BMIter *iter);
-void *bmiter__loops_of_edge_step(struct BMIter *iter);
-void bmiter__loops_of_loop_begin(struct BMIter *iter);
-void *bmiter__loops_of_loop_step(struct BMIter *iter);
-void bmiter__face_of_edge_begin(struct BMIter *iter);
-void *bmiter__face_of_edge_step(struct BMIter *iter);
-void bmiter__vert_of_edge_begin(struct BMIter *iter);
-void *bmiter__vert_of_edge_step(struct BMIter *iter);
-void bmiter__vert_of_face_begin(struct BMIter *iter);
-void *bmiter__vert_of_face_step(struct BMIter *iter);
-void bmiter__edge_of_face_begin(struct BMIter *iter);
-void *bmiter__edge_of_face_step(struct BMIter *iter);
-void bmiter__loop_of_face_begin(struct BMIter *iter);
-void *bmiter__loop_of_face_step(struct BMIter *iter);
-
-#include "intern/bmesh_iterators_inline.c"
-
-#endif /* __BMESH_ITERATORS_H__ */
Deleted: trunk/blender/source/blender/bmesh/bmesh_marking.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_marking.h 2012-02-28 16:45:08 UTC (rev 44523)
+++ trunk/blender/source/blender/bmesh/bmesh_marking.h 2012-02-28 16:47:12 UTC (rev 44524)
@@ -1,82 +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.
- *
- * Contributor(s): Joseph Eagar.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef __BMESH_MARKING_H__
-#define __BMESH_MARKING_H__
-
-/** \file blender/bmesh/bmesh_marking.h
- * \ingroup bmesh
- */
-
-typedef struct BMEditSelection
-{
- struct BMEditSelection *next, *prev;
- BMElem *ele;
- char htype;
-} BMEditSelection;
-
-/* geometry hiding code */
-#define BM_elem_hide_set(bm, ele, hide) _bm_elem_hide_set(bm, &(ele)->head, hide)
-void _bm_elem_hide_set(BMesh *bm, BMHeader *ele, int hide);
-void BM_vert_hide_set(BMesh *bm, BMVert *v, int hide);
-void BM_edge_hide_set(BMesh *bm, BMEdge *e, int hide);
-void BM_face_hide_set(BMesh *bm, BMFace *f, int hide);
-
-/* Selection code */
-#define BM_elem_select_set(bm, ele, hide) _bm_elem_select_set(bm, &(ele)->head, hide)
-void _bm_elem_select_set(BMesh *bm, BMHeader *ele, int select);
-
-/* use BM_elem_flag_test(ele, BM_ELEM_SELECT) to test selection */
-
-void BM_mesh_elem_flag_enable_all(BMesh *bm, const char htype, const char hflag);
-void BM_mesh_elem_flag_disable_all(BMesh *bm, const char htype, const char hflag);
-
-/* individual element select functions, BM_elem_select_set is a shortcut for these
- * that automatically detects which one to use*/
-void BM_vert_select_set(BMesh *bm, BMVert *v, int select);
-void BM_edge_select_set(BMesh *bm, BMEdge *e, int select);
-void BM_face_select_set(BMesh *bm, BMFace *f, int select);
-
-void BM_select_mode_set(BMesh *bm, int selectmode);
-void BM_mesh_select_mode_flush(BMesh *bm);
-
-/* mode independent flushing up/down */
-void BM_mesh_deselect_flush(BMesh *bm);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list