From 1c28973cb4fe0861eaea9dd8e4e04e36000a1574 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 14 Sep 2009 13:41:57 +0000 Subject: [PATCH] "models" directory should also be generated without pandatool --- makepanda/makepanda.py | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 95c64f5762..9867e5cc4d 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -4053,32 +4053,30 @@ if (RUNTIME): # Generate the models directory and samples directory # -if (PkgSkip("PANDATOOL")==0): +for model in GetDirectoryContents("dmodels/src/misc", ["*.egg", "*.flt"]): + eggpz = model[:-4] + ".egg.pz" + TargetAdd(GetOutputDir()+"/models/misc/"+eggpz, input="dmodels/src/misc/"+model) - for model in GetDirectoryContents("dmodels/src/misc", ["*.egg", "*.flt"]): - eggpz = model[:-4] + ".egg.pz" - TargetAdd(GetOutputDir()+"/models/misc/"+eggpz, input="dmodels/src/misc/"+model) +for model in GetDirectoryContents("dmodels/src/gui", ["*.egg", "*.flt"]): + eggpz = model[:-4] + ".egg.pz" + TargetAdd(GetOutputDir()+"/models/gui/"+eggpz, input="dmodels/src/gui/"+model) - for model in GetDirectoryContents("dmodels/src/gui", ["*.egg", "*.flt"]): - eggpz = model[:-4] + ".egg.pz" - TargetAdd(GetOutputDir()+"/models/gui/"+eggpz, input="dmodels/src/gui/"+model) +for model in GetDirectoryContents("models", ["*.egg", "*.flt"]): + eggpz = model[:-4] + ".egg.pz" + TargetAdd(GetOutputDir()+"/models/"+eggpz, input="models/"+model) - for model in GetDirectoryContents("models", ["*.egg", "*.flt"]): - eggpz = model[:-4] + ".egg.pz" - TargetAdd(GetOutputDir()+"/models/"+eggpz, input="models/"+model) +CopyAllFiles(GetOutputDir()+"/models/audio/sfx/", "dmodels/src/audio/sfx/", ".wav") +CopyAllFiles(GetOutputDir()+"/models/icons/", "dmodels/src/icons/", ".gif") - CopyAllFiles(GetOutputDir()+"/models/audio/sfx/", "dmodels/src/audio/sfx/", ".wav") - CopyAllFiles(GetOutputDir()+"/models/icons/", "dmodels/src/icons/", ".gif") - - CopyAllFiles(GetOutputDir()+"/models/maps/", "models/maps/", ".jpg") - CopyAllFiles(GetOutputDir()+"/models/maps/", "models/maps/", ".png") - CopyAllFiles(GetOutputDir()+"/models/maps/", "models/maps/", ".rgb") - CopyAllFiles(GetOutputDir()+"/models/maps/", "models/maps/", ".rgba") - - CopyAllFiles(GetOutputDir()+"/models/maps/", "dmodels/src/maps/", ".jpg") - CopyAllFiles(GetOutputDir()+"/models/maps/", "dmodels/src/maps/", ".png") - CopyAllFiles(GetOutputDir()+"/models/maps/", "dmodels/src/maps/", ".rgb") - CopyAllFiles(GetOutputDir()+"/models/maps/", "dmodels/src/maps/", ".rgba") +CopyAllFiles(GetOutputDir()+"/models/maps/", "models/maps/", ".jpg") +CopyAllFiles(GetOutputDir()+"/models/maps/", "models/maps/", ".png") +CopyAllFiles(GetOutputDir()+"/models/maps/", "models/maps/", ".rgb") +CopyAllFiles(GetOutputDir()+"/models/maps/", "models/maps/", ".rgba") + +CopyAllFiles(GetOutputDir()+"/models/maps/", "dmodels/src/maps/", ".jpg") +CopyAllFiles(GetOutputDir()+"/models/maps/", "dmodels/src/maps/", ".png") +CopyAllFiles(GetOutputDir()+"/models/maps/", "dmodels/src/maps/", ".rgb") +CopyAllFiles(GetOutputDir()+"/models/maps/", "dmodels/src/maps/", ".rgba") ########################################################################################## #