Commit: 2fd6502036616e46f387f9bb82d96258ac0f136e
Author: Bastien Montagne
Date: Wed Feb 4 18:12:40 2015 +0100
Branches: temp_custom_loop_normals
https://developer.blender.org/rB2fd6502036616e46f387f9bb82d96258ac0f136e
More name cleanup (spaceset -> spacearr).
===================================================================
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/editderivedmesh.c
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h
b/source/blender/blenkernel/BKE_DerivedMesh.h
index e4535fe..0425164 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -200,9 +200,9 @@ struct DerivedMesh {
/** Calculate loop (split) normals */
void (*calcLoopNormals)(DerivedMesh *dm, const bool use_split_normals,
const float split_angle);
- /** Calculate loop (split) normals, and returns split loop normal
spaceset. */
- void (*calcLoopNormalsSpaceset)(DerivedMesh *dm, const bool
use_split_normals, const float split_angle,
- struct MLoopNorSpaceArray
*r_lnors_spacearr);
+ /** Calculate loop (split) normals, and returns split loop normal
spacearr. */
+ void (*calcLoopNormalsSpaceArray)(DerivedMesh *dm, const bool
use_split_normals, const float split_angle,
+ struct MLoopNorSpaceArray
*r_lnors_spacearr);
/** Recalculates mesh tessellation */
void (*recalcTessellation)(DerivedMesh *dm);
diff --git a/source/blender/blenkernel/BKE_mesh.h
b/source/blender/blenkernel/BKE_mesh.h
index 5d21625..224be0f 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -199,7 +199,7 @@ typedef struct MLoopNorSpace {
* Collection of #MLoopNorSpace basic storage & pre-allocation.
*/
typedef struct MLoopNorSpaceArray {
- MLoopNorSpace **lspaceset; /* MLoop aligned array */
+ MLoopNorSpace **lspacearr; /* MLoop aligned array */
struct LinkNode *loops_pool; /* Allocated once, avoids to call
BLI_linklist_prepend_arena() for each loop! */
struct MemArena *mem;
} MLoopNorSpaceArray;
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c
b/source/blender/blenkernel/intern/cdderivedmesh.c
index 345c5fd..0192c97 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1540,7 +1540,7 @@ static CDDerivedMesh *cdDM_create(const char *desc)
dm->calcNormals = CDDM_calc_normals;
dm->calcLoopNormals = CDDM_calc_loop_normals;
- dm->calcLoopNormalsSpaceset = CDDM_calc_loop_normals_spacearr;
+ dm->calcLoopNormalsSpaceArray = CDDM_calc_loop_normals_spacearr;
dm->recalcTessellation = CDDM_recalc_tessellation;
dm->getVertCos = cdDM_getVertCos;
@@ -2213,14 +2213,14 @@ void CDDM_calc_loop_normals_spacearr(
if (r_lnors_spacearr) {
int i;
for (i = 0; i < numLoops; i++) {
- if (r_lnors_spacearr->lspaceset[i]->ref_alpha != 0.0f) {
- LinkNode *loops =
r_lnors_spacearr->lspaceset[i]->loops;
- printf("Loop %d uses lnor space %p:\n", i,
r_lnors_spacearr->lspaceset[i]);
+ if (r_lnors_spacearr->lspacearr[i]->ref_alpha != 0.0f) {
+ LinkNode *loops =
r_lnors_spacearr->lspacearr[i]->loops;
+ printf("Loop %d uses lnor space %p:\n", i,
r_lnors_spacearr->lspacearr[i]);
print_v3("\tfinal lnor", lnors[i]);
- print_v3("\tauto lnor",
r_lnors_spacearr->lspaceset[i]->vec_lnor);
- print_v3("\tref_vec",
r_lnors_spacearr->lspaceset[i]->vec_ref);
- printf("\talpha: %f\n\tbeta: %f\n\tloops:
%p\n", r_lnors_spacearr->lspaceset[i]->ref_alpha,
-
r_lnors_spacearr->lspaceset[i]->ref_beta,
r_lnors_spacearr->lspaceset[i]->loops);
+ print_v3("\tauto lnor",
r_lnors_spacearr->lspacearr[i]->vec_lnor);
+ print_v3("\tref_vec",
r_lnors_spacearr->lspacearr[i]->vec_ref);
+ printf("\talpha: %f\n\tbeta: %f\n\tloops:
%p\n", r_lnors_spacearr->lspacearr[i]->ref_alpha,
+
r_lnors_spacearr->lspacearr[i]->ref_beta,
r_lnors_spacearr->lspacearr[i]->loops);
printf("\t\t(shared with loops");
while (loops) {
printf(" %d",
GET_INT_FROM_POINTER(loops->link));
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c
b/source/blender/blenkernel/intern/editderivedmesh.c
index ba3427a..2538a03 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -169,17 +169,17 @@ static void emDM_calcNormals(DerivedMesh *dm)
dm->dirty &= ~DM_DIRTY_NORMALS;
}
-static void emDM_calcLoopNormalsSpaceset(
+static void emDM_calcLoopNormalsSpaceArray(
DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopNorSpaceArray *r_lnors_spacearr);
static void emDM_calcLoopNormals(DerivedMesh *dm, const bool
use_split_normals, const float split_angle)
{
- emDM_calcLoopNormalsSpaceset(dm, use_split_normals, split_angle, NULL);
+ emDM_calcLoopNormalsSpaceArray(dm, use_split_normals, split_angle,
NULL);
}
//#define DEBUG_CLNORS
-static void emDM_calcLoopNormalsSpaceset(
+static void emDM_calcLoopNormalsSpaceArray(
DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopNorSpaceArray *r_lnors_spacearr)
{
EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
@@ -214,14 +214,14 @@ static void emDM_calcLoopNormalsSpaceset(
if (r_lnors_spacearr) {
int i;
for (i = 0; i < numLoops; i++) {
- if (r_lnors_spacearr->lspaceset[i]->ref_alpha != 0.0f) {
- LinkNode *loops =
r_lnors_spacearr->lspaceset[i]->loops;
- printf("Loop %d uses lnor space %p:\n", i,
r_lnors_spacearr->lspaceset[i]);
+ if (r_lnors_spacearr->lspacearr[i]->ref_alpha != 0.0f) {
+ LinkNode *loops =
r_lnors_spacearr->lspacearr[i]->loops;
+ printf("Loop %d uses lnor space %p:\n", i,
r_lnors_spacearr->lspacearr[i]);
print_v3("\tfinal lnor:", loopNos[i]);
- print_v3("\tauto lnor:",
r_lnors_spacearr->lspaceset[i]->vec_lnor);
- print_v3("\tref_vec:",
r_lnors_spacearr->lspaceset[i]->vec_ref);
- printf("\talpha: %f\n\tbeta: %f\n\tloops:
%p\n", r_lnors_spacearr->lspaceset[i]->ref_alpha,
-
r_lnors_spacearr->lspaceset[i]->ref_beta,
r_lnors_spacearr->lspaceset[i]->loops);
+ print_v3("\tauto lnor:",
r_lnors_spacearr->lspacearr[i]->vec_lnor);
+ print_v3("\tref_vec:",
r_lnors_spacearr->lspacearr[i]->vec_ref);
+ printf("\talpha: %f\n\tbeta: %f\n\tloops:
%p\n", r_lnors_spacearr->lspacearr[i]->ref_alpha,
+
r_lnors_spacearr->lspacearr[i]->ref_beta,
r_lnors_spacearr->lspacearr[i]->loops);
printf("\t\t(shared with loops");
while (loops) {
printf(" %d",
GET_INT_FROM_POINTER(loops->link));
@@ -1807,7 +1807,7 @@ DerivedMesh *getEditDerivedBMesh(BMEditMesh *em,
bmdm->dm.calcNormals = emDM_calcNormals;
bmdm->dm.calcLoopNormals = emDM_calcLoopNormals;
- bmdm->dm.calcLoopNormalsSpaceset = emDM_calcLoopNormalsSpaceset;
+ bmdm->dm.calcLoopNormalsSpaceArray = emDM_calcLoopNormalsSpaceArray;
bmdm->dm.recalcTessellation = emDM_recalcTessellation;
bmdm->dm.foreachMappedVert = emDM_foreachMappedVert;
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c
b/source/blender/blenkernel/intern/mesh_evaluate.c
index 1d2532e..f12fdeb 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.c
+++ b/source/blender/blenkernel/intern/mesh_evaluate.c
@@ -321,14 +321,14 @@ void BKE_mesh_calc_normals_tessface(MVert *mverts, int
numVerts, MFace *mfaces,
void BKE_lnor_spacearr_init(MLoopNorSpaceArray *lnors_spacearr, const int
numLoops)
{
- if (!(lnors_spacearr->lspaceset && lnors_spacearr->loops_pool)) {
+ if (!(lnors_spacearr->lspacearr && lnors_spacearr->loops_pool)) {
MemArena *mem;
if (!lnors_spacearr->mem) {
lnors_spacearr->mem =
BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__);
}
mem = lnors_spacearr->mem;
- lnors_spacearr->lspaceset = BLI_memarena_calloc(mem,
sizeof(MLoopNorSpace *) * (size_t)numLoops);
+ lnors_spacearr->lspacearr = BLI_memarena_calloc(mem,
sizeof(MLoopNorSpace *) * (size_t)numLoops);
lnors_spacearr->loops_pool = BLI_memarena_alloc(mem,
sizeof(LinkNode) * (size_t)numLoops);
}
}
@@ -336,14 +336,14 @@ void BKE_lnor_spacearr_init(MLoopNorSpaceArray
*lnors_spacearr, const int numLoo
void BKE_lnor_spacearr_clear(MLoopNorSpaceArray *lnors_spacearr)
{
BLI_memarena_clear(lnors_spacearr->mem);
- lnors_spacearr->lspaceset = NULL;
+ lnors_spacearr->lspacearr = NULL;
lnors_spacearr->loops_pool = NULL;
}
void BKE_lnor_spacearr_free(MLoopNorSpaceArray *lnors_spacearr)
{
BLI_memarena_free(lnors_spacearr->mem);
- lnors_spacearr->lspaceset = NULL;
+ lnors_spacearr->lspacearr = NULL;
lnors_spacearr->loops_pool = NULL;
lnors_spacearr->mem = NULL;
}
@@ -420,7 +420,7 @@ void BKE_lnor_space_define(MLoopNorSpace *lnor_space, const
float lnor[3],
void BKE_lnor_space_add_loop(MLoopNorSpaceArray *lnors_spacearr, MLoopNorSpace
*lnor_space, const int ml_index,
const bool do_add_loop)
{
- lnors_spacearr->lspaceset[ml_index] = lnor_space;
+ lnors_spacearr->lspacearr[ml_index] = lnor_space;
if (do_add_loop) {
BLI_linklist_prepend_nlink(&lnor_space->loops,
SET_INT_IN_POINTER(ml_index), &lnors_spacearr->loops_pool[ml_index]);
}
@@ -802,7 +802,7 @@ static void split_loop_nor_fan_do(LoopSplitTaskDataCommon
*common_data, LoopSpli
{
float lnor_len = normalize_v3(lnor);
- /* If we are generating lnor spaceset, we can now define the
one for this fan,
+ /* If we are generating lnor spacearr, we can now define the
one for this fan,
* and optionally compute final lnor from custom data too!
*/
if (lnors_spacearr) {
@@ -868,7 +868,7 @@ static void loop_split_worker(TaskPool *UNUSED(pool), void
*taskdata, int UNUSED
LoopSplitTaskDataCommon *common_data = taskdata;
LoopSplitTaskData *data_buff;
- /* Temp edge vectors stack, only used when computing lnor spaceset. */
+ /* Temp edge vectors stack, only used when computing lnor spacearr. */
BLI_Stack *edge_vectors = common_data->lnors_spacearr ?
BLI_stack_new(sizeof(float[3]), __func__) : NULL;
#ifdef DEBUG_TIME
@@ -917,7 +917,7 @@ static void loop_split_generator_do(LoopSplitTaskDataCommon
*common_data, const
LoopSplitTaskData *data, *data_buff = NULL, data_mem;
int data_idx = 0;
- /* Temp edge vectors stack, only used when computing lnor spaceset (and
we are not multi-threading). */
+ /* Temp edge vectors stack, only used when computing lnor spacearr (and
we are not multi-threading). */
BLI_Stack *edge_vectors = (lnors_spacearr && !data_buff) ?
BLI_stack_new(sizeof(float[3]), __func__) : NULL;
#ifdef DEBUG_TIME
@@ -953,7 +953,7 @@ static void loop_split_generator_do(LoopSplitTaskDataCommon
*common_data, const
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
