Commit: 83021ce43f3e729bceab525fdb4e29fd40935d17
Author: Campbell Barton
Date: Thu Feb 5 02:35:33 2015 +1100
Branches: temp_custom_loop_normals
https://developer.blender.org/rB83021ce43f3e729bceab525fdb4e29fd40935d17
rename struct MLoopNorSpaceset -> MLoopNorSpaceArray
since its not a 'set' or 'setting' anything, its an MLoop alligned array-store
===================================================================
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/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 b8b09a1..fc4736d 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 MLoopNorSpaceset;
+struct MLoopNorSpaceArray;
struct BMEditMesh;
struct KeyBlock;
struct ModifierData;
@@ -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 MLoopNorSpaceset
*r_lnors_spaceset);
+ struct MLoopNorSpaceArray
*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 97da321..7f5504a 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 MLoopNorSpaceset;
+struct MLoopNorSpaceArray;
struct Object;
/* creates a new CDDerivedMesh */
@@ -109,7 +109,7 @@ 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 MLoopNorSpaceset
*r_lnors_spaceset);
+ struct MLoopNorSpaceArray
*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 969cb6f..4fdaf5a 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -198,20 +198,20 @@ typedef struct MLoopNorSpace {
/**
* Collection of #MLoopNorSpace basic storage & pre-allocation.
*/
-typedef struct MLoopNorSpaceset {
+typedef struct MLoopNorSpaceArray {
MLoopNorSpace **lspaceset; /* MLoop aligned array */
struct LinkNode *loops_pool; /* Allocated once, avoids to call
BLI_linklist_prepend_arena() for each loop! */
struct MemArena *mem;
-} MLoopNorSpaceset;
-void BKE_lnor_spaceset_init(MLoopNorSpaceset *lnors_spaceset, const int
numLoops);
-void BKE_lnor_spaceset_clear(MLoopNorSpaceset *lnors_spaceset);
-void BKE_lnor_spaceset_free(MLoopNorSpaceset *lnors_spaceset);
-MLoopNorSpace *BKE_lnor_space_create(MLoopNorSpaceset *lnors_spaceset);
+} 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_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(
- MLoopNorSpaceset *lnors_spaceset, MLoopNorSpace *lnor_space, const int
ml_index, const bool add_to_list);
+ MLoopNorSpaceArray *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]);
@@ -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,
- MLoopNorSpaceset *r_lnors_spaceset, short (*clnors_data)[2], int
*r_loop_to_poly);
+ MLoopNorSpaceArray *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 f889f4f..b62946d 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -2165,7 +2165,7 @@ void CDDM_calc_loop_normals(DerivedMesh *dm, const bool
use_split_normals, const
// #define DEBUG_CLNORS
void CDDM_calc_loop_normals_spaceset(
- DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopNorSpaceset *r_lnors_spaceset)
+ DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopNorSpaceArray *r_lnors_spaceset)
{
MVert *mverts = dm->getVertArray(dm);
MEdge *medges = dm->getEdgeArray(dm);
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c
b/source/blender/blenkernel/intern/editderivedmesh.c
index c44cf61..c87b14b 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, MLoopNorSpaceset *r_lnors_spaceset);
+ DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopNorSpaceArray *r_lnors_spaceset);
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, MLoopNorSpaceset *r_lnors_spaceset)
+ DerivedMesh *dm, const bool use_split_normals, const float
split_angle, MLoopNorSpaceArray *r_lnors_spaceset)
{
EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
BMesh *bm = bmdm->em->bm;
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c
b/source/blender/blenkernel/intern/mesh_evaluate.c
index f01eb19..7c74224 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.c
+++ b/source/blender/blenkernel/intern/mesh_evaluate.c
@@ -319,7 +319,7 @@ void BKE_mesh_calc_normals_tessface(MVert *mverts, int
numVerts, MFace *mfaces,
MEM_freeN(fnors);
}
-void BKE_lnor_spaceset_init(MLoopNorSpaceset *lnors_spaceset, const int
numLoops)
+void BKE_lnor_spaceset_init(MLoopNorSpaceArray *lnors_spaceset, const int
numLoops)
{
if (!(lnors_spaceset->lspaceset && lnors_spaceset->loops_pool)) {
MemArena *mem;
@@ -333,14 +333,14 @@ void BKE_lnor_spaceset_init(MLoopNorSpaceset
*lnors_spaceset, const int numLoops
}
}
-void BKE_lnor_spaceset_clear(MLoopNorSpaceset *lnors_spaceset)
+void BKE_lnor_spaceset_clear(MLoopNorSpaceArray *lnors_spaceset)
{
BLI_memarena_clear(lnors_spaceset->mem);
lnors_spaceset->lspaceset = NULL;
lnors_spaceset->loops_pool = NULL;
}
-void BKE_lnor_spaceset_free(MLoopNorSpaceset *lnors_spaceset)
+void BKE_lnor_spaceset_free(MLoopNorSpaceArray *lnors_spaceset)
{
BLI_memarena_free(lnors_spaceset->mem);
lnors_spaceset->lspaceset = NULL;
@@ -348,7 +348,7 @@ void BKE_lnor_spaceset_free(MLoopNorSpaceset
*lnors_spaceset)
lnors_spaceset->mem = NULL;
}
-MLoopNorSpace *BKE_lnor_space_create(MLoopNorSpaceset *lnors_spaceset)
+MLoopNorSpace *BKE_lnor_space_create(MLoopNorSpaceArray *lnors_spaceset)
{
return BLI_memarena_calloc(lnors_spaceset->mem, sizeof(MLoopNorSpace));
}
@@ -417,7 +417,7 @@ void BKE_lnor_space_define(MLoopNorSpace *lnor_space, const
float lnor[3],
}
}
-void BKE_lnor_space_add_loop(MLoopNorSpaceset *lnors_spaceset, MLoopNorSpace
*lnor_space, const int ml_index,
+void BKE_lnor_space_add_loop(MLoopNorSpaceArray *lnors_spaceset, MLoopNorSpace
*lnor_space, const int ml_index,
const bool do_add_loop)
{
lnors_spaceset->lspaceset[ml_index] = lnor_space;
@@ -539,7 +539,7 @@ typedef struct LoopSplitTaskDataCommon {
/* Read/write.
* Note we do not need to protect it, though, since two different tasks
will *always* affect different
* elements in the arrays. */
- MLoopNorSpaceset *lnors_spaceset;
+ MLoopNorSpaceArray *lnors_spaceset;
BLI_bitmap *sharp_verts;
float (*loopnors)[3];
short (*clnors_data)[2];
@@ -567,7 +567,7 @@ typedef struct LoopSplitTaskDataCommon {
static void split_loop_nor_single_do(LoopSplitTaskDataCommon *common_data,
LoopSplitTaskData *data)
{
- MLoopNorSpaceset *lnors_spaceset = common_data->lnors_spaceset;
+ MLoopNorSpaceArray *lnors_spaceset = common_data->lnors_spaceset;
short (*clnors_data)[2] = common_data->clnors_data;
const MVert *mverts = common_data->mverts;
@@ -620,7 +620,7 @@ static void
split_loop_nor_single_do(LoopSplitTaskDataCommon *common_data, LoopS
static void split_loop_nor_fan_do(LoopSplitTaskDataCommon *common_data,
LoopSplitTaskData *data)
{
- MLoopNorSpaceset *lnors_spaceset = common_data->lnors_spaceset;
+ MLoopNorSpaceArray *lnors_spaceset = common_data->lnors_spaceset;
float (*loopnors)[3] = common_data->loopnors;
short (*clnors_data)[2] = common_data->clnors_data;
@@ -902,7 +902,7 @@ static void loop_split_worker(TaskPool *UNUSED(pool), void
*taskdata, int UNUSED
/* Note we use data_buff to detect whether we are in threaded context or not,
in later case it is NULL. */
static void loop_split_generator_do(LoopSplitTaskDataCommon *common_data,
const bool threaded)
{
- MLoopNorSpaceset *lnors_spaceset = common_data->lnors_spaceset;
+ MLoopNorSpaceArray *lnors_spaceset = common_data->lnors_spaceset;
BLI_bitmap *sharp_verts = common_data->sharp_verts;
float (*loopnors)[3] = common_data->loopnors;
@@ -1058,7 +1058,7 @@ void BKE_mesh_normals_loop_split(
MLoop *mloops, flo
@@ 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
