[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46377] trunk/blender/source/blender: Style cleanup: displist module
Sergey Sharybin
sergey.vfx at gmail.com
Mon May 7 08:58:03 CEST 2012
Revision: 46377
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46377
Author: nazgul
Date: 2012-05-07 06:58:03 +0000 (Mon, 07 May 2012)
Log Message:
-----------
Style cleanup: displist module
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_displist.h
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/effect.c
trunk/blender/source/blender/blenkernel/intern/font.c
trunk/blender/source/blender/blenkernel/intern/lattice.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/collada/MeshImporter.cpp
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/space_info/info_stats.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
trunk/blender/source/blender/python/mathutils/mathutils_geometry.c
trunk/blender/source/blender/render/intern/source/convertblender.c
Modified: trunk/blender/source/blender/blenkernel/BKE_displist.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_displist.h 2012-05-07 06:38:41 UTC (rev 46376)
+++ trunk/blender/source/blender/blenkernel/BKE_displist.h 2012-05-07 06:58:03 UTC (rev 46377)
@@ -78,29 +78,28 @@
unsigned int *bevelSplitFlag;
} DispList;
-extern void copy_displist(struct ListBase *lbn, struct ListBase *lb);
-extern void free_disp_elem(DispList *dl);
-extern DispList *find_displist_create(struct ListBase *lb, int type);
-extern DispList *find_displist(struct ListBase *lb, int type);
-extern void addnormalsDispList(struct ListBase *lb);
-extern void count_displist(struct ListBase *lb, int *totvert, int *totface);
-extern void freedisplist(struct ListBase *lb);
-extern int displist_has_faces(struct ListBase *lb);
+void BKE_displist_copy(struct ListBase *lbn, struct ListBase *lb);
+void BKE_displist_elem_free(DispList *dl);
+DispList *BKE_displist_find_or_create(struct ListBase *lb, int type);
+DispList *BKE_displist_find(struct ListBase *lb, int type);
+void BKE_displist_normals_add(struct ListBase *lb);
+void BKE_displist_count(struct ListBase *lb, int *totvert, int *totface);
+void BKE_displist_free(struct ListBase *lb);
+int BKE_displist_has_faces(struct ListBase *lb);
-extern void makeDispListSurf(struct Scene *scene, struct Object *ob, struct ListBase *dispbase, struct DerivedMesh **derivedFinal, int forRender, int forOrco);
-extern void makeDispListCurveTypes(struct Scene *scene, struct Object *ob, int forOrco);
-extern void makeDispListCurveTypes_forRender(struct Scene *scene, struct Object *ob, struct ListBase *dispbase, struct DerivedMesh **derivedFinal, int forOrco);
-extern void makeDispListCurveTypes_forOrco(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
-extern void makeDispListMBall(struct Scene *scene, struct Object *ob);
-extern void makeDispListMBall_forRender(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
+void BKE_displist_make_surf(struct Scene *scene, struct Object *ob, struct ListBase *dispbase, struct DerivedMesh **derivedFinal, int forRender, int forOrco);
+void BKE_displist_make_curveTypes(struct Scene *scene, struct Object *ob, int forOrco);
+void BKE_displist_make_curveTypes_forRender(struct Scene *scene, struct Object *ob, struct ListBase *dispbase, struct DerivedMesh **derivedFinal, int forOrco);
+void BKE_displist_make_curveTypes_forOrco(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
+void BKE_displist_make_mball(struct Scene *scene, struct Object *ob);
+void BKE_displist_make_mball_forRender(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
-int surfindex_displist(DispList *dl, int a, int *b, int *p1, int *p2, int *p3, int *p4);
-void filldisplist(struct ListBase *dispbase, struct ListBase *to, int flipnormal);
+int BKE_displist_surfindex_get(DispList *dl, int a, int *b, int *p1, int *p2, int *p3, int *p4);
+void BKE_displist_fill(struct ListBase *dispbase, struct ListBase *to, int flipnormal);
-float calc_taper(struct Scene *scene, struct Object *taperobj, int cur, int tot);
+float BKE_displist_calc_taper(struct Scene *scene, struct Object *taperobj, int cur, int tot);
/* add Orco layer to the displist object which has got derived mesh and return orco */
-float *makeOrcoDispList(struct Scene *scene, struct Object *ob, struct DerivedMesh *derivedFinal, int forRender);
+float *BKE_displist_make_orco(struct Scene *scene, struct Object *ob, struct DerivedMesh *derivedFinal, int forRender);
#endif
-
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-05-07 06:38:41 UTC (rev 46376)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-05-07 06:58:03 UTC (rev 46377)
@@ -2097,7 +2097,7 @@
me->bb = NULL;
}
- freedisplist(&ob->disp);
+ BKE_displist_free(&ob->disp);
if (ob->derivedFinal) {
ob->derivedFinal->needsFree = 1;
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2012-05-07 06:38:41 UTC (rev 46376)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2012-05-07 06:58:03 UTC (rev 46377)
@@ -1818,7 +1818,7 @@
/* only happens on reload file, but violates depsgraph still... fix! */
if ((cu->path == NULL) || (cu->path->data == NULL))
- makeDispListCurveTypes(scene, ikData->tar, 0);
+ BKE_displist_make_curveTypes(scene, ikData->tar, 0);
}
/* find the root bone and the chain of bones from the root to the tip
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2012-05-07 06:38:41 UTC (rev 46376)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2012-05-07 06:58:03 UTC (rev 46377)
@@ -516,7 +516,7 @@
{
Lattice *lt = (Lattice *)ob->data;
- DispList *dl = find_displist(&ob->disp, DL_VERTS);
+ DispList *dl = BKE_displist_find(&ob->disp, DL_VERTS);
float *co = dl ? dl->verts : NULL;
BPoint *bp = lt->def;
@@ -1234,7 +1234,7 @@
/* only happens on reload file, but violates depsgraph still... fix! */
if (cu->path == NULL || cu->path->data == NULL)
- makeDispListCurveTypes(cob->scene, ct->tar, 0);
+ BKE_displist_make_curveTypes(cob->scene, ct->tar, 0);
if (cu->path && cu->path->data) {
float quat[4];
@@ -2007,7 +2007,7 @@
/* this check is to make sure curve objects get updated on file load correctly.*/
if (cu->path == NULL || cu->path->data == NULL) /* only happens on reload file, but violates depsgraph still... fix! */
- makeDispListCurveTypes(cob->scene, ct->tar, 0);
+ BKE_displist_make_curveTypes(cob->scene, ct->tar, 0);
}
/* firstly calculate the matrix the normal way, then let the py-function override
@@ -3090,7 +3090,7 @@
/* only happens on reload file, but violates depsgraph still... fix! */
if (cu->path == NULL || cu->path->data == NULL)
- makeDispListCurveTypes(cob->scene, ct->tar, 0);
+ BKE_displist_make_curveTypes(cob->scene, ct->tar, 0);
}
/* technically, this isn't really needed for evaluation, but we don't know what else
@@ -3720,7 +3720,7 @@
/* only happens on reload file, but violates depsgraph still... fix! */
if (cu->path == NULL || cu->path->data == NULL)
- makeDispListCurveTypes(cob->scene, ct->tar, 0);
+ BKE_displist_make_curveTypes(cob->scene, ct->tar, 0);
}
/* technically, this isn't really needed for evaluation, but we don't know what else
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2012-05-07 06:38:41 UTC (rev 46376)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2012-05-07 06:58:03 UTC (rev 46377)
@@ -136,7 +136,7 @@
{
BKE_nurbList_free(&cu->nurb);
BLI_freelistN(&cu->bev);
- freedisplist(&cu->disp);
+ BKE_displist_free(&cu->disp);
BKE_curve_editfont_free(cu);
BKE_curve_editNurb_free(cu);
@@ -1234,7 +1234,7 @@
float *fp, *coord_array;
ListBase disp = {NULL, NULL};
- makeDispListCurveTypes_forOrco(scene, ob, &disp);
+ BKE_displist_make_curveTypes_forOrco(scene, ob, &disp);
numVerts = 0;
for (dl = disp.first; dl; dl = dl->next) {
@@ -1306,7 +1306,7 @@
}
}
- freedisplist(&disp);
+ BKE_displist_free(&disp);
return coord_array;
}
@@ -1337,13 +1337,13 @@
facy = cu->bevobj->size[1];
if (forRender) {
- makeDispListCurveTypes_forRender(scene, cu->bevobj, &bevdisp, NULL, 0);
+ BKE_displist_make_curveTypes_forRender(scene, cu->bevobj, &bevdisp, NULL, 0);
dl = bevdisp.first;
}
else {
dl = cu->bevobj->disp.first;
if (dl == NULL) {
- makeDispListCurveTypes(scene, cu->bevobj, 0);
+ BKE_displist_make_curveTypes(scene, cu->bevobj, 0);
dl = cu->bevobj->disp.first;
}
}
@@ -1370,7 +1370,7 @@
dl = dl->next;
}
- freedisplist(&bevdisp);
+ BKE_displist_free(&bevdisp);
}
}
else if (cu->ext1 == 0.0f && cu->ext2 == 0.0f) {
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2012-05-07 06:38:41 UTC (rev 46376)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2012-05-07 06:58:03 UTC (rev 46377)
@@ -64,7 +64,7 @@
static void boundbox_displist(Object *ob);
-void free_disp_elem(DispList *dl)
+void BKE_displist_elem_free(DispList *dl)
{
if (dl) {
if (dl->verts) MEM_freeN(dl->verts);
@@ -77,25 +77,26 @@
}
}
-void freedisplist(ListBase *lb)
+void BKE_displist_free(ListBase *lb)
{
DispList *dl;
dl = lb->first;
while (dl) {
BLI_remlink(lb, dl);
- free_disp_elem(dl);
+ BKE_displist_elem_free(dl);
dl = lb->first;
}
}
-DispList *find_displist_create(ListBase *lb, int type)
+DispList *BKE_displist_find_or_create(ListBase *lb, int type)
{
DispList *dl;
-
+
dl = lb->first;
while (dl) {
- if (dl->type == type) return dl;
+ if (dl->type == type)
+ return dl;
dl = dl->next;
}
@@ -106,39 +107,41 @@
return dl;
}
-DispList *find_displist(ListBase *lb, int type)
+DispList *BKE_displist_find(ListBase *lb, int type)
{
DispList *dl;
-
+
dl = lb->first;
while (dl) {
- if (dl->type == type) return dl;
+ if (dl->type == type)
+ return dl;
dl = dl->next;
}
return NULL;
}
-int displist_has_faces(ListBase *lb)
+int BKE_displist_has_faces(ListBase *lb)
{
DispList *dl;
+
for (dl = lb->first; dl; dl = dl->next) {
if (ELEM3(dl->type, DL_INDEX3, DL_INDEX4, DL_SURF)) {
- return 1;
+ return TRUE;
}
}
- return 0;
+
+ return FALSE;
}
-void copy_displist(ListBase *lbn, ListBase *lb)
+void BKE_displist_copy(ListBase *lbn, ListBase *lb)
{
DispList *dln, *dl;
-
- freedisplist(lbn);
-
+
+ BKE_displist_free(lbn);
+
dl = lb->first;
while (dl) {
-
dln = MEM_dupallocN(dl);
BLI_addtail(lbn, dln);
dln->verts = MEM_dupallocN(dl->verts);
@@ -154,7 +157,7 @@
}
}
-void addnormalsDispList(ListBase *lb)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list