TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Preserve "intangible" and "level" collide flags in bam2egg

Browse Source
This commit is contained in:
rdb 2016-10-20 11:02:19 +02:00
parent e2fe951322
commit ea82d9d664
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/ReleaseNotes
View File

@ -32,6 +32,7 @@ This issue fixes several bugs that were still found in 1.9.2.
* Fix RAM caching of 2D texture arrays * Fix RAM caching of 2D texture arrays
* Fix Ctrl+C interrupt propagation to runtime applications * Fix Ctrl+C interrupt propagation to runtime applications
* Support for InvSphere, Box and Tube solids in bam2egg * Support for InvSphere, Box and Tube solids in bam2egg
* Preserve "intangible" and "level" collide flags in bam2egg
* Add normalized() method to vectors * Add normalized() method to vectors
* asyncFlattenStrong with inPlace=True caused node to disappear * asyncFlattenStrong with inPlace=True caused node to disappear
* Fix asyncFlattenStrong called on nodes without parent * Fix asyncFlattenStrong called on nodes without parent

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

@ -449,8 +449,20 @@ convert_collision_node(CollisionNode *node, const WorkingNodePath &node_path,
// traverse solids // traverse solids
for (int i = 0; i < num_solids; i++) { for (int i = 0; i < num_solids; i++) {
CPT(CollisionSolid) child = node->get_solid(i); CPT(CollisionSolid) child = node->get_solid(i);
int flags = EggGroup::CF_descend;
if (!child->is_tangible()) {
flags |= EggGroup::CF_intangible;
}
if (child->has_effective_normal() &&
child->get_effective_normal() == LVector3::up()) {
flags |= EggGroup::CF_level;
}
if (child->is_of_type(CollisionPolygon::get_class_type())) { if (child->is_of_type(CollisionPolygon::get_class_type())) {
egg_group->set_cs_type(EggGroup::CST_polyset); egg_group->set_cs_type(EggGroup::CST_polyset);
egg_group->set_collide_flags(flags);
EggPolygon *egg_poly = new EggPolygon; EggPolygon *egg_poly = new EggPolygon;
egg_group->add_child(egg_poly); egg_group->add_child(egg_poly);
@ -476,7 +488,6 @@ convert_collision_node(CollisionNode *node, const WorkingNodePath &node_path,
egg_sphere = egg_group; egg_sphere = egg_group;
} else { } else {
egg_sphere = new EggGroup; egg_sphere = new EggGroup;
egg_sphere->set_collide_flags(EggGroup::CF_descend);
egg_group->add_child(egg_sphere); egg_group->add_child(egg_sphere);
} }
@ -485,6 +496,7 @@ convert_collision_node(CollisionNode *node, const WorkingNodePath &node_path,
} else { } else {
egg_sphere->set_cs_type(EggGroup::CST_sphere); egg_sphere->set_cs_type(EggGroup::CST_sphere);
} }
egg_sphere->set_collide_flags(flags);
EggVertex ev1, ev2; EggVertex ev1, ev2;
ev1.set_pos(LCAST(double, (center + offset) * net_mat)); ev1.set_pos(LCAST(double, (center + offset) * net_mat));
@ -518,10 +530,10 @@ convert_collision_node(CollisionNode *node, const WorkingNodePath &node_path,
egg_plane = egg_group; egg_plane = egg_group;
} else { } else {
egg_plane = new EggGroup; egg_plane = new EggGroup;
egg_plane->set_collide_flags(EggGroup::CF_descend);
egg_group->add_child(egg_plane); egg_group->add_child(egg_plane);
} }
egg_plane->set_cs_type(EggGroup::CST_plane); egg_plane->set_cs_type(EggGroup::CST_plane);
egg_plane->set_collide_flags(flags);
EggVertex ev0, ev1, ev2; EggVertex ev0, ev1, ev2;
ev0.set_pos(LCAST(double, origin * net_mat)); ev0.set_pos(LCAST(double, origin * net_mat));
@ -545,10 +557,10 @@ convert_collision_node(CollisionNode *node, const WorkingNodePath &node_path,
egg_box = egg_group; egg_box = egg_group;
} else { } else {
egg_box = new EggGroup; egg_box = new EggGroup;
egg_box->set_collide_flags(EggGroup::CF_descend);
egg_group->add_child(egg_box); egg_group->add_child(egg_box);
} }
egg_box->set_cs_type(EggGroup::CST_box); egg_box->set_cs_type(EggGroup::CST_box);
egg_box->set_collide_flags(flags);
// Just add the min and max points. // Just add the min and max points.
EggVertex ev0, ev1; EggVertex ev0, ev1;
@ -584,10 +596,10 @@ convert_collision_node(CollisionNode *node, const WorkingNodePath &node_path,
egg_tube = egg_group; egg_tube = egg_group;
} else { } else {
egg_tube = new EggGroup; egg_tube = new EggGroup;
egg_tube->set_collide_flags(EggGroup::CF_descend);
egg_group->add_child(egg_tube); egg_group->add_child(egg_tube);
} }
egg_tube->set_cs_type(EggGroup::CST_tube); egg_tube->set_cs_type(EggGroup::CST_tube);
egg_tube->set_collide_flags(flags);
// Add two points for the endcaps, and then two points around the // Add two points for the endcaps, and then two points around the
// centroid to indicate the radius. // centroid to indicate the radius.