TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 07:48:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

egg2pg: Add support for texture matrices to bam2egg

Browse Source
This commit is contained in:
rdb 2022-01-10 13:22:57 +01:00
parent 992cbb0840
commit 6fe21fd8bd
1 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
panda/src/egg2pg/eggSaver.cxx
View File

@ -800,6 +800,9 @@ convert_primitive(const GeomVertexData *vertex_data,
// Check for a texture. // Check for a texture.
const TextureAttrib *ta; const TextureAttrib *ta;
if (net_state->get_attrib(ta)) { if (net_state->get_attrib(ta)) {
const TexMatrixAttrib *tma = nullptr;
net_state->get_attrib(tma);
for (size_t i = 0; i < ta->get_num_on_stages(); ++i) { for (size_t i = 0; i < ta->get_num_on_stages(); ++i) {
TextureStage *tex_stage = ta->get_on_stage(i); TextureStage *tex_stage = ta->get_on_stage(i);
@ -867,6 +870,45 @@ convert_primitive(const GeomVertexData *vertex_data,
egg_tex->set_uv_name(name->get_basename()); egg_tex->set_uv_name(name->get_basename());
} }
if (tma != nullptr && tma->has_stage(tex_stage)) {
CPT(TransformState) transform = tma->get_transform(tex_stage);
if (!transform->is_identity()) {
if (transform->has_components()) {
// If the transform can be represented componentwise, we prefer storing
// it that way in the egg file.
const LVecBase3 &scale = transform->get_scale();
const LQuaternion &quat = transform->get_quat();
const LVecBase3 &pos = transform->get_pos();
if (!scale.almost_equal(LVecBase3(1.0f, 1.0f, 1.0f))) {
if (transform->is_2d()) {
egg_tex->add_scale2d(LVecBase2d(scale[0], scale[1]));
} else {
egg_tex->add_scale3d(LCAST(double, scale));
}
}
if (!quat.is_identity()) {
if (transform->is_2d()) {
egg_tex->add_rotate2d(transform->get_rotate2d());
} else {
egg_tex->add_rotate3d(LCAST(double, quat));
}
}
if (!pos.almost_equal(LVecBase3::zero())) {
if (transform->is_2d()) {
egg_tex->add_translate2d(LVector2d(pos[0], pos[1]));
} else {
egg_tex->add_translate3d(LCAST(double, pos));
}
}
}
else if (transform->has_mat()) {
// Otherwise, we store the raw matrix.
const LMatrix4 &mat = transform->get_mat();
egg_tex->set_transform3d(LCAST(double, mat));
}
}
}
egg_prim->add_texture(egg_tex); egg_prim->add_texture(egg_tex);
} }
} }