TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

gobj: fix assert when enabling hw anim if blend has 5+ transforms

Browse Source 
Instead, we reduce the TransformBlend down to the 4 most-weighted joints.
This commit is contained in:
rdb 2018-10-15 22:07:32 +02:00
parent 6e370ebbdd
commit 0131d1013b
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
panda/src/gobj/geomVertexData.cxx
View File

@ -621,13 +621,26 @@ copy_from(const GeomVertexData *source, bool keep_data_objects,
const TransformBlend &blend = blend_table->get_blend(from.get_data1i()); const TransformBlend &blend = blend_table->get_blend(from.get_data1i());
LVecBase4 weights = LVecBase4::zero(); LVecBase4 weights = LVecBase4::zero();
LVecBase4i indices(0, 0, 0, 0); LVecBase4i indices(0, 0, 0, 0);
nassertv(blend.get_num_transforms() <= 4);
for (size_t i = 0; i < blend.get_num_transforms(); i++) { if (blend.get_num_transforms() <= 4) {
weights[i] = blend.get_weight(i); for (size_t i = 0; i < blend.get_num_transforms(); i++) {
indices[i] = add_transform(transform_table, blend.get_transform(i), weights[i] = blend.get_weight(i);
already_added); indices[i] = add_transform(transform_table, blend.get_transform(i),
already_added);
}
} else {
// Limit the number of blends to the four with highest weights.
TransformBlend blend2(blend);
blend2.limit_transforms(4);
blend2.normalize_weights();
for (size_t i = 0; i < 4; i++) {
weights[i] = blend2.get_weight(i);
indices[i] = add_transform(transform_table, blend2.get_transform(i),
already_added);
}
} }
if (weight.has_column()) { if (weight.has_column()) {
weight.set_data4(weights); weight.set_data4(weights);
} }