Commit: d302eac90a163b68edb7e04d74410e2e9756acf3
Author: Campbell Barton
Date: Thu Feb 5 02:51:00 2015 +1100
Branches: temp_custom_loop_normals
https://developer.blender.org/rBd302eac90a163b68edb7e04d74410e2e9756acf3
rename vars
===================================================================
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/BKE_cdderivedmesh.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
M source/blender/bmesh/intern/bmesh_mesh.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h
b/source/blender/blenkernel/BKE_DerivedMesh.h
index fc4736d..e4535fe 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -202,7 +202,7 @@ struct DerivedMesh {
/** 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_spaceset);
+ struct MLoopNorSpaceArray
*r_lnors_spacearr);
/** Recalculates mesh tessellation */
void (*recalcTessellation)(DerivedMesh *dm);
diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h
b/source/blender/blenkernel/BKE_cdderivedmesh.h
index 7f5504a..59ec316 100644
--- a/source/blender/blenkernel/BKE_cdderivedmesh.h
+++ b/source/blender/blenkernel/BKE_cdderivedmesh.h
@@ -108,8 +108,8 @@ void CDDM_calc_normals(struct DerivedMesh *dm);
void CDDM_calc_normals_tessface(struct DerivedMesh *dm);
void CDDM_calc_loop_normals(struct DerivedMesh *dm, const bool
use_split_normals, const float split_angle);
-void CDDM_calc_loop_normals_spaceset(struct DerivedMesh *dm, const bool
use_split_normals, const float split_angle,
- struct MLoopNorSpaceArray
*r_lnors_spaceset);
+void CDDM_calc_loop_normals_spacearr(struct DerivedMesh *dm, const bool
use_split_normals, const float split_angle,
+ struct MLoopNorSpaceArray
*r_lnors_spacearr);
/* calculates edges for a CDDerivedMesh (from face data)
* this completely replaces the current edge data in the DerivedMesh
diff --git a/source/blender/blenkernel/BKE_mesh.h
b/source/blender/blenkernel/BKE_mesh.h
index 4fdaf5a..c0de668 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -203,15 +203,15 @@ typedef struct MLoopNorSpaceArray {
struct LinkNode *loops_pool; /* Allocated once, avoids to call
BLI_linklist_prepend_arena() for each loop! */
struct MemArena *mem;
} MLoopNorSpaceArray;
-void BKE_lnor_spaceset_init(MLoopNorSpaceArray *lnors_spaceset, const int
numLoops);
-void BKE_lnor_spaceset_clear(MLoopNorSpaceArray *lnors_spaceset);
-void BKE_lnor_spaceset_free(MLoopNorSpaceArray *lnors_spaceset);
-MLoopNorSpace *BKE_lnor_space_create(MLoopNorSpaceArray *lnors_spaceset);
+void BKE_lnor_spacearr_init(MLoopNorSpaceArray *lnors_spacearr, const int
numLoops);
+void BKE_lnor_spacearr_clear(MLoopNorSpaceArray *lnors_spacearr);
+void BKE_lnor_spacearr_free(MLoopNorSpaceArray *lnors_spacearr);
+MLoopNorSpace *BKE_lnor_space_create(MLoopNorSpaceArray *lnors_spacearr);
void BKE_lnor_space_define(
MLoopNorSpace *lnor_space, const float lnor[3], float vec_ref[3],
float vec_other[3],
struct BLI_Stack *edge_vectors);
void BKE_lnor_space_add_loop(
- MLoopNorSpaceArray *lnors_spaceset, MLoopNorSpace *lnor_space, const
int ml_index, const bool add_to_list);
+ MLoopNorSpaceArray *lnors_spacearr, MLoopNorSpace *lnor_space, const
int ml_index, const bool add_to_list);
void BKE_lnor_space_custom_data_to_normal(MLoopNorSpace *lnor_space, const
short clnor_data[2], float r_custom_lnor[3]);
void BKE_lnor_space_custom_normal_to_data(MLoopNorSpace *lnor_space, const
float custom_lnor[3], short r_clnor_data[2]);
@@ -221,7 +221,7 @@ void BKE_mesh_normals_loop_split(struct MVert *mverts,
const int numVerts, struc
struct MLoop *mloops, float (*r_loopnors)[3], const int numLoops,
struct MPoly *mpolys, const float (*polynors)[3], const int numPolys,
const bool use_split_normals, float split_angle,
- MLoopNorSpaceArray *r_lnors_spaceset, short (*clnors_data)[2], int
*r_loop_to_poly);
+ MLoopNorSpaceArray *r_lnors_spacearr, short (*clnors_data)[2], int
*r_loop_to_poly);
void BKE_mesh_normals_loop_custom_set(
struct MVert *mverts, const int numVerts, struct MEdge *medges, const
int numEdges,
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c
b/source/blender/blenkernel/intern/cdderivedmesh.c
index b62946d..345c5fd 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_spaceset;
+ dm->calcLoopNormalsSpaceset = CDDM_calc_loop_normals_spacearr;
dm->recalcTessellation = CDDM_recalc_tessellation;
dm->getVertCos = cdDM_getVertCos;
@@ -2159,13 +2159,13 @@ void CDDM_calc_normals(DerivedMesh *dm)
void CDDM_calc_loop_normals(DerivedMesh *dm, const bool use_split_normals,
const float split_angle)
{
- CDDM_calc_loop_normals_spaceset(dm, use_split_normals, split_angle,
NULL);
+ CDDM_calc_loop_normals_spacearr(dm, use_split_normals, split_angle,
NULL);
}
// #define DEBUG_CLNORS
-void CDDM_calc_loop_normals_spaceset(
- DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopNorSpaceArray *r_lnors_spaceset)
+void CDDM_calc_loop_normals_spacearr(
+ DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopNorSpaceArray *r_lnors_spacearr)
{
MVert *mverts = dm->getVertArray(dm);
MEdge *medges = dm->getEdgeArray(dm);
@@ -2208,19 +2208,19 @@ void CDDM_calc_loop_normals_spaceset(
BKE_mesh_normals_loop_split(mverts, numVerts, medges, numEdges, mloops,
lnors, numLoops,
mpolys, (const float (*)[3])pnors, numPolys,
use_split_normals, split_angle,
- r_lnors_spaceset, clnor_data, NULL);
+ r_lnors_spacearr, clnor_data, NULL);
#ifdef DEBUG_CLNORS
- if (r_lnors_spaceset) {
+ if (r_lnors_spacearr) {
int i;
for (i = 0; i < numLoops; i++) {
- if (r_lnors_spaceset->lspaceset[i]->ref_alpha != 0.0f) {
- LinkNode *loops =
r_lnors_spaceset->lspaceset[i]->loops;
- printf("Loop %d uses lnor space %p:\n", i,
r_lnors_spaceset->lspaceset[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]);
print_v3("\tfinal lnor", lnors[i]);
- print_v3("\tauto lnor",
r_lnors_spaceset->lspaceset[i]->vec_lnor);
- print_v3("\tref_vec",
r_lnors_spaceset->lspaceset[i]->vec_ref);
- printf("\talpha: %f\n\tbeta: %f\n\tloops:
%p\n", r_lnors_spaceset->lspaceset[i]->ref_alpha,
-
r_lnors_spaceset->lspaceset[i]->ref_beta,
r_lnors_spaceset->lspaceset[i]->loops);
+ 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);
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 c87b14b..ba3427a 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -170,7 +170,7 @@ static void emDM_calcNormals(DerivedMesh *dm)
}
static void emDM_calcLoopNormalsSpaceset(
- DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopNorSpaceArray *r_lnors_spaceset);
+ 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)
{
@@ -180,7 +180,7 @@ static void emDM_calcLoopNormals(DerivedMesh *dm, const
bool use_split_normals,
//#define DEBUG_CLNORS
static void emDM_calcLoopNormalsSpaceset(
- DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopNorSpaceArray *r_lnors_spaceset)
+ DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopNorSpaceArray *r_lnors_spacearr)
{
EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
BMesh *bm = bmdm->em->bm;
@@ -209,19 +209,19 @@ static void emDM_calcLoopNormalsSpaceset(
cd_loop_clnors_offset = clnors_data ? -1 :
CustomData_get_offset(&bm->ldata, CD_CUSTOMLOOPNORMAL);
BM_loops_calc_normal_vcos(bm, vertexCos, vertexNos, polyNos,
use_split_normals, split_angle, loopNos,
- r_lnors_spaceset, clnors_data,
cd_loop_clnors_offset);
+ r_lnors_spacearr, clnors_data,
cd_loop_clnors_offset);
#ifdef DEBUG_CLNORS
- if (r_lnors_spaceset) {
+ if (r_lnors_spacearr) {
int i;
for (i = 0; i < numLoops; i++) {
- if (r_lnors_spaceset->lspaceset[i]->ref_alpha != 0.0f) {
- LinkNode *loops =
r_lnors_spaceset->lspaceset[i]->loops;
- printf("Loop %d uses lnor space %p:\n", i,
r_lnors_spaceset->lspaceset[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]);
print_v3("\tfinal lnor:", loopNos[i]);
- print_v3("\tauto lnor:",
r_lnors_spaceset->lspaceset[i]->vec_lnor);
- print_v3("\tref_vec:",
r_lnors_spaceset->lspaceset[i]->vec_ref);
- printf("\talpha: %f\n\tbeta: %f\n\tloops:
%p\n", r_lnors_spaceset->lspaceset[i]->ref_alpha,
-
r_lnors_spaceset->lspaceset[i]->ref_beta,
r_lnors_spaceset->lspaceset[i]->loops);
+ 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);
printf("\t\t(shared with loops");
while (loops) {
printf(" %d",
GET_INT_FROM_POINTER(loops->link));
diff --git a/source/ble
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
