Commit: a4a4dd40ca12ddc8121bf3a25a5db2ce7ce76d7e
Author: Bastien Montagne
Date: Fri Jan 23 18:26:49 2015 +0100
Branches: temp_custom_loop_normals
https://developer.blender.org/rBa4a4dd40ca12ddc8121bf3a25a5db2ce7ce76d7e
Cleanup: rename 'spaces' -> 'spaceset'
Not a good idea to make names like MLoopNorSpace/MLoopNorSpaces...
===================================================================
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 825c051..b8b09a1 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -88,7 +88,7 @@ struct MTFace;
struct Object;
struct Scene;
struct Mesh;
-struct MLoopsNorSpaces;
+struct MLoopNorSpaceset;
struct BMEditMesh;
struct KeyBlock;
struct ModifierData;
@@ -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
spaces. */
- void (*calcLoopNormalsSpaces)(DerivedMesh *dm, const bool
use_split_normals, const float split_angle,
- struct MLoopsNorSpaces *r_lnors_spaces);
+ /** Calculate loop (split) normals, and returns split loop normal
spaceset. */
+ void (*calcLoopNormalsSpaceset)(DerivedMesh *dm, const bool
use_split_normals, const float split_angle,
+ struct MLoopNorSpaceset
*r_lnors_spaceset);
/** Recalculates mesh tessellation */
void (*recalcTessellation)(DerivedMesh *dm);
diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h
b/source/blender/blenkernel/BKE_cdderivedmesh.h
index 977207c..97da321 100644
--- a/source/blender/blenkernel/BKE_cdderivedmesh.h
+++ b/source/blender/blenkernel/BKE_cdderivedmesh.h
@@ -40,7 +40,7 @@
struct DerivedMesh;
struct BMEditMesh;
struct Mesh;
-struct MLoopsNorSpaces;
+struct MLoopNorSpaceset;
struct Object;
/* creates a new CDDerivedMesh */
@@ -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_spaces(struct DerivedMesh *dm, const bool
use_split_normals, const float split_angle,
- struct MLoopsNorSpaces *r_lnors_spaces);
+void CDDM_calc_loop_normals_spaceset(struct DerivedMesh *dm, const bool
use_split_normals, const float split_angle,
+ struct MLoopNorSpaceset
*r_lnors_spaceset);
/* 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 3eb3eb5..765ef49 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -192,19 +192,19 @@ typedef struct MLoopNorSpace {
float ref_beta; /* Reference angle, around vec_lnor, in ]0,
2pi] range (0.0 marks that space as invalid). */
struct LinkNode *loops; /* All indices (uint_in_ptr) of loops using
this lnor space (i.e. smooth fan of loops). */
} MLoopNorSpace;
-typedef struct MLoopsNorSpaces {
- MLoopNorSpace **lspaces;
+typedef struct MLoopNorSpaceset {
+ MLoopNorSpace **lspaceset;
struct LinkNode *loops_pool; /* Allocated once, avoids to call
BLI_linklist_prepend_arena() for each loop! */
struct MemArena *mem;
-} MLoopsNorSpaces;
-void BKE_lnor_spaces_init(MLoopsNorSpaces *lnors_spaces, const int numLoops);
-void BKE_lnor_spaces_free(MLoopsNorSpaces *lnors_spaces);
-MLoopNorSpace *BKE_lnor_space_create(MLoopsNorSpaces *lnors_spaces);
+} MLoopNorSpaceset;
+void BKE_lnor_spaceset_init(MLoopNorSpaceset *lnors_spaceset, const int
numLoops);
+void BKE_lnor_spaceset_free(MLoopNorSpaceset *lnors_spaceset);
+MLoopNorSpace *BKE_lnor_space_create(MLoopNorSpaceset *lnors_spaceset);
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(
- MLoopsNorSpaces *lnors_spaces, MLoopNorSpace *lnor_space, const int
ml_index, const bool add_to_list);
+ MLoopNorSpaceset *lnors_spaceset, 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]);
@@ -214,7 +214,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,
- MLoopsNorSpaces *r_lnors_spaces, short (*clnors_data)[2], int
*r_loop_to_poly);
+ MLoopNorSpaceset *r_lnors_spaceset, 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 62782ae..e82b40c 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->calcLoopNormalsSpaces = CDDM_calc_loop_normals_spaces;
+ dm->calcLoopNormalsSpaceset = CDDM_calc_loop_normals_spaceset;
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_spaces(dm, use_split_normals, split_angle, NULL);
+ CDDM_calc_loop_normals_spaceset(dm, use_split_normals, split_angle,
NULL);
}
//#define DEBUG_CLNORS
-void CDDM_calc_loop_normals_spaces(
- DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopsNorSpaces *r_lnors_spaces)
+void CDDM_calc_loop_normals_spaceset(
+ DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopNorSpaceset *r_lnors_spaceset)
{
MVert *mverts = dm->getVertArray(dm);
MEdge *medges = dm->getEdgeArray(dm);
@@ -2208,19 +2208,19 @@ void CDDM_calc_loop_normals_spaces(
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_spaces, clnor_data, NULL);
+ r_lnors_spaceset, clnor_data, NULL);
#ifdef DEBUG_CLNORS
- if (r_lnors_spaces) {
+ if (r_lnors_spaceset) {
int i;
for (i = 0; i < numLoops; i++) {
- if (r_lnors_spaces->lspaces[i]->ref_alpha !=
0.0f) {
- LinkNode *loops =
r_lnors_spaces->lspaces[i]->loops;
- printf("Loop %d uses lnor space %p:\n",
i, r_lnors_spaces->lspaces[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]);
print_v3("\tfinal lnor", lnors[i]);
- print_v3("\tauto lnor",
r_lnors_spaces->lspaces[i]->vec_lnor);
- print_v3("\tref_vec",
r_lnors_spaces->lspaces[i]->vec_ref);
- printf("\talpha: %f\n\tbeta:
%f\n\tloops: %p\n", r_lnors_spaces->lspaces[i]->ref_alpha,
-
r_lnors_spaces->lspaces[i]->ref_beta, r_lnors_spaces->lspaces[i]->loops);
+ 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);
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 df15ccf..cb41d2d 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -169,18 +169,18 @@ static void emDM_calcNormals(DerivedMesh *dm)
dm->dirty &= ~DM_DIRTY_NORMALS;
}
-static void emDM_calcLoopNormalsSpaces(
- DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopsNorSpaces *r_lnors_spaces);
+static void emDM_calcLoopNormalsSpaceset(
+ DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopNorSpaceset *r_lnors_spaceset);
static void emDM_calcLoopNormals(DerivedMesh *dm, const bool
use_split_normals, const float split_angle)
{
- emDM_calcLoopNormalsSpaces(dm, use_split_normals, split_angle, NULL);
+ emDM_calcLoopNormalsSpaceset(dm, use_split_normals, split_angle, NULL);
}
//#define DEBUG_CLNORS
-static void emDM_calcLoopNormalsSpaces(
- DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopsNorSpaces *r_lnors_spaces)
+static void emDM_calcLoopNormalsSpaceset(
+ DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopNorSpaceset *r_lnors_spaceset)
{
EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
BMesh *bm = bmdm->em->bm;
@@ -208,19 +208,19 @@ static void emDM_calcLoopNormalsSpaces(
const int 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_spaces, clnors_data,
cd_loop_clnors_offset);
+ r_lnors_spaceset, clnors_data,
cd_loop_clnors_offset);
#ifdef DEBUG_CLNORS
- if (r_lnors_spaces) {
+ if (r_lnors_spaceset) {
int i;
for (i = 0; i < numLoops; i++) {
- if (r_lnors_spaces->lspaces[i]->ref_alpha !=
0.0f) {
- LinkNode *loops =
r_lnors_spaces->lspaces[i]->loops;
- printf("Loop %d uses lnor space %p:\n",
i, r_lnors_spaces->lspaces[i]);
+ if (r_lnors_spaceset->lspaceset[i
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
