From 1efa50984fe94dd2e6552ff7ebde48c79d5add7b Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 11 Jun 2004 22:25:07 +0000 Subject: [PATCH] add sequencing numbers --- direct/src/configfiles/Sources.pp | 4 +++- direct/src/configfiles/_direct.prc | 10 ---------- direct/src/configfiles/_direct.prc.pp | 24 ++++++++++++++++++++++++ panda/src/configfiles/Sources.pp | 2 +- panda/src/configfiles/_panda.prc.pp | 4 ++-- 5 files changed, 30 insertions(+), 14 deletions(-) delete mode 100644 direct/src/configfiles/_direct.prc create mode 100644 direct/src/configfiles/_direct.prc.pp diff --git a/direct/src/configfiles/Sources.pp b/direct/src/configfiles/Sources.pp index f6816d80f2..6131857db6 100644 --- a/direct/src/configfiles/Sources.pp +++ b/direct/src/configfiles/Sources.pp @@ -1,8 +1,10 @@ #define INSTALL_CONFIG \ - _direct.prc + _70_direct.prc #if $[CTPROJS] // These files only matter to ctattach users. #define INSTALL_CONFIG $[INSTALL_CONFIG] direct.init #endif + +#include $[THISDIRPREFIX]_direct.prc.pp diff --git a/direct/src/configfiles/_direct.prc b/direct/src/configfiles/_direct.prc deleted file mode 100644 index 09f8059866..0000000000 --- a/direct/src/configfiles/_direct.prc +++ /dev/null @@ -1,10 +0,0 @@ -model-path $DMODELS -sound-path $DMODELS - -# Define a new egg object type. See the comments in _panda.prc about this. - -egg-object-type-direct-widget collide-mask { 0x80000000 } { Polyset descend } - -# Define a new cull bin that will render on top of everything else. - -cull-bin gui-popup 60 unsorted diff --git a/direct/src/configfiles/_direct.prc.pp b/direct/src/configfiles/_direct.prc.pp new file mode 100644 index 0000000000..615a596bd7 --- /dev/null +++ b/direct/src/configfiles/_direct.prc.pp @@ -0,0 +1,24 @@ +// +// _direct.prc.pp +// +// This file defines the script to auto-generate _direct.prc at +// ppremake time. This is intended to fill in some of the default +// parameters, in particular the default display types. +// + +#output _70_direct.prc +#### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE]. +################################# DO NOT EDIT ########################### + +model-path $DMODELS +sound-path $DMODELS + +# Define a new egg object type. See the comments in _panda.prc about this. + +egg-object-type-direct-widget collide-mask { 0x80000000 } { Polyset descend } + +# Define a new cull bin that will render on top of everything else. + +cull-bin gui-popup 60 unsorted + +#end _70_direct.prc diff --git a/panda/src/configfiles/Sources.pp b/panda/src/configfiles/Sources.pp index 44326a6d2c..ee80aa9164 100644 --- a/panda/src/configfiles/Sources.pp +++ b/panda/src/configfiles/Sources.pp @@ -1,6 +1,6 @@ #define INSTALL_CONFIG \ - panda.emacs panda.emacs.Xdefaults _panda.prc + panda.emacs panda.emacs.Xdefaults _80_panda.prc #if $[CTPROJS] diff --git a/panda/src/configfiles/_panda.prc.pp b/panda/src/configfiles/_panda.prc.pp index 151e1e0626..d9f5673576 100644 --- a/panda/src/configfiles/_panda.prc.pp +++ b/panda/src/configfiles/_panda.prc.pp @@ -6,7 +6,7 @@ // parameters, in particular the default display types. // -#output _panda.prc +#output _80_panda.prc #### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE]. ################################# DO NOT EDIT ########################### @@ -57,4 +57,4 @@ load-file-type egg pandaegg egg-object-type-portal portal { 1 } egg-object-type-polylight polylight { 1 } -#end _panda.prc +#end _80_panda.prc