[Bf-blender-cvs] [c603ba9e7c0] uv_unwrapping_slim_algorithm: UV Unwrapping SLIM: renaming slim_c_interface to slim_capi and renaming contained functions

Aurel Gruber noreply at git.blender.org
Tue Mar 14 09:43:23 CET 2017


Commit: c603ba9e7c0f76fd300132c2b9d7ebce0d3a52fa
Author: Aurel Gruber
Date:   Thu Mar 9 17:04:58 2017 +0100
Branches: uv_unwrapping_slim_algorithm
https://developer.blender.org/rBc603ba9e7c0f76fd300132c2b9d7ebce0d3a52fa

UV Unwrapping SLIM: renaming slim_c_interface to slim_capi and renaming contained functions

===================================================================

M	intern/slim/CMakeLists.txt
R082	intern/slim/intern/slim_c_interface.cpp	intern/slim/intern/slim_capi.cpp
R067	intern/slim/slim_c_interface.h	intern/slim/slim_capi.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/CMakeLists.txt b/intern/slim/CMakeLists.txt
index 0b25182b145..0cb66132c6c 100644
--- a/intern/slim/CMakeLists.txt
+++ b/intern/slim/CMakeLists.txt
@@ -17,7 +17,7 @@ set(SRC
   slim.h
   slim_parametrizer.h
   uv_initializer.h
-  slim_c_interface.h
+  slim_capi.h
   area_compensation.h
   least_squares_relocator.h
   geometry_data_retrieval.h
@@ -25,7 +25,7 @@ set(SRC
   intern/slim.cpp
   intern/slim_parametrizer.cpp
   intern/uv_initializer.cpp
-  intern/slim_c_interface.cpp
+  intern/slim_capi.cpp
   intern/area_compensation.cpp
   intern/least_squares_relocator.cpp
   intern/geometry_data_retrieval.cpp
diff --git a/intern/slim/intern/slim_c_interface.cpp b/intern/slim/intern/slim_capi.cpp
similarity index 82%
rename from intern/slim/intern/slim_c_interface.cpp
rename to intern/slim/intern/slim_capi.cpp
index 349c290690a..7f42879b9b2 100644
--- a/intern/slim/intern/slim_c_interface.cpp
+++ b/intern/slim/intern/slim_capi.cpp
@@ -27,7 +27,7 @@
 
 #include <Eigen/Dense>
 
-#include "slim_c_interface.h"
+#include "slim_capi.h"
 #include "slim_parametrizer.h"
 #include "slim.h"
 
@@ -42,7 +42,7 @@ using namespace igl;
 	The blend parameter decides the linear blending between the original UV map and the one
 	optained from the accumulated SLIM iterations so far.
  */
-void transfer_uvs_blended_C(SLIMMatrixTransfer *mt, void* slim_data_ptr, int uv_chart_index, float blend){
+void SLIM_transfer_uvs_blended(SLIMMatrixTransfer *mt, void* slim_data_ptr, int uv_chart_index, float blend){
 	SLIMData* slim_data = (SLIMData*) slim_data_ptr;
 	Eigen::MatrixXd blended_uvs = getInteractiveResultBlendedWithOriginal(blend, slim_data);
 	areacomp::correctMapSurfaceAreaIfNecessary(slim_data);
@@ -51,7 +51,7 @@ void transfer_uvs_blended_C(SLIMMatrixTransfer *mt, void* slim_data_ptr, int uv_
 
 /*	Setup call from the native C part. Necessary for interactive parametrisation.
  */
-void* setup_slim_C(SLIMMatrixTransfer *mt, int uv_chart_index, bool are_border_vertices_pinned, bool skip_initialization){
+void* SLIM_setup(SLIMMatrixTransfer *mt, int uv_chart_index, bool are_border_vertices_pinned, bool skip_initialization){
 	igl::Timer timer;
 	timer.start();
 	SLIMData* slim_data = setup_slim(mt, 0, uv_chart_index, timer, are_border_vertices_pinned, skip_initialization);
@@ -60,15 +60,15 @@ void* setup_slim_C(SLIMMatrixTransfer *mt, int uv_chart_index, bool are_border_v
 
 /*	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* slim_data_ptr){
+void SLIM_parametrize_single_iteration(void* slim_data_ptr){
 	SLIMData* slim_data = (SLIMData*) slim_data_ptr;
 	param_slim_single_iteration(slim_data);
 }
 
-void param_slim_C(SLIMMatrixTransfer *mt, int n_iterations, bool are_border_vertices_pinned, bool skip_initialization){
+void SLIM_parametrize(SLIMMatrixTransfer *mt, int n_iterations, bool are_border_vertices_pinned, bool skip_initialization){
 	param_slim(mt, n_iterations, are_border_vertices_pinned, skip_initialization);
 }
 
-void free_slim_data_C(void* slim_data_ptr){
+void SLIM_free_data(void* slim_data_ptr){
 	free_slim_data((SLIMData*) slim_data_ptr);
 }
diff --git a/intern/slim/slim_c_interface.h b/intern/slim/slim_capi.h
similarity index 67%
rename from intern/slim/slim_c_interface.h
rename to intern/slim/slim_capi.h
index 7e9dea63d91..036a67eae49 100644
--- a/intern/slim/slim_c_interface.h
+++ b/intern/slim/slim_capi.h
@@ -25,8 +25,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef slim_c_interface_h
-#define slim_c_interface_h
+#ifndef slim_capi_h
+#define slim_capi_h
 
 #include "slim_matrix_transfer.h"
 
@@ -34,14 +34,14 @@
 extern "C" {
 #endif
 
-void param_slim_C(SLIMMatrixTransfer *mt, int n_iterations, bool are_border_vertices_pinned, bool skip_initialization);
-void transfer_uvs_blended_C(SLIMMatrixTransfer *mt, void *slim, int uv_chart_index, float blend);
-void param_slim_single_iteration_C(void *slim);
-void* setup_slim_C(SLIMMatrixTransfer *mt, int uv_chart_index, bool are_border_vertices_pinned, bool skip_initialization);
-void free_slim_data_C(void* slim_data_ptr);
+void SLIM_parametrize(SLIMMatrixTransfer *mt, int n_iterations, bool are_border_vertices_pinned, bool skip_initialization);
+void SLIM_transfer_uvs_blended(SLIMMatrixTransfer *mt, void *slim, int uv_chart_index, float blend);
+void SLIM_parametrize_single_iteration(void *slim);
+void* SLIM_setup(SLIMMatrixTransfer *mt, int uv_chart_index, bool are_border_vertices_pinned, bool skip_initialization);
+void SLIM_free_data(void* slim_data_ptr);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* slim_C_interface_hpp */
+#endif /* slim_capi_h */
diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c
index 419d85753a1..4133788aa2b 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.c
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.c
@@ -4428,7 +4428,7 @@ void param_slim_solve(ParamHandle *handle)
 {
 	PHandle *phandle = (PHandle *) handle;
 	SLIMMatrixTransfer *mt = phandle->mt;
-	param_slim_C(mt, phandle->n_iterations, mt->fixed_boundary, phandle->skip_initialization);
+	SLIM_parametrize(mt, phandle->n_iterations, mt->fixed_boundary, phandle->skip_initialization);
 }
 
 void param_slim_end(ParamHandle *handle)
diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.h b/source/blender/editors/uvedit/uvedit_parametrizer.h
index 8fdd14a8c53..9cb7d57ee54 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.h
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.h
@@ -41,7 +41,7 @@ extern "C" {
 #include "BLI_sys_types.h" // for intptr_t support
 
 #include "slim_matrix_transfer.h" // for SLIM
-#include "slim_c_interface.h"
+#include "slim_capi.h"
 
 typedef void ParamHandle;	/* handle to a set of charts */
 typedef intptr_t ParamKey;		/* (hash) key for identifying verts and faces */
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index 422f6419f0f..70e8a1fb00f 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -83,7 +83,7 @@
 #include "uvedit_parametrizer.h"
 
 #include "slim_matrix_transfer.h"
-#include "slim_c_interface.h"
+#include "slim_capi.h"
 
 static void modifier_unwrap_state(Object *obedit, Scene *scene, bool *r_use_subsurf)
 {
@@ -591,7 +591,7 @@ static bool minimize_stretch_init(bContext *C, wmOperator *op)
 	mss->slimPtrs = MEM_callocN(mss->mt->n_charts * sizeof(void*), "pointers to Slim-objects");
 
 	for (int chartNr = 0; chartNr < mss->mt->n_charts; chartNr++) {
-		mss->slimPtrs[chartNr] = setup_slim_C(mss->mt, chartNr, mss->fixBorder, true);
+		mss->slimPtrs[chartNr] = SLIM_setup(mss->mt, chartNr, mss->fixBorder, true);
 	}
 
 	op->customdata = mss;
@@ -614,8 +614,8 @@ static void minimize_stretch_iteration(bContext *C, wmOperator *op, bool interac
 	// Do one iteration and tranfer UVs
 	for (int chartNr = 0; chartNr < mss->mt->n_charts; chartNr++) {
 		void *slimPtr = mss->slimPtrs[chartNr];
-		param_slim_single_iteration_C(slimPtr);
-		transfer_uvs_blended_C(mss->mt, slimPtr, chartNr, mss->blend);
+		SLIM_parametrize_single_iteration(slimPtr);
+		SLIM_transfer_uvs_blended(mss->mt, slimPtr, chartNr, mss->blend);
 	}
 
 	//	Assign new UVs back to each vertex
@@ -634,7 +634,7 @@ static void minimize_stretch_iteration(bContext *C, wmOperator *op, bool interac
 
 void free_slimPtrs(void **slimPtrs, int n_charts) {
 	for (int i = 0; i<n_charts; i++) {
-		free_slim_data_C(slimPtrs[i]);
+		SLIM_free_data(slimPtrs[i]);
 	}
 }
 
@@ -654,7 +654,7 @@ static void minimize_stretch_exit(bContext *C, wmOperator *op, bool cancel)
 
 	for (int chartNr = 0; chartNr < mss->mt->n_charts; chartNr++) {
 		void *slimPtr = mss->slimPtrs[chartNr];
-		transfer_uvs_blended_C(mss->mt, slimPtr, chartNr, mss->blend);
+		SLIM_transfer_uvs_blended(mss->mt, slimPtr, chartNr, mss->blend);
 	}
 
 	set_uv_param_slim(mss->handle, mss->mt);




More information about the Bf-blender-cvs mailing list