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

Don't distribute bams - use model cache instead

Browse Source
This commit is contained in:
Josh Yelon 2007-06-17 06:23:32 +00:00
parent 7c6a8ad215
commit 4f0f812902
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
direct/src/directscripts/packpanda.nsi
View File

@ -100,6 +100,7 @@ Section "${SMDIRECTORY}" SecCore
File /r "${PANDA}\pandac\*.py" File /r "${PANDA}\pandac\*.py"
SetOutPath $INSTDIR\python SetOutPath $INSTDIR\python
File /r "${PANDA}\python\*" File /r "${PANDA}\python\*"
CreateDirectory $INSTDIR/modelcache
RMDir /r "$SMPROGRAMS\${SMDIRECTORY}" RMDir /r "$SMPROGRAMS\${SMDIRECTORY}"
CreateDirectory "$SMPROGRAMS\${SMDIRECTORY}" CreateDirectory "$SMPROGRAMS\${SMDIRECTORY}"

3
doc/makepanda/config.in
View File

@ -68,3 +68,6 @@ audio-library-name p3fmod_audio
hardware-animated-vertices 0 hardware-animated-vertices 0
# Enable the bam-cache
model-cache-dir $THIS_PRC_DIR/../modelcache

27
doc/makepanda/makepanda.py
View File

@ -1010,9 +1010,7 @@ def CopyAllFiles(dstdir, srcdir, suffix=""):
def CompileAllModels(dstdir, srcdir): def CompileAllModels(dstdir, srcdir):
for x in GetDirectoryContents(srcdir, ["*.egg", "*.flt"]): for x in GetDirectoryContents(srcdir, ["*.egg", "*.flt"]):
eggpz = os.path.basename(x[:-4] + ".egg.pz") eggpz = os.path.basename(x[:-4] + ".egg.pz")
bampz = os.path.basename(x[:-4] + ".bam.pz")
EnqueueEggPZ("", dstdir + eggpz, srcdir + x) EnqueueEggPZ("", dstdir + eggpz, srcdir + x)
EnqueueBamPZ("", dstdir + bampz, dstdir + eggpz)
def CopyAllHeaders(dir, skip=[]): def CopyAllHeaders(dir, skip=[]):
for filename in GetDirectoryContents(dir, ["*.h", "*.I", "*.T"], skip): for filename in GetDirectoryContents(dir, ["*.h", "*.I", "*.T"], skip):
@ -1445,14 +1443,14 @@ def EnqueueEggPZ(preconv, eggpz, src):
# EnqueueBamPZ # EnqueueBamPZ
# #
########################################################################################## ##########################################################################################
#
def CompileBamPZ(preconv, bampz, src): # def CompileBamPZ(preconv, bampz, src):
oscmd("built/bin/egg2bam " + preconv + " -o " + bampz[:-3] + " " + src) # oscmd("built/bin/egg2bam " + preconv + " -o " + bampz[:-3] + " " + src)
oscmd("built/bin/pzip " + bampz[:-3]) # oscmd("built/bin/pzip " + bampz[:-3])
#
def EnqueueBamPZ(preconv, bampz, src): # def EnqueueBamPZ(preconv, bampz, src):
dep = [src, "egg2bam.exe"] # dep = [src, "egg2bam.exe"]
SDependencyQueue([], [CompileBamPZ, preconv, bampz, src], [bampz], dep) # SDependencyQueue([], [CompileBamPZ, preconv, bampz, src], [bampz], dep)
########################################################################################## ##########################################################################################
# #
@ -1541,6 +1539,7 @@ MakeDirectory("built/bin")
MakeDirectory("built/lib") MakeDirectory("built/lib")
MakeDirectory("built/etc") MakeDirectory("built/etc")
MakeDirectory("built/plugins") MakeDirectory("built/plugins")
MakeDirectory("built/modelcache")
MakeDirectory("built/include") MakeDirectory("built/include")
MakeDirectory("built/include/parser-inc") MakeDirectory("built/include/parser-inc")
MakeDirectory("built/include/parser-inc/openssl") 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/gui/", "dmodels/src/gui/")
CompileAllModels("built/models/", "models/") 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/audio/sfx/", "dmodels/src/audio/sfx/", ".wav")
CopyAllFiles("built/models/icons/", "dmodels/src/icons/", ".gif") CopyAllFiles("built/models/icons/", "dmodels/src/icons/", ".gif")