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

Made vertices transformed properly

Browse Source
This commit is contained in:
Gyedo Jeon 2010-06-11 00:59:15 +00:00
parent 547b3abea9
commit 1edd26540b
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandatool/src/bam/bamToEgg.cxx
View File

@ -484,6 +484,12 @@ convert_collision_node(CollisionNode *node, const WorkingNodePath &node_path,
egg_group->set_cs_type(EggGroup::CST_polyset);
egg_group->set_collide_flags(EggGroup::CF_descend);
NodePath np = node_path.get_node_path();
CPT(TransformState) net_transform = np.get_net_transform();
LMatrix4f net_mat = net_transform->get_mat();
LMatrix4f inv = LCAST(float, egg_parent->get_vertex_frame_inv());
net_mat = net_mat * inv;
int num_solids = node->get_num_solids();
if (num_solids > 0) {
@ -502,8 +508,8 @@ convert_collision_node(CollisionNode *node, const WorkingNodePath &node_path,
int num_points = poly->get_num_points();
for (int j = 0; j < num_points; j++) {
EggVertex egg_vert;
egg_vert.set_pos(LCAST(double, poly->get_point(j)));
egg_vert.set_normal(LCAST(double, poly->get_normal()));
egg_vert.set_pos(LCAST(double, poly->get_point(j) * net_mat));
egg_vert.set_normal(LCAST(double, poly->get_normal() * net_mat));
EggVertex *new_egg_vert = cvpool->create_unique_vertex(egg_vert);
egg_poly->add_vertex(new_egg_vert);

7
pandatool/src/mayaegg/mayaEggLoader.cxx
View File

@ -748,9 +748,12 @@ int MayaEggGeom::GetVert(EggVertex *vert, EggGroup *context)
{
MayaEggVertex vtx;
vtx._sumWeights = 0.0;
vtx._pos = vert->get_pos3();
const LMatrix4d &xform = context->get_vertex_to_node();
vtx._pos = vert->get_pos3() * xform;
if (vert->has_normal()) {
vtx._normal = vert->get_normal();
vtx._normal = vert->get_normal() * xform;
}
if (vert->has_uv()) {
vtx._uv = vert->get_uv();