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

gobj: performance improvement for CPU animation

Browse Source 
In particular it seems that decomposition is slow, so the code to handle the transformation of the normal column now tries harder to avoid it, especially in the case of a scale of 1.

Also see #222
This commit is contained in:
rdb 2018-01-08 21:26:43 +01:00
parent 5831a31509
commit ba9ea065e4
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1836,17 +1836,21 @@ do_transform_vector_column(const GeomVertexFormat *format, GeomVertexRewriter &d
bool normalize = false; bool normalize = false;
if (data_column->get_contents() == C_normal) { if (data_column->get_contents() == C_normal) {
// This is to preserve perpendicularity to the surface. // This is to preserve perpendicularity to the surface.
LVecBase3 scale_sq(mat.get_row3(0).length_squared(),
mat.get_row3(1).length_squared(),
mat.get_row3(2).length_squared());
if (IS_THRESHOLD_EQUAL(scale_sq[0], scale_sq[1], 2.0e-3f) &&
IS_THRESHOLD_EQUAL(scale_sq[0], scale_sq[2], 2.0e-3f)) {
// There is a uniform scale.
LVecBase3 scale, shear, hpr; LVecBase3 scale, shear, hpr;
if (decompose_matrix(mat.get_upper_3(), scale, shear, hpr) && if (IS_THRESHOLD_EQUAL(scale_sq[0], 1, 2.0e-3f)) {
IS_NEARLY_EQUAL(scale[0], scale[1]) &&
IS_NEARLY_EQUAL(scale[0], scale[2])) {
if (scale[0] == 1) {
// No scale to worry about. // No scale to worry about.
xform = mat; xform = mat;
} else { } else if (decompose_matrix(mat.get_upper_3(), scale, shear, hpr)) {
// Simply take the uniform scale out of the transformation. Not sure // Make a new matrix with scale/translate taken out of the equation.
// if it might be better to just normalize?
compose_matrix(xform, LVecBase3(1, 1, 1), shear, hpr, LVecBase3::zero()); compose_matrix(xform, LVecBase3(1, 1, 1), shear, hpr, LVecBase3::zero());
} else {
normalize = true;
} }
} else { } else {
// There is a non-uniform scale, so we need to do all this to preserve // There is a non-uniform scale, so we need to do all this to preserve