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

Use range_for for polyobj_find_min_max

Browse source
This commit is contained in:
Kp 2016-06-25 23:21:36 +00:00
parent 89ddc1b911
commit a3e65f64ea
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
similar/main/polyobj.cpp
View file

@ -608,8 +608,6 @@ static void assign_minmax(vms_vector &minv, vms_vector &maxv, const vms_vector &
static void polyobj_find_min_max(polymodel *pm)
{
ushort nverts;
ushort *data,type;
auto &big_mn = pm->mins;
auto &big_mx = pm->maxs;
for (int m=0;m<pm->n_models;m++) {
@ -617,13 +615,13 @@ static void polyobj_find_min_max(polymodel *pm)
auto &mx = pm->submodel_maxs[m];
const auto &ofs = pm->submodel_offsets[m];
data = (uint16_t *)&pm->model_data[pm->submodel_ptrs[m]];
auto data = reinterpret_cast<const uint16_t *>(&pm->model_data[pm->submodel_ptrs[m]]);
type = *data++;
const auto type = *data++;
Assert(type == 7 || type == 1);
nverts = *data++;
const uint16_t nverts = *data++ - 1;
if (type==7)
data+=2; //skip start & pad
@ -631,15 +629,14 @@ static void polyobj_find_min_max(polymodel *pm)
auto vp = reinterpret_cast<const vms_vector *>(data);
mn = mx = *vp++;
nverts--;
if (m==0)
big_mn = big_mx = mn;
while (nverts--) {
assign_minmax(mn, mx, *vp);
assign_minmax(big_mn, big_mx, vm_vec_add(*vp, ofs));
vp++;
range_for (auto &v, unchecked_partial_range(vp, nverts))
{
assign_minmax(mn, mx, v);
assign_minmax(big_mn, big_mx, vm_vec_add(v, ofs));
}
}
}