From 3d9d9bfc95e41ee6a8905ecf04479c5573c7f046 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 27 Feb 2015 19:59:54 +0100 Subject: [PATCH] Deprecate use of without specifying "descend" flag --- panda/src/doc/eggSyntax.txt | 11 ++++++++--- panda/src/egg2pg/eggLoader.cxx | 4 ++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/panda/src/doc/eggSyntax.txt b/panda/src/doc/eggSyntax.txt index 7cbf1b228f..4b57d91192 100644 --- a/panda/src/doc/eggSyntax.txt +++ b/panda/src/doc/eggSyntax.txt @@ -1476,6 +1476,10 @@ GROUPING ENTRIES its geometry is used to define the extent of the collision surface (unless the "descend" flag is given; see below). + It is now deprecated to use without "descend"; it will + become the default soon. You should always specify it for best + compatibility. + Valid types so far are: Plane @@ -1538,11 +1542,12 @@ GROUPING ENTRIES descend - Instead of creating only one collision object of the given type, - each group descended from this node that contains geometry will + Each group descended from this node that contains geometry will define a new collision object of the given type. The event name, if any, will also be inherited from the top node and - shared among all the collision objects. + shared among all the collision objects. This option will soon + be the default; it is suggested that it is always specified for + most compatibility. keep diff --git a/panda/src/egg2pg/eggLoader.cxx b/panda/src/egg2pg/eggLoader.cxx index ae3be83199..40ca88b6e7 100644 --- a/panda/src/egg2pg/eggLoader.cxx +++ b/panda/src/egg2pg/eggLoader.cxx @@ -2970,6 +2970,10 @@ make_collision_solids(EggGroup *start_group, EggGroup *egg_group, make_collision_solids(start_group, DCAST(EggGroup, *ci), cnode); } } + } else { + egg2pg_cat.warning() + << "Using without 'descend' is deprecated. 'descend' " + << "will become the default in a future version of Panda3D.\n"; } }