From 4f0f812902d55993f56a4c0379237183ce31623d Mon Sep 17 00:00:00 2001
From: Josh Yelon <jyelon@gmail.com>
Date: Sun, 17 Jun 2007 06:23:32 +0000
Subject: [PATCH] Don't distribute bams - use model cache instead

---
 direct/src/directscripts/packpanda.nsi |  1 +
 doc/makepanda/config.in                |  3 +++
 doc/makepanda/makepanda.py             | 27 +++++++++-----------------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/direct/src/directscripts/packpanda.nsi b/direct/src/directscripts/packpanda.nsi
index 4466749f74..48d3e01ac7 100755
--- a/direct/src/directscripts/packpanda.nsi
+++ b/direct/src/directscripts/packpanda.nsi
@@ -100,6 +100,7 @@ Section "${SMDIRECTORY}" SecCore
         File /r "${PANDA}\pandac\*.py"
         SetOutPath $INSTDIR\python
         File /r "${PANDA}\python\*"
+        CreateDirectory $INSTDIR/modelcache
 
         RMDir /r "$SMPROGRAMS\${SMDIRECTORY}"
         CreateDirectory "$SMPROGRAMS\${SMDIRECTORY}"
diff --git a/doc/makepanda/config.in b/doc/makepanda/config.in
index 2d70859282..1b77127244 100755
--- a/doc/makepanda/config.in
+++ b/doc/makepanda/config.in
@@ -68,3 +68,6 @@ audio-library-name p3fmod_audio
 
 hardware-animated-vertices 0
 
+# Enable the bam-cache
+
+model-cache-dir $THIS_PRC_DIR/../modelcache
diff --git a/doc/makepanda/makepanda.py b/doc/makepanda/makepanda.py
index 739186e669..750c22f25f 100755
--- a/doc/makepanda/makepanda.py
+++ b/doc/makepanda/makepanda.py
@@ -1010,9 +1010,7 @@ def CopyAllFiles(dstdir, srcdir, suffix=""):
 def CompileAllModels(dstdir, srcdir):
     for x in GetDirectoryContents(srcdir, ["*.egg", "*.flt"]):
         eggpz = os.path.basename(x[:-4] + ".egg.pz")
-        bampz = os.path.basename(x[:-4] + ".bam.pz")
         EnqueueEggPZ("", dstdir + eggpz, srcdir + x)
-        EnqueueBamPZ("", dstdir + bampz, dstdir + eggpz)
 
 def CopyAllHeaders(dir, skip=[]):
     for filename in GetDirectoryContents(dir, ["*.h", "*.I", "*.T"], skip):
@@ -1445,14 +1443,14 @@ def EnqueueEggPZ(preconv, eggpz, src):
 # EnqueueBamPZ
 #
 ##########################################################################################
-
-def CompileBamPZ(preconv, bampz, src):
-    oscmd("built/bin/egg2bam " + preconv + " -o " + bampz[:-3] + " " + src)
-    oscmd("built/bin/pzip " + bampz[:-3])
-
-def EnqueueBamPZ(preconv, bampz, src):
-    dep = [src, "egg2bam.exe"]
-    SDependencyQueue([], [CompileBamPZ, preconv, bampz, src], [bampz], dep)
+# 
+# def CompileBamPZ(preconv, bampz, src):
+#     oscmd("built/bin/egg2bam " + preconv + " -o " + bampz[:-3] + " " + src)
+#     oscmd("built/bin/pzip " + bampz[:-3])
+# 
+# def EnqueueBamPZ(preconv, bampz, src):
+#     dep = [src, "egg2bam.exe"]
+#     SDependencyQueue([], [CompileBamPZ, preconv, bampz, src], [bampz], dep)
 
 ##########################################################################################
 #
@@ -1541,6 +1539,7 @@ MakeDirectory("built/bin")
 MakeDirectory("built/lib")
 MakeDirectory("built/etc")
 MakeDirectory("built/plugins")
+MakeDirectory("built/modelcache")
 MakeDirectory("built/include")
 MakeDirectory("built/include/parser-inc")
 MakeDirectory("built/include/parser-inc/openssl")
@@ -4469,14 +4468,6 @@ if (OMIT.count("PANDATOOL")==0):
     CompileAllModels("built/models/gui/",  "dmodels/src/gui/")
     CompileAllModels("built/models/",      "models/")
 
-    if (os.path.isdir("samples")):
-        for tut in os.listdir("samples"):
-            dir = "samples/"+tut+"/models/"
-            if (os.path.isdir(dir)):
-                for eggpz in GetDirectoryContents(dir, ["*.egg.pz"]):
-                    bampz = os.path.basename(eggpz[:-7] + ".bam.pz")
-                    EnqueueBamPZ("-ps keep", dir + bampz, dir + eggpz)
-
     CopyAllFiles("built/models/audio/sfx/",  "dmodels/src/audio/sfx/", ".wav")
     CopyAllFiles("built/models/icons/",      "dmodels/src/icons/",     ".gif")