TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass array<> to remap_side_uvs

Browse source
This commit is contained in:
Kp 2015-02-27 03:30:33 +00:00
parent c3b09da175
commit 4871b17c8f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
similar/editor/segment.cpp
View file

@ -1199,13 +1199,13 @@ static int get_index_of_best_fit(const vcsegptr_t seg1, int side1, const vcsegpt
// ----------------------------------------------------------------------------
// Remap uv coordinates in all sides in segment *sp which have a vertex in vp[4].
// vp contains absolute vertex indices.
static void remap_side_uvs(const vsegptridx_t sp,int *vp)
static void remap_side_uvs(const vsegptridx_t sp, const array<int, 4> &vp)
{
int s;
for (s=0; s<MAX_SIDES_PER_SEGMENT; s++) {
range_for (auto &v, Side_to_verts[s])
range_for (auto &i, unchecked_partial_range(vp, 4u)) // scan each vertex in vp[4]
range_for (auto &i, vp) // scan each vertex in vp[4]
if (v == i) {
assign_default_uvs_to_side(sp,s); // Side s needs to be remapped
goto next_side;
@ -1226,7 +1226,8 @@ next_side: ;
int med_form_joint(const vsegptridx_t seg1, int side1, const vsegptridx_t seg2, int side2)
{
int bfi,v,s1;
int lost_vertices[4],remap_vertices[4];
int lost_vertices[4];
array<int, 4> remap_vertices;
int validation_list[MAX_VALIDATIONS];
uint_fast32_t nv;