[Bf-blender-cvs] [118d63712d3] uv_unwrapping_slim_algorithm: UV Unwrapping SLIM: removing thesis marker-comments from code
Aurel Gruber
noreply at git.blender.org
Tue Mar 14 09:43:15 CET 2017
Commit: 118d63712d3a24b569d4c457f1caf315b471e590
Author: Aurel Gruber
Date: Thu Mar 9 14:12:40 2017 +0100
Branches: uv_unwrapping_slim_algorithm
https://developer.blender.org/rB118d63712d3a24b569d4c457f1caf315b471e590
UV Unwrapping SLIM: removing thesis marker-comments from code
===================================================================
M intern/slim/matrix_transfer.h
M intern/slim/slim_parametrizer.h
M intern/slim/src/slim_c_interface.cpp
M source/blender/bmesh/bmesh_class.h
M source/blender/editors/uvedit/uvedit_intern.h
M source/blender/editors/uvedit/uvedit_ops.c
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
M source/blender/makesdna/DNA_scene_types.h
===================================================================
diff --git a/intern/slim/matrix_transfer.h b/intern/slim/matrix_transfer.h
index fc275143936..4584981f93e 100644
--- a/intern/slim/matrix_transfer.h
+++ b/intern/slim/matrix_transfer.h
@@ -30,8 +30,7 @@
#include <stdio.h>
-/* AUREL THESIS
- Struct that holds all the information and data matrices to be transfered from the native Blender part to SLIM, named as follows:
+/* Struct that holds all the information and data matrices to be transfered from the native Blender part to SLIM, named as follows:
Matrix/Vector | contains pointers to arrays of:
________________|_____________________________________________
diff --git a/intern/slim/slim_parametrizer.h b/intern/slim/slim_parametrizer.h
index 834f9a8bf20..321b0944bae 100644
--- a/intern/slim/slim_parametrizer.h
+++ b/intern/slim/slim_parametrizer.h
@@ -35,8 +35,7 @@
using namespace igl;
-/* AUREL THESIS
- The header file that exposes the C++ functions to the native C part of Blender, see thesis.
+/* The header file that exposes the C++ functions to the native C part of Blender, see thesis.
*/
Eigen::MatrixXd getInteractiveResultBlendedWithOriginal(float blend, SLIMData *slimData);
diff --git a/intern/slim/src/slim_c_interface.cpp b/intern/slim/src/slim_c_interface.cpp
index 61bc99e4738..6b91f141bdd 100644
--- a/intern/slim/src/slim_c_interface.cpp
+++ b/intern/slim/src/slim_c_interface.cpp
@@ -38,8 +38,7 @@
using namespace igl;
-/* AUREL THESIS
- Called from the native part during each iteration of interactive parametrisation.
+/* Called from the native part during each iteration of interactive parametrisation.
The blend parameter decides the linear blending between the original UV map and the one
optained from the accumulated SLIM iterations so far.
*/
@@ -50,8 +49,7 @@ void transfer_uvs_blended_C(matrix_transfer *mt, void* slimDataPtr, int uvChartI
transferUvsBackToNativePart(mt, blendedUvs, uvChartIndex);
}
-/* AUREL THESIS
- Setup call from the native C part. Necessary for interactive parametrisation.
+/* Setup call from the native C part. Necessary for interactive parametrisation.
*/
void* setup_slim_C(matrix_transfer *mt, int uvChartIndex, bool borderVerticesArePinned, bool skipInitialization){
igl::Timer timer;
@@ -60,8 +58,7 @@ void* setup_slim_C(matrix_transfer *mt, int uvChartIndex, bool borderVerticesAre
return slimData;
}
-/* AUREL THESIS
- Executes a single iteration of SLIM, to be called from the native part. It recasts the pointer to a SLIM object.
+/* Executes a single iteration of SLIM, to be called from the native part. It recasts the pointer to a SLIM object.
*/
void param_slim_single_iteration_C(void* slimDataPtr){
SLIMData* slimData = (SLIMData*) slimDataPtr;
diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h
index 49077b19be3..82f97b873e0 100644
--- a/source/blender/bmesh/bmesh_class.h
+++ b/source/blender/bmesh/bmesh_class.h
@@ -99,7 +99,7 @@ typedef struct BMVert {
* which is a bit of an abuse of internal bmesh data but also works OK for now (use with care!).
*/
struct BMEdge *e;
- /* AUREL */
+
int id;
} BMVert;
diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h
index e8dbb337cf4..032cf5e9148 100644
--- a/source/blender/editors/uvedit/uvedit_intern.h
+++ b/source/blender/editors/uvedit/uvedit_intern.h
@@ -75,7 +75,6 @@ void UV_OT_cube_project(struct wmOperatorType *ot);
void UV_OT_cylinder_project(struct wmOperatorType *ot);
void UV_OT_project_from_view(struct wmOperatorType *ot);
void UV_OT_minimize_stretch(struct wmOperatorType *ot);
-// AUREL SLIM interactive parameterization
void UV_OT_minimize_stretch_slim(struct wmOperatorType *ot);
void UV_OT_pack_islands(struct wmOperatorType *ot);
void UV_OT_reset(struct wmOperatorType *ot);
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 6cdce37ab03..1bf2557e28f 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -4265,7 +4265,6 @@ void ED_operatortypes_uvedit(void)
WM_operatortype_append(UV_OT_cylinder_project);
WM_operatortype_append(UV_OT_project_from_view);
WM_operatortype_append(UV_OT_minimize_stretch);
- // AUREL SLIM Interactive Parameterization
WM_operatortype_append(UV_OT_minimize_stretch_slim);
WM_operatortype_append(UV_OT_pack_islands);
WM_operatortype_append(UV_OT_reset);
@@ -4343,7 +4342,6 @@ void ED_keymap_uvedit(wmKeyConfig *keyconf)
/* unwrap */
WM_keymap_add_item(keymap, "UV_OT_unwrap", EKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "UV_OT_minimize_stretch", VKEY, KM_PRESS, KM_CTRL, 0);
- // AUREL SLIM Interactive Parameterization
WM_keymap_add_item(keymap, "UV_OT_minimize_stretch_slim", MKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "UV_OT_pack_islands", PKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "UV_OT_average_islands_scale", AKEY, KM_PRESS, KM_CTRL, 0);
diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c
index e8af44e32b0..21c4be1c8be 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.c
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.c
@@ -4351,8 +4351,8 @@ void param_construct_end(ParamHandle *handle, ParamBool fill, ParamBool impl)
void add_index_to_vertices(BMEditMesh *em){
- // AUREL THESIS iterate over bm edit mesh and set indices for weight retrieval,
- // This allows for later matching of vertices to weights.
+ // iterate over bm edit mesh and set indices for weight retrieval,
+ // This allows for later matching of vertices to weights.
BMVert *vert;
BMIter iter;
int i;
@@ -4813,8 +4813,7 @@ void param_flush_restore(ParamHandle *handle)
}
}
-/* AUREL THESIS
- 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.
*/
void allocate_memory_for_pointerarrays(matrix_transfer *mt, PHandle *phandle);
@@ -4841,7 +4840,7 @@ void transfer_data_to_slim(ParamHandle *handle){
convert_blender_slim(handle, false, phandle->weightMapIndex);
}
-/* AUREL THESIS: Conversion Function to build matrix for SLIM Parametrization */
+/* Conversion Function to build matrix for SLIM Parametrization */
void convert_blender_slim(ParamHandle *handle, bool selectionOnly, int weightMapIndex)
{
PHandle *phandle = (PHandle *)handle;
@@ -4888,8 +4887,7 @@ void convert_blender_slim(ParamHandle *handle, bool selectionOnly, int weightMap
};
-/* AUREL THESIS
- 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.
*/
void allocate_memory_for_pointerarrays(matrix_transfer *mt, PHandle *phandle){
mt->nCharts = phandle->ncharts;
@@ -4912,8 +4910,7 @@ void allocate_memory_for_pointerarrays(matrix_transfer *mt, PHandle *phandle){
mt->Wvectors = MEM_mallocN(mt->nCharts * sizeof(*mt->Wvectors), "Array of pointers to weight-per-face vectors");
}
-/* AUREL THESIS
- For one chart, allocate memory. If no accurate estimate (e.g. for number of pinned vertices) overestimate and
+/* For one chart, allocate memory. If no accurate estimate (e.g. for number of pinned vertices) overestimate and
correct later.
*/
void allocate_memory_for_matrices(const int chartNr, const PHandle *phandle, const matrix_transfer *mt){
@@ -4936,8 +4933,7 @@ void allocate_memory_for_matrices(const int chartNr, const PHandle *phandle, con
mt->ELvectors[chartNr] = MEM_mallocN(mt->nEdges[chartNr] * 2 * sizeof(**mt->ELvectors), " Edge-Length Vector");
}
-/* AUREL THESIS
- Get weights from the weight map for weighted parametrisation.
+/* Get weights from the weight map for weighted parametrisation.
*/
void create_weight_matrix(const PHandle *phandle,
float *tempW,
@@ -4955,7 +4951,7 @@ void create_weight_matrix(const PHandle *phandle,
}
}
-/* AUREL THESIS Transfer edges and edge lengths */
+/* Transfer edges and edge lengths */
void transfer_edges(const int chartNr, const PHandle *phandle, const matrix_transfer *mt){
PChart *chart = phandle->charts[chartNr];
@@ -4993,11 +4989,9 @@ void transfer_edges(const int chartNr, const PHandle *phandle, const matrix_tran
}
}
-/* AUREL THESIS Transfer vertices and pinned information */
+/* Transfer vertices and pinned information */
void transfer_vertices(const int chartNr, const PHandle *phandle, matrix_transfer *mt, float *tempW){
- /*AUREL GRUBER: Attempt to get weight paint colors end*/
-
PChart *chart = phandle->charts[chartNr];
PVert *v;
@@ -5062,7 +5056,7 @@ void transfer_vertices(const int chartNr, const PHandle *phandle, matrix_transfe
}
-/* AUREL THESIS Transfer boundary vertices */
+/* Transfer boundary vertices */
void transfer_boundary_vertices(const int chartNr, const PHandle *phandle, const matrix_transfer *mt, float *tempW){
PChart *chart = phandle->charts[chartNr];
@@ -5102,7 +5096,7 @@ void transfer_boundary_vertices(const int chartNr, const PHandle *phandle, const
} while (be != outer);
}
-/* AUREL THESIS Transfer faces */
+/* Transfer faces */
void transfer_faces(const int chartNr, const PHandle *phandle, const matrix_transfer *mt){
PChart *chart = phandle->charts[chartNr];
@@ -5133,8 +5127,7 @@ void transfer_faces(const int chartNr, const PHandle *phandle, const matrix_tran
}
};
-/* AUREL THESIS
- Set UV on each vertex after SLIM parametrization, for each chart.
+/* Set UV on each vertex after SLIM parametrization, for each chart.
*/
void set_uv_param_slim(ParamHandle *handle, matrix_transfer *mt){
PHandle *phandle = (PHandle*) handle;
@@ -5158,8 +5151,7 @@ void set_uv_param_slim(ParamHandle *handle, matrix_transfer *mt){
}
-/* AUREL THESIS
- Cleanup memory.
+/* Cleanup memory.
*/
void free_matrix_transfer(matrix_transfer *mt){
@@ -5221,8 +5213,7 @@ double norm(PVert *min, PVert *max){
return sqrt(x*x + y*y);
}
-/* AUREL THESIS
- Examines if any pins are present or not.
+/* Examines if any pins are
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list