diff options
author | Hans Goudey <h.goudey@me.com> | 2021-07-30 22:08:43 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-07-30 22:08:43 +0300 |
commit | 35894dc700e035da914fb8457ef62706c5835391 (patch) | |
tree | 13ac3b85bb2216ee425fd40c5702517942127b1c /intern/quadriflow | |
parent | 54bd5efa6881dbc59f732a17593f4cf03037f9a0 (diff) |
Cleanup: Simplify logic, follow style guide for integer types
- Use `int` instead of `unsigned int` for mesh indices
- Use C++ types (Array, float3, IndexRange)
- Use range based for loops
Diffstat (limited to 'intern/quadriflow')
-rw-r--r-- | intern/quadriflow/quadriflow_capi.cpp | 10 | ||||
-rw-r--r-- | intern/quadriflow/quadriflow_capi.hpp | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/intern/quadriflow/quadriflow_capi.cpp b/intern/quadriflow/quadriflow_capi.cpp index 53237289874..086d5f7d296 100644 --- a/intern/quadriflow/quadriflow_capi.cpp +++ b/intern/quadriflow/quadriflow_capi.cpp @@ -20,12 +20,12 @@ #include "MEM_guardedalloc.h" -#include "quadriflow_capi.hpp" #include "config.hpp" #include "field-math.hpp" +#include "loader.hpp" #include "optimizer.hpp" #include "parametrizer.hpp" -#include "loader.hpp" +#include "quadriflow_capi.hpp" using namespace qflow; @@ -217,10 +217,8 @@ void QFLOW_quadriflow_remesh(QuadriflowRemeshData *qrd, qrd->out_totverts = field.O_compact.size(); qrd->out_totfaces = field.F_compact.size(); - qrd->out_verts = (float *)MEM_malloc_arrayN( - qrd->out_totverts, 3 * sizeof(float), "quadriflow remesher out verts"); - qrd->out_faces = (unsigned int *)MEM_malloc_arrayN( - qrd->out_totfaces, 4 * sizeof(unsigned int), "quadriflow remesh out quads"); + qrd->out_verts = (float *)MEM_malloc_arrayN(qrd->out_totverts, sizeof(float[3]), __func__); + qrd->out_faces = (int *)MEM_malloc_arrayN(qrd->out_totfaces, sizeof(int[4]), __func__); for (int i = 0; i < qrd->out_totverts; i++) { auto t = field.O_compact[i] * field.normalize_scale + field.normalize_offset; diff --git a/intern/quadriflow/quadriflow_capi.hpp b/intern/quadriflow/quadriflow_capi.hpp index c31fd6eff95..59af2826e15 100644 --- a/intern/quadriflow/quadriflow_capi.hpp +++ b/intern/quadriflow/quadriflow_capi.hpp @@ -25,12 +25,12 @@ extern "C" { typedef struct QuadriflowRemeshData { float *verts; - unsigned int *faces; + int *faces; int totfaces; int totverts; float *out_verts; - unsigned int *out_faces; + int *out_faces; int out_totverts; int out_totfaces; |