[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30350] branches/bmesh/blender: wip commit ; DO NOT USE.
Joseph Eagar
joeedh at gmail.com
Thu Jul 15 00:06:10 CEST 2010
Revision: 30350
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30350
Author: joeedh
Date: 2010-07-15 00:06:10 +0200 (Thu, 15 Jul 2010)
Log Message:
-----------
wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later).
Modified Paths:
--------------
branches/bmesh/blender/intern/guardedalloc/MEM_guardedalloc.h
branches/bmesh/blender/intern/guardedalloc/intern/mallocn.c
branches/bmesh/blender/source/blender/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h
branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/intern/BME_Customdata.c
branches/bmesh/blender/source/blender/blenkernel/intern/BME_conversions.c
branches/bmesh/blender/source/blender/blenkernel/intern/BME_eulers.c
branches/bmesh/blender/source/blender/blenkernel/intern/BME_mesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/BME_structure.c
branches/bmesh/blender/source/blender/blenkernel/intern/BME_tools.c
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/bmesh/blender/source/blender/blenlib/BLI_array.h
branches/bmesh/blender/source/blender/blenlib/BLI_ghash.h
branches/bmesh/blender/source/blender/blenlib/BLI_math_vector.h
branches/bmesh/blender/source/blender/blenlib/BLI_mempool.h
branches/bmesh/blender/source/blender/blenlib/CMakeLists.txt
branches/bmesh/blender/source/blender/blenlib/intern/BLI_cellalloc.c
branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c
branches/bmesh/blender/source/blender/blenlib/intern/BLI_mempool.c
branches/bmesh/blender/source/blender/blenlib/intern/DLRB_tree.c
branches/bmesh/blender/source/blender/blenlib/intern/edgehash.c
branches/bmesh/blender/source/blender/blenloader/CMakeLists.txt
branches/bmesh/blender/source/blender/bmesh/bmesh.h
branches/bmesh/blender/source/blender/bmesh/bmesh_iterators.h
branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_eulers.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_queries.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_to_editmesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c
branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
branches/bmesh/blender/source/blender/bmesh/operators/utils.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_dupe_ops.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_duplicate.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_extrude.c
branches/bmesh/blender/source/blender/editors/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c
branches/bmesh/blender/source/blender/editors/mesh/editface.c
branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
branches/bmesh/blender/source/blender/editors/object/object_modifier.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/transform/transform_orientations.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/gpu/CMakeLists.txt
branches/bmesh/blender/source/blender/makesdna/DNA_customdata_types.h
branches/bmesh/blender/source/blender/makesrna/intern/CMakeLists.txt
branches/bmesh/blender/source/blender/quicktime/CMakeLists.txt
branches/bmesh/blender/source/blender/render/CMakeLists.txt
branches/bmesh/blender/source/blender/windowmanager/CMakeLists.txt
branches/bmesh/blender/source/creator/CMakeLists.txt
branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/bmesh/blender/source/gameengine/Converter/SConscript
branches/bmesh/blender/source/gameengine/Ketsji/SConscript
branches/bmesh/blender/source/gameengine/Physics/Bullet/SConscript
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/bmesh/blender/source/gameengine/Rasterizer/SConscript
Modified: branches/bmesh/blender/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/bmesh/blender/intern/guardedalloc/MEM_guardedalloc.h 2010-07-14 21:01:21 UTC (rev 30349)
+++ branches/bmesh/blender/intern/guardedalloc/MEM_guardedalloc.h 2010-07-14 22:06:10 UTC (rev 30350)
@@ -176,7 +176,7 @@
} MemHead;
typedef struct MemTail {
- int tag3, pad;
+ int tag3, tag4;
} MemTail;
/*memory bias to hopefully account
Modified: branches/bmesh/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/bmesh/blender/intern/guardedalloc/intern/mallocn.c 2010-07-14 21:01:21 UTC (rev 30349)
+++ branches/bmesh/blender/intern/guardedalloc/intern/mallocn.c 2010-07-14 22:06:10 UTC (rev 30350)
@@ -71,6 +71,7 @@
#define MEMTAG1 MAKE_ID('M', 'E', 'M', 'O')
#define MEMTAG2 MAKE_ID('R', 'Y', 'B', 'L')
#define MEMTAG3 MAKE_ID('O', 'C', 'K', '!')
+#define MEMTAG4 MAKE_ID('C', 'R', 'A', 'P')
#define MEMFREE MAKE_ID('F', 'R', 'E', 'E')
#define MEMNEXT(x) ((MemHead *)(((char *) x) - ((char *) & (((MemHead *)0)->next))))
@@ -230,6 +231,7 @@
memt = (MemTail *)(((char *) memh) + sizeof(MemHead) + len);
memt->tag3 = MEMTAG3;
+ memt->tag4 = MEMTAG4;
addtail(membase,&memh->next);
if (memh->next) memh->nextname = MEMNEXT(memh->next)->name;
@@ -555,11 +557,12 @@
mem_lock_thread();
if ((memh->tag1 == MEMTAG1) && (memh->tag2 == MEMTAG2) && ((memh->len & 0x3) == 0)) {
memt = (MemTail *)(((char *) memh) + sizeof(MemHead) + memh->len);
- if (memt->tag3 == MEMTAG3){
+ if (memt->tag3 == MEMTAG3 && memt->tag4 == MEMTAG4){
memh->tag1 = MEMFREE;
memh->tag2 = MEMFREE;
memt->tag3 = MEMFREE;
+ memt->tag4 = MEMFREE;
/* after tags !!! */
rem_memblock(memh);
Modified: branches/bmesh/blender/source/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/CMakeLists.txt 2010-07-14 21:01:21 UTC (rev 30349)
+++ branches/bmesh/blender/source/blender/CMakeLists.txt 2010-07-14 22:06:10 UTC (rev 30350)
@@ -30,6 +30,7 @@
ADD_SUBDIRECTORY(nodes)
ADD_SUBDIRECTORY(blenkernel)
ADD_SUBDIRECTORY(blenlib)
+ADD_SUBDIRECTORY(bmesh)
ADD_SUBDIRECTORY(blenloader)
ADD_SUBDIRECTORY(blenpluginapi)
ADD_SUBDIRECTORY(imbuf)
@@ -40,7 +41,6 @@
ADD_SUBDIRECTORY(readblenfile)
ADD_SUBDIRECTORY(render)
ADD_SUBDIRECTORY(blenfont)
-ADD_SUBDIRECTORY(bmesh)
ADD_SUBDIRECTORY(ikplugin)
IF(WITH_OPENEXR)
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2010-07-14 21:01:21 UTC (rev 30349)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2010-07-14 22:06:10 UTC (rev 30350)
@@ -86,7 +86,6 @@
#include "BKE_customdata.h"
#include "BKE_bvhutils.h"
-#include "BKE_tessmesh.h"
struct MVert;
struct MEdge;
@@ -130,19 +129,6 @@
loop refers to per-face-vertex data.*/
void *(*getLoopCDData)(void *self, int type, int layer);
void *(*getVertCDData)(void *self, int type, int layer);
-
-/* derivedmesh 2.0 interface ideas (will likely never be implemented ;):
- void (*interpLoopData)(void *self, void **src_blocks,
- float *weights, float *sub_weights, int count);
-
- //a generic handle for a loop
- intptr_t lhandle;
-
- inside DerivedMesh itself:
- //
- //void (*interpLoopData)(DerivedMesh *dm, DMLoopIter *destloop,
- // intptr_t *loop_handles, int totloop);
-*/
} DMLoopIter;
typedef struct DMFaceIter {
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h 2010-07-14 21:01:21 UTC (rev 30349)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h 2010-07-14 22:06:10 UTC (rev 30350)
@@ -229,14 +229,4 @@
#ifdef __cplusplus
}
#endif
-
-/*little macro so inline keyword works*/
-#if defined(_MSC_VER)
-#define BM_INLINE static __forceinline
-#else
-#define BM_INLINE static inline __attribute((always_inline))
#endif
-
-#define BMEMSET(mem, val, size) {unsigned int _i; char *_c = (char*) mem; for (_i=0; _i<size; _i++) *_c++ = val;}
-
-#endif
Modified: branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt 2010-07-14 21:01:21 UTC (rev 30349)
+++ branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt 2010-07-14 22:06:10 UTC (rev 30350)
@@ -27,10 +27,10 @@
FILE(GLOB SRC intern/*.c)
SET(INC
- . ../../../intern/guardedalloc ../../../intern/memutil ../editors/include ../blenlib ../makesdna
+ . ../../../intern/guardedalloc ../../../intern/memutil ../editors/include ../blenlib ../makesdna ../modifiers
../render/extern/include ../../../intern/decimation/extern
../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern
- ../../../intern/iksolver/extern ../blenloader ../ikplugin
+ ../../../intern/iksolver/extern ../blenloader ../ikplugin ../bmesh
../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/smoke/extern
../../../intern/bsp/extern ../blenfont
../../../intern/audaspace/intern
@@ -38,6 +38,7 @@
${ZLIB_INC}
)
+
ADD_DEFINITIONS(-DGLEW_STATIC)
IF(WITH_BULLET)
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/BME_Customdata.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/BME_Customdata.c 2010-07-14 21:01:21 UTC (rev 30349)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/BME_Customdata.c 2010-07-14 22:06:10 UTC (rev 30350)
@@ -1,3 +1,4 @@
+#if 0
/**
* BME_customdata.c jan 2007
*
@@ -197,3 +198,4 @@
typeInfo->set_default((char*)*block + offset, 1);
}
}
+#endif
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/BME_conversions.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/BME_conversions.c 2010-07-14 21:01:21 UTC (rev 30349)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/BME_conversions.c 2010-07-14 22:06:10 UTC (rev 30350)
@@ -1,3 +1,4 @@
+#if 0
/**
* BME_mesh.c jan 2007
*
@@ -641,3 +642,4 @@
BLI_edgehash_free(edge_hash, NULL);
return result;
}
+#endif
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/BME_eulers.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/BME_eulers.c 2010-07-14 21:01:21 UTC (rev 30349)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/BME_eulers.c 2010-07-14 22:06:10 UTC (rev 30350)
@@ -1,3 +1,4 @@
+#if 0
/**
* BME_eulers.c jan 2007
*
@@ -135,13 +136,13 @@
#ifndef BME_FASTEULER
/*count valance of v1*/
- if(v1->edge){
- d1 = BME_disk_getpointer(v1->edge,v1);
+ if(v1->e){
+ d1 = BME_disk_getpointer(v1->e,v1);
if(d1) valance1 = BME_cycle_length(d1);
else BME_error();
}
- if(v2->edge){
- d2 = BME_disk_getpointer(v2->edge,v2);
+ if(v2->e){
+ d2 = BME_disk_getpointer(v2->e,v2);
if(d2) valance2 = BME_cycle_length(d2);
else BME_error();
}
@@ -209,7 +210,7 @@
elist[i]->eflag1 |= MF_CANDIDATE;
/*if elist[i] has a loop, count its radial length*/
- if(elist[i]->loop) elist[i]->eflag2 = BME_cycle_length(&(elist[i]->loop->radial));
+ if(elist[i]->loop) elist[i]->eflag2 = BME_cycle_length(&(elist[i]->l->radial));
else elist[i]->eflag2 = 0;
}
@@ -279,8 +280,8 @@
for(i=0;i<len;i++){
curvert = vlist[i];
l = BME_create_loop(bm,curvert,NULL,f,NULL);
- if(!(f->loopbase)) f->loopbase = l;
- BME_cycle_append(f->loopbase, l);
+ if(!(f->loopbase)) f->lbase = l;
+ BME_cycle_append(f->lbase, l);
}
/*take care of edge pointers and radial cycle*/
@@ -304,7 +305,7 @@
f->len = len;
/*Validation Loop cycle*/
- edok = BME_cycle_validate(len, f->loopbase);
+ edok = BME_cycle_validate(len, f->lbase);
if(!edok) BME_error();
for(i=0, l = f->loopbase; i<len; i++, l=l->next){
/*validate loop vert pointers*/
@@ -332,7 +333,7 @@
*/
int BME_KV(BME_Mesh *bm, BME_Vert *v){
- if(v->edge == NULL){
+ if(v->e == NULL){
BLI_remlink(&(bm->verts), v);
BME_free_vert(bm,v);
return 1;
@@ -355,7 +356,7 @@
int edok;
/*Make sure that no faces!*/
- if(e->loop == NULL){
+ if(e->l == NULL){
BME_disk_remove_edge(e, e->v1);
BME_disk_remove_edge(e, e->v2);
@@ -391,14 +392,14 @@
/*add validation to make sure that radial cycle is cleaned up ok*/
/*deal with radial cycle first*/
- len = BME_cycle_length(bply->loopbase);
+ len = BME_cycle_length(bply->lbase);
for(i=0, curloop=bply->loopbase; i < len; i++, curloop = curloop->next)
BME_radial_remove_loop(curloop, curloop->e);
/*now deallocate the editloops*/
for(i=0; i < len; i++){
- newbase = bply->loopbase->next;
- oldbase = bply->loopbase;
+ newbase = bply->lbase->next;
+ oldbase = bply->lbase;
BME_cycle_remove(oldbase, oldbase);
BME_free_loop(bm, oldbase);
bply->loopbase = newbase;
@@ -458,24 +459,24 @@
/*add ne to tv's disk cycle*/
BME_disk_append_edge(ne, tv);
/*verify disk cycles*/
- diskbase = BME_disk_getpointer(ov->edge,ov);
+ diskbase = BME_disk_getpointer(ov->e,ov);
edok = BME_cycle_validate(valance1, diskbase);
if(!edok) BME_error();
- diskbase = BME_disk_getpointer(tv->edge,tv);
+ diskbase = BME_disk_getpointer(tv->e,tv);
edok = BME_cycle_validate(valance2, diskbase);
if(!edok) BME_error();
- diskbase = BME_disk_getpointer(nv->edge,nv);
+ diskbase = BME_disk_getpointer(nv->e,nv);
edok = BME_cycle_validate(2, diskbase);
if(!edok) BME_error();
/*Split the radial cycle if present*/
- if(e->loop){
+ if(e->l){
BME_Loop *nl,*l;
BME_CycleNode *radEBase=NULL, *radNEBase=NULL;
- int radlen = BME_cycle_length(&(e->loop->radial));
+ int radlen = BME_cycle_length(&(e->l->radial));
/*Take the next loop. Remove it from radial. Split it. Append to appropriate radials.*/
- while(e->loop){
- l=e->loop;
+ while(e->l){
+ l=e->l;
l->f->len++;
BME_radial_remove_loop(l,e);
@@ -528,17 +529,17 @@
}
- e->loop = radEBase->data;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list