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

use new 3d-aware egg constructs

Browse Source
This commit is contained in:
David Rose 2005-07-20 23:05:06 +00:00
parent 3975c45b2b
commit f3e3f6d1be
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandatool/src/mayaegg/mayaToEggConverter.cxx
View File

@ -985,7 +985,7 @@ get_transform(MayaNodeDesc *node_desc, const MDagPath &dag_path,
// it. // it.
m4d = m4d * egg_group->get_node_frame_inv(); m4d = m4d * egg_group->get_node_frame_inv();
if (!m4d.almost_equal(LMatrix4d::ident_mat(), 0.0001)) { if (!m4d.almost_equal(LMatrix4d::ident_mat(), 0.0001)) {
egg_group->add_matrix(m4d); egg_group->add_matrix4(m4d);
} }
return; return;
} }
@ -2043,7 +2043,7 @@ make_locator(const MDagPath &dag_path, const MFnDagNode &dag_node,
// Now convert the locator point into the group's space. // Now convert the locator point into the group's space.
p3d = p3d * egg_group->get_node_frame_inv(); p3d = p3d * egg_group->get_node_frame_inv();
egg_group->add_translate(p3d); egg_group->add_translate3d(p3d);
} }
@ -2465,8 +2465,12 @@ compare_texture_properties(EggTexture &tex,
okflag = false; okflag = false;
} }
LMatrix3d mat = color_def.compute_texture_matrix(); LMatrix3d m = color_def.compute_texture_matrix();
if (!mat.almost_equal(tex.get_transform())) { LMatrix4d mat4(m(0, 0), m(0, 1), 0.0, m(0, 2),
m(1, 0), m(1, 1), 0.0, m(1, 2),
0.0, 0.0, 1.0, 0.0,
m(2, 0), m(2, 1), 0.0, m(2, 2));
if (!mat4.almost_equal(tex.get_transform())) {
okflag = false; okflag = false;
} }