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

fix sphere-trigger

Browse Source
This commit is contained in:
David Rose 2003-11-13 06:11:43 +00:00
parent ac8bb40c69
commit e27ed62d8b
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/egg/parser.yxx
View File

@ -1054,9 +1054,17 @@ cs_type:
EggGroup::CollisionSolidType f = EggGroup::string_cs_type(strval); EggGroup::CollisionSolidType f = EggGroup::string_cs_type(strval);
if (f == EggGroup::CST_none) { if (f == EggGroup::CST_none) {
eggyywarning("Unknown collision solid type " + strval); eggyywarning("Unknown collision solid type " + strval);
} else {
if (f == EggGroup::CST_polyset && group->get_cs_type() != EggGroup::CST_none) {
// By convention, a CST_polyset doesn't replace any existing
// contradictory type, so ignore it if this happens. This
// allows the artist to place, for instance, <ObjectType> {
// sphere } and <ObjectType> { trigger } together.
} else { } else {
group->set_cs_type(f); group->set_cs_type(f);
} }
}
} }
; ;