Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

replace BLI_array_declare with BLI_array_staticdeclare() and BLI_array_alloca() for smaller arrays.

Browse Source
This commit is contained in:
Campbell Barton
2012-12-12 02:48:03 +00:00
parent b5ce1b1a23
commit c40030a36c
4 changed files with 31 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/kernel/shaders/node_mapping.osl
View File

@@ -28,9 +28,8 @@ shader node_mapping(
{ {
point p = transform(Matrix, VectorIn); point p = transform(Matrix, VectorIn);
if(use_minmax) if (use_minmax)
p = min(max(mapping_min, p), mapping_max); p = min(max(mapping_min, p), mapping_max);
VectorOut = p; VectorOut = p;
} }

2
source/blender/bmesh/intern/bmesh_core.c
View File

@@ -1879,7 +1879,7 @@ int BM_vert_splice(BMesh *bm, BMVert *v, BMVert *v_target)
int bmesh_vert_separate(BMesh *bm, BMVert *v, BMVert ***r_vout, int *r_vout_len) int bmesh_vert_separate(BMesh *bm, BMVert *v, BMVert ***r_vout, int *r_vout_len)
{ {
BMEdge **stack = NULL; BMEdge **stack = NULL;
BLI_array_declare(stack); BLI_array_staticdeclare(stack, BM_DEFAULT_ITER_STACK_SIZE);
BMVert **verts = NULL; BMVert **verts = NULL;
GHash *visithash; GHash *visithash;
BMIter eiter, liter; BMIter eiter, liter;

6
source/blender/bmesh/tools/bmesh_bevel.c
View File

@@ -1135,7 +1135,7 @@ static void bevel_build_rings(BMesh *bm, BevVert *bv)
/* Make center ngon if odd number of segments and fully beveled */ /* Make center ngon if odd number of segments and fully beveled */
if (ns % 2 == 1 && vm->count == bv->selcount) { if (ns % 2 == 1 && vm->count == bv->selcount) {
BMVert **vv = NULL; BMVert **vv = NULL;
BLI_array_declare(vv); BLI_array_staticdeclare(vv, BM_DEFAULT_NGON_STACK_SIZE);
v = vm->boundstart; v = vm->boundstart;
do { do {
@@ -1153,7 +1153,7 @@ static void bevel_build_rings(BMesh *bm, BevVert *bv)
if (vm->count > bv->selcount) { if (vm->count > bv->selcount) {
int j; int j;
BMVert **vv = NULL; BMVert **vv = NULL;
BLI_array_declare(vv); BLI_array_staticdeclare(vv, BM_DEFAULT_NGON_STACK_SIZE);
v = vm->boundstart; v = vm->boundstart;
f = boundvert_rep_face(v); f = boundvert_rep_face(v);
@@ -1215,7 +1215,7 @@ static BMFace *bevel_build_poly_ex(BMesh *bm, BevVert *bv)
VMesh *vm = bv->vmesh; VMesh *vm = bv->vmesh;
BoundVert *v; BoundVert *v;
BMVert **vv = NULL; BMVert **vv = NULL;
BLI_array_declare(vv); BLI_array_staticdeclare(vv, BM_DEFAULT_NGON_STACK_SIZE);
v = vm->boundstart; v = vm->boundstart;
n = 0; n = 0;

86
source/blender/editors/uvedit/uvedit_draw.c
View File

@@ -169,10 +169,8 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
MTexPoly *tf; MTexPoly *tf;
MLoopUV *luv; MLoopUV *luv;
Image *ima = sima->image; Image *ima = sima->image;
BLI_array_declare(tf_uv); float aspx, aspy, col[4];
BLI_array_declare(tf_uvorig); int i;
float aspx, aspy, col[4], (*tf_uv)[2] = NULL, (*tf_uvorig)[2] = NULL;
int i, j, nverts;
ED_space_image_get_uv_aspect(sima, &aspx, &aspy); ED_space_image_get_uv_aspect(sima, &aspx, &aspy);
@@ -182,20 +180,14 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
float totarea = 0.0f, totuvarea = 0.0f, areadiff, uvarea, area; float totarea = 0.0f, totuvarea = 0.0f, areadiff, uvarea, area;
BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
const int efa_len = efa->len;
float (*tf_uv)[2] = BLI_array_alloca(tf_uv, efa_len);
float (*tf_uvorig)[2] = BLI_array_alloca(tf_uvorig, efa_len);
tf = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY); tf = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY);
BLI_array_empty(tf_uv); BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
BLI_array_empty(tf_uvorig);
BLI_array_grow_items(tf_uv, efa->len);
BLI_array_grow_items(tf_uvorig, efa->len);
i = 0;
BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV);
copy_v2_v2(tf_uvorig[i], luv->uv); copy_v2_v2(tf_uvorig[i], luv->uv);
i++;
} }
uv_poly_copy_aspect(tf_uvorig, tf_uv, aspx, aspy, efa->len); uv_poly_copy_aspect(tf_uvorig, tf_uv, aspx, aspy, efa->len);
@@ -232,20 +224,15 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
else { else {
BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
if (BM_elem_flag_test(efa, BM_ELEM_TAG)) { if (BM_elem_flag_test(efa, BM_ELEM_TAG)) {
const int efa_len = efa->len;
float (*tf_uv)[2] = BLI_array_alloca(tf_uv, efa_len);
float (*tf_uvorig)[2] = BLI_array_alloca(tf_uvorig, efa_len);
area = BM_face_calc_area(efa) / totarea; area = BM_face_calc_area(efa) / totarea;
BLI_array_empty(tf_uv); BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
BLI_array_empty(tf_uvorig);
BLI_array_grow_items(tf_uv, efa->len);
BLI_array_grow_items(tf_uvorig, efa->len);
i = 0;
BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV);
copy_v2_v2(tf_uvorig[i], luv->uv); copy_v2_v2(tf_uvorig[i], luv->uv);
i++;
} }
uv_poly_copy_aspect(tf_uvorig, tf_uv, aspx, aspy, efa->len); uv_poly_copy_aspect(tf_uvorig, tf_uv, aspx, aspy, efa->len);
@@ -276,18 +263,9 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
} }
case SI_UVDT_STRETCH_ANGLE: case SI_UVDT_STRETCH_ANGLE:
{ {
float *uvang = NULL;
float *ang = NULL;
float (*av)[3] = NULL; /* use for 2d and 3d angle vectors */
float (*auv)[2] = NULL;
float a; float a;
BLI_array_declare(uvang); col[3] = 0.5f; /* hard coded alpha, not that nice */
BLI_array_declare(ang);
BLI_array_declare(av);
BLI_array_declare(auv);
col[3] = 0.5; /* hard coded alpha, not that nice */
glShadeModel(GL_SMOOTH); glShadeModel(GL_SMOOTH);
@@ -295,44 +273,40 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
tf = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY); tf = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY);
if (uvedit_face_visible_test(scene, ima, efa, tf)) { if (uvedit_face_visible_test(scene, ima, efa, tf)) {
nverts = efa->len; const int efa_len = efa->len;
float (*tf_uv)[2] = BLI_array_alloca(tf_uv, efa_len);
float (*tf_uvorig)[2] = BLI_array_alloca(tf_uvorig, efa_len);
float *uvang = BLI_array_alloca(uvang, efa_len);
float *ang = BLI_array_alloca(ang, efa_len);
float (*av)[3] = BLI_array_alloca(av, efa_len); /* use for 2d and 3d angle vectors */
float (*auv)[2] = BLI_array_alloca(auv, efa_len);
int j;
BM_elem_flag_enable(efa, BM_ELEM_TAG); BM_elem_flag_enable(efa, BM_ELEM_TAG);
BLI_array_empty(tf_uv);
BLI_array_empty(tf_uvorig);
BLI_array_empty(uvang);
BLI_array_empty(ang);
BLI_array_empty(av);
BLI_array_empty(auv);
BLI_array_grow_items(tf_uv, nverts);
BLI_array_grow_items(tf_uvorig, nverts);
BLI_array_grow_items(uvang, nverts);
BLI_array_grow_items(ang, nverts);
BLI_array_grow_items(av, nverts);
BLI_array_grow_items(auv, nverts);
BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) { BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV);
copy_v2_v2(tf_uvorig[i], luv->uv); copy_v2_v2(tf_uvorig[i], luv->uv);
} }
uv_poly_copy_aspect(tf_uvorig, tf_uv, aspx, aspy, nverts); uv_poly_copy_aspect(tf_uvorig, tf_uv, aspx, aspy, efa_len);
j = nverts - 1; j = efa_len - 1;
BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) { BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
sub_v2_v2v2(auv[i], tf_uv[j], tf_uv[i]); normalize_v2(auv[i]); sub_v2_v2v2(auv[i], tf_uv[j], tf_uv[i]); normalize_v2(auv[i]);
sub_v3_v3v3(av[i], l->prev->v->co, l->v->co); normalize_v3(av[i]); sub_v3_v3v3(av[i], l->prev->v->co, l->v->co); normalize_v3(av[i]);
j = i; j = i;
} }
for (i = 0; i < nverts; i++) { for (i = 0; i < efa_len; i++) {
#if 0 #if 0
/* Simple but slow, better reuse normalized vectors /* Simple but slow, better reuse normalized vectors
* (Not ported to bmesh, copied for reference) */ * (Not ported to bmesh, copied for reference) */
uvang1 = RAD2DEG(angle_v2v2v2(tf_uv[3], tf_uv[0], tf_uv[1])); uvang1 = RAD2DEG(angle_v2v2v2(tf_uv[3], tf_uv[0], tf_uv[1]));
ang1 = RAD2DEG(angle_v3v3v3(efa->v4->co, efa->v1->co, efa->v2->co)); ang1 = RAD2DEG(angle_v3v3v3(efa->v4->co, efa->v1->co, efa->v2->co));
#endif #endif
uvang[i] = angle_normalized_v2v2(auv[i], auv[(i + 1) % nverts]); uvang[i] = angle_normalized_v2v2(auv[i], auv[(i + 1) % efa_len]);
ang[i] = angle_normalized_v3v3(av[i], av[(i + 1) % nverts]); ang[i] = angle_normalized_v3v3(av[i], av[(i + 1) % efa_len]);
} }
glBegin(GL_POLYGON); glBegin(GL_POLYGON);
@@ -354,17 +328,9 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
glShadeModel(GL_FLAT); glShadeModel(GL_FLAT);
BLI_array_free(uvang);
BLI_array_free(ang);
BLI_array_free(av);
BLI_array_free(auv);
break; break;
} }
} }
BLI_array_free(tf_uv);
BLI_array_free(tf_uvorig);
} }
static void draw_uvs_other(Scene *scene, Object *obedit, Image *curimage) static void draw_uvs_other(Scene *scene, Object *obedit, Image *curimage)