[Bf-blender-cvs] [65f32e105f4] uv_unwrapping_slim_algorithm: SLIM: match code style.
Brecht Van Lommel
noreply at git.blender.org
Mon Mar 27 22:44:31 CEST 2017
Commit: 65f32e105f44aa71b2fbc461318348ed6428d95a
Author: Brecht Van Lommel
Date: Sat Mar 25 14:08:58 2017 +0100
Branches: uv_unwrapping_slim_algorithm
https://developer.blender.org/rB65f32e105f44aa71b2fbc461318348ed6428d95a
SLIM: match code style.
===================================================================
M intern/slim/geometry_data_retrieval.h
M intern/slim/intern/geometry_data_retrieval.cpp
M intern/slim/intern/least_squares_relocator.cpp
M intern/slim/intern/slim_parametrizer.cpp
M intern/slim/slim.h
M intern/slim/slim_matrix_transfer.h
M source/blender/editors/uvedit/uvedit_parametrizer.c
M source/blender/editors/uvedit/uvedit_parametrizer.h
M source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
diff --git a/intern/slim/geometry_data_retrieval.h b/intern/slim/geometry_data_retrieval.h
index 2af4fce8e46..6ad40cd17e7 100644
--- a/intern/slim/geometry_data_retrieval.h
+++ b/intern/slim/geometry_data_retrieval.h
@@ -67,7 +67,7 @@ namespace retrieval {
double weightInfluence;
};
- void constructSlimData(GeometryData &gd, SLIMData *slimData, bool skipInitialization, int slim_reflection_mode, double relativeScale);
+ void constructSlimData(GeometryData &gd, SLIMData *slimData, bool skipInitialization, int reflection_mode, double relativeScale);
void retrievePinnedVertices(GeometryData &gd, bool borderVerticesArePinned);
diff --git a/intern/slim/intern/geometry_data_retrieval.cpp b/intern/slim/intern/geometry_data_retrieval.cpp
index 5cc418be15c..10fd696b5ad 100644
--- a/intern/slim/intern/geometry_data_retrieval.cpp
+++ b/intern/slim/intern/geometry_data_retrieval.cpp
@@ -97,11 +97,11 @@ namespace retrieval {
return (skipInitialization && hasValidPreinitializedMap(gd));
}
- void constructSlimData(GeometryData &gd, SLIMData *slimData, bool skipInitialization, int slim_reflection_mode, double relativeScale){
+ void constructSlimData(GeometryData &gd, SLIMData *slimData, bool skipInitialization, int reflection_mode, double relativeScale){
slimData->skipInitialization = canInitializationBeSkipped(gd, skipInitialization);
slimData->weightInfluence = gd.weightInfluence;
slimData->relativeScale = relativeScale;
- slimData->slim_reflection_mode = slim_reflection_mode;
+ slimData->reflection_mode = reflection_mode;
slimData->withWeightedParameterization = gd.withWeightedParameteriztion;
setGeometryDataMatrices(gd, slimData);
diff --git a/intern/slim/intern/least_squares_relocator.cpp b/intern/slim/intern/least_squares_relocator.cpp
index 5ed0e80437b..917a6e392fa 100644
--- a/intern/slim/intern/least_squares_relocator.cpp
+++ b/intern/slim/intern/least_squares_relocator.cpp
@@ -210,7 +210,7 @@ namespace relocator {
break;
default:
- bool flipAllowed = slimData.slim_reflection_mode == 0;
+ bool flipAllowed = slimData.reflection_mode == 0;
computLeastSquaresRotationScaleOnly(slimData,
translationVector,
diff --git a/intern/slim/intern/slim_parametrizer.cpp b/intern/slim/intern/slim_parametrizer.cpp
index fa65c132ba5..cb9693f0772 100644
--- a/intern/slim/intern/slim_parametrizer.cpp
+++ b/intern/slim/intern/slim_parametrizer.cpp
@@ -240,7 +240,7 @@ SLIMData* setup_slim(SLIMMatrixTransfer *transferredData,
transferredData->n_pinned_vertices[uvChartIndex] = geometryData.numberOfPinnedVertices;
SLIMData *slimData = new SLIMData();
- retrieval::constructSlimData(geometryData, slimData, skipInitialization, transferredData->slim_reflection_mode, transferredData->relative_scale);
+ retrieval::constructSlimData(geometryData, slimData, skipInitialization, transferredData->reflection_mode, transferredData->relative_scale);
slimData->nIterations = nIterations;
initializeIfNeeded(geometryData, slimData);
diff --git a/intern/slim/slim.h b/intern/slim/slim.h
index f06958bb9fe..28996205b7c 100644
--- a/intern/slim/slim.h
+++ b/intern/slim/slim.h
@@ -42,7 +42,7 @@ struct SLIMData
double exp_factor; // used for exponential energies, ignored otherwise
bool mesh_improvement_3d; // only supported for 3d
- int slim_reflection_mode;
+ int reflection_mode;
bool skipInitialization = false;
bool validPreInitialization = false;
double expectedSurfaceAreaOfResultingMap = 0;
diff --git a/intern/slim/slim_matrix_transfer.h b/intern/slim/slim_matrix_transfer.h
index 3ac9050d349..2c6e883cdf6 100644
--- a/intern/slim/slim_matrix_transfer.h
+++ b/intern/slim/slim_matrix_transfer.h
@@ -66,7 +66,7 @@ typedef struct {
bool with_weighted_parameterization;
double weight_influence;
bool transform_islands;
- int slim_reflection_mode;
+ int reflection_mode;
double relative_scale;
} SLIMMatrixTransfer;
diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c
index 4b732999ee0..01e69d367fc 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.c
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.c
@@ -44,6 +44,8 @@
#include "BLI_sys_types.h" /* for intptr_t support */
+#include "slim_capi.h"
+
#include "eigen_capi.h"
/* Utils */
@@ -114,7 +116,7 @@ typedef struct PVert {
unsigned char flag;
bool on_boundary_flag;
- int slimId;
+ int slim_id;
} PVert;
typedef struct PEdge {
@@ -246,7 +248,7 @@ typedef struct PHandle {
float *weight_array;
bool is_minimize_stretch;
- //for minimize_stretch and live unwrap
+ // For minimize_stretch and live unwrap
void* recurringSlim;
} PHandle;
@@ -4211,11 +4213,9 @@ void param_slim_enrich_handle(ParamHandle *handle,
}
-/* In the following are all functions necessary to transfer data from the native part to SLIM.
- */
+/* In the following are all functions necessary to transfer data from the native part to SLIM. */
-/* Allocate pointer arrays for each matrix-group. Meaning as many pointers per array as there are charts.
- */
+/* Allocate pointer arrays for each matrix-group. Meaning as many pointers per array as there are charts. */
static void allocate_memory_for_pointerarrays(SLIMMatrixTransfer *mt, PHandle *phandle)
{
mt->n_charts = phandle->ncharts;
@@ -4238,10 +4238,8 @@ static void allocate_memory_for_pointerarrays(SLIMMatrixTransfer *mt, PHandle *p
mt->w_vectors = MEM_mallocN(mt->n_charts * sizeof(*mt->w_vectors), "Array of pointers to weight-per-face vectors");
}
-/* For one chart, allocate memory. If no accurate estimate (e.g. for number of pinned vertices) overestimate and
- correct later.
- */
-
+/* For one chart, allocate memory. If no accurate estimate (e.g. for number of pinned vertices) overestimate and
+ * correct later. */
static void allocate_memory_for_matrices(const int chartNr, const PHandle *phandle, const SLIMMatrixTransfer *mt)
{
mt->n_verts[chartNr] = phandle->charts[chartNr]->nverts;
@@ -4262,7 +4260,7 @@ static void allocate_memory_for_matrices(const int chartNr, const PHandle *phand
mt->el_vectors[chartNr] = MEM_mallocN(mt->n_edges[chartNr] * 2 * sizeof(**mt->el_vectors), " Edge-Length Vector");
}
-/* Transfer edges and edge lengths */
+/* Transfer edges and edge lengths */
static void transfer_edges(const int chartNr, const PHandle *phandle, const SLIMMatrixTransfer *mt)
{
PChart *chart = phandle->charts[chartNr];
@@ -4277,13 +4275,12 @@ static void transfer_edges(const int chartNr, const PHandle *phandle, const SLIM
p_chart_boundaries(chart, NULL, &outer);
PEdge *be = outer;
-
do {
- E[eid] = be->vert->slimId;
+ E[eid] = be->vert->slim_id;
EL[eid] = p_edge_length(be);
be = p_boundary_edge_next(be);
- E[eid + mt->n_edges[chartNr] + mt->n_boundary_vertices[chartNr]] = be->vert->slimId;
+ E[eid + mt->n_edges[chartNr] + mt->n_boundary_vertices[chartNr]] = be->vert->slim_id;
eid++;
} while (be != outer);
@@ -4291,15 +4288,15 @@ static void transfer_edges(const int chartNr, const PHandle *phandle, const SLIM
for (e = chart->edges; e; e = e->nextlink) {
e1 = e->next;
- E[eid] = e->vert->slimId;
+ E[eid] = e->vert->slim_id;
EL[eid] = p_edge_length(e);
- E[eid + mt->n_edges[chartNr] + mt->n_boundary_vertices[chartNr]] = e1->vert->slimId;
+ E[eid + mt->n_edges[chartNr] + mt->n_boundary_vertices[chartNr]] = e1->vert->slim_id;
eid++;
}
}
-/* Transfer vertices and pinned information */
+/* Transfer vertices and pinned information */
static void transfer_vertices(const int chartNr, const PHandle *phandle, SLIMMatrixTransfer *mt, float *temp_w)
{
PChart *chart = phandle->charts[chartNr];
@@ -4323,29 +4320,27 @@ static void transfer_vertices(const int chartNr, const PHandle *phandle, SLIMMat
for (v = chart->verts; v; v = v->nextlink) {
if (!v->on_boundary_flag) {
-
if (mt->with_weighted_parameterization) {
weight = temp_w[v->u.key];
W[vid] = weight;
}
- v->slimId = vid;
-
+ v->slim_id = vid;
vid++;
}
- V[v->slimId] = v->co[0];
- V[r + v->slimId] = v->co[1];
- V[2 * r + v->slimId] = v->co[2];
+ V[v->slim_id] = v->co[0];
+ V[r + v->slim_id] = v->co[1];
+ V[2 * r + v->slim_id] = v->co[2];
- UV[v->slimId] = v->uv[0];
- UV[r + v->slimId] = v->uv[1];
+ UV[v->slim_id] = v->uv[0];
+ UV[r + v->slim_id] = v->uv[1];
if (v->flag & PVERT_PIN || (phandle->is_minimize_stretch && !(v->flag & PVERT_SELECT))) {
mt->pinned_vertices = true;
mt->n_pinned_vertices[chartNr] += 1;
- P[pVid] = v->slimId;
+ P[pVid] = v->slim_id;
PP[2 * pVid] = (double)v->uv[0];
PP[2 * pVid + 1] = (double)v->uv[1];
pVid += 1;
@@ -4353,7 +4348,7 @@ static void transfer_vertices(const int chartNr, const PHandle *phandle, SLIMMat
}
}
-/* Transfer boundary vertices */
+/* Transfer boundary vertices */
static void transfer_boundary_vertices(const int chartNr, const PHandle *phandle, const SLIMMatrixTransfer *mt, float *temp_w)
{
PChart *chart = phandle->charts[chartNr];
@@ -4382,7 +4377,7 @@ static void transfer_boundary_vertices(const int chartNr, const PHandle *phandle
}
mt->n_boundary_vertices[chartNr] += 1;
- be->vert->slimId = vid;
+ be->vert->slim_id = vid;
be->vert->on_boundary_flag = true;
B[vid] = vid;
@@ -4392,8 +4387,9 @@ static void transfer_boundary_vertices(const int chartNr, const PHandle *phandle
} while (be != outer);
}
-/* Transfer faces */
-static void transfer_faces(const int chartNr, const PHandle *phandle, const SLIMMatrixTransfer *mt){
+/* Transfer faces */
+static void transfer_faces(const int chartNr, const PHandle *phandle, const SLIMMatrixTransfer *mt)
+{
PChart *chart = phandle->charts[chartNr];
PFace *f;
@@ -4413,12 +4409,12 @@ static void transfer_faces(const int chartNr, const PHandle *phandle, const SLIM
F = mt->f_matrices[chartNr];
- F[fid] = e->vert->slimId;
- F[r + fid] = e1->vert->slimId;
- F[2 * r + fid] = e2->vert->slimId;
+ F[fid] = e->vert->slim_id;
+ F[r + fid] = e1->vert->slim_id;
+ F[2 * r + fid] = e2->vert->slim_id;
fid++;
}
-};
+}
/* Conversion Function to build matrix for SLIM Parametrization */
static void con
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list