From b13c21055055e0bcddfa851f81ddb82e7cd05373 Mon Sep 17 00:00:00 2001 From: Gyedo Jeon Date: Tue, 5 May 2009 18:54:46 +0000 Subject: [PATCH] Removed toontown specific files --- direct/src/leveleditor/Configrc | 71 --------------- direct/src/leveleditor/copyfiles | 60 ------------ direct/src/leveleditor/copyfiles.pl | 136 ---------------------------- direct/src/leveleditor/printdir | 10 -- direct/src/leveleditor/printfiles | 125 ------------------------- direct/src/leveleditor/printlib | 5 - direct/src/leveleditor/run.bat | 7 -- direct/src/leveleditor/zipfiles | 50 ---------- 8 files changed, 464 deletions(-) delete mode 100644 direct/src/leveleditor/Configrc delete mode 100755 direct/src/leveleditor/copyfiles delete mode 100755 direct/src/leveleditor/copyfiles.pl delete mode 100755 direct/src/leveleditor/printdir delete mode 100755 direct/src/leveleditor/printfiles delete mode 100755 direct/src/leveleditor/printlib delete mode 100755 direct/src/leveleditor/run.bat delete mode 100755 direct/src/leveleditor/zipfiles diff --git a/direct/src/leveleditor/Configrc b/direct/src/leveleditor/Configrc deleted file mode 100644 index 5c5d7c3dce..0000000000 --- a/direct/src/leveleditor/Configrc +++ /dev/null @@ -1,71 +0,0 @@ - -# This is a workaround to load Japanese fonts -use-vfs 0 - -want-tk 1 -want-directtools 1 -level-editor-hoods TT -# level-editor-hoods TT DD DG MM BR DL -style-path-prefix /i - -load-display pandadx8 -chan-config-sanity-check #f -multipass-viz none -win-width 800 -win-height 600 -fullscreen 0 -sync-video #t - -# Configrc for running the level editor - -model-path $TTMODELS -model-path $DMODELS -sound-path $TTMODELS -dna-preload phase_4/dna/storage.dna - -load-file-type toontown - -window-title Toontown - -compress-channels #t -text-encoding utf8 - -# The level editor requires this legacy setting for now, so we will -# not generate dna files that are incompatible with the older -# international branches. -temp-hpr-fix 0 - -# We must currently set this to avoid messing up some of -# the suits' faces. -egg-retesselate-coplanar #f - - -# Custom ObjectTypes for Toontown. -# "barrier" means a vertical wall, with bitmask 0x01 -# "floor" means a horizontal floor, with bitmask 0x02 -# "camera-collide" means things that the camera should avoid, with bitmask 0x04 -egg-object-type-barrier collide-mask { 0x01 } { Polyset descend } -egg-object-type-trigger collide-mask { 0x01 } { Polyset descend intangible } -egg-object-type-sphere collide-mask { 0x01 } { Sphere descend } -egg-object-type-trigger-sphere collide-mask { 0x01 } { Sphere descend intangible } -egg-object-type-floor collide-mask { 0x02 } { Polyset descend } -egg-object-type-camera-collide collide-mask { 0x04 } { Polyset descend } -egg-object-type-camera-collide-sphere collide-mask { 0x04 } { Sphere descend } -egg-object-type-camera-barrier collide-mask { 0x05 } { Polyset descend } -egg-object-type-camera-barrier-sphere collide-mask { 0x05 } { Sphere descend } - -# The modelers occasionally put { model } instead of -# { 1 }. Let's be accommodating. -egg-object-type-model { 1 } -egg-object-type-dcs { 1 } - -# Define a "shadow" object type, so we can render all shadows in their -# own bin and have them not fight with each other (or with other -# transparent geometry). -egg-object-type-shadow bin { shadow } alpha { blend-no-occlude } -cull-bin shadow 15 unsorted - -# The ID of the server that we are compatible with -server-version sv1.0.14 - - diff --git a/direct/src/leveleditor/copyfiles b/direct/src/leveleditor/copyfiles deleted file mode 100755 index 34838e9d3b..0000000000 --- a/direct/src/leveleditor/copyfiles +++ /dev/null @@ -1,60 +0,0 @@ -#! /bin/sh - -if [ "$1" = "-d" ] -then - destdir=$2 - printfilesCmd=$3 - debug_state="-d" -else - destdir=$1 - printfilesCmd=$2 - debug_state="" -fi - -if [ "${destdir}" = "" -o "${printfilesCmd}" = "" ] -then - echo "Usage: copyfiles [-d] destdir printfilesCmd" - exit 1 -fi - -if [ ! -d ${destdir} ] -then - echo "Error: destdir must be a directory" - exit 1 -fi - -for file in `$printfilesCmd $debug_state` -do - copyTo=${destdir} - - moduleDir=`dirname ${file}` - srcDir=`dirname ${moduleDir}` - packageDir=`dirname ${srcDir}` - - moduleDir=`basename ${moduleDir}` - srcDir=`basename ${srcDir}` - packageDir=`basename ${packageDir}` - - if [ `basename ${file} .py` != `basename ${file}` -o \ - `basename ${file} .pyz` != `basename ${file}` ]; then - # The file is a Python file. Is it in a src directory? - if [ ${srcDir} = src ]; then - copyPkg=${destdir}/${packageDir} - copyTo=${copyPkg}/${moduleDir} - (mkdir ${copyPkg}; touch ${copyPkg}/__init__.py) > /dev/null 2>&1 - (mkdir ${copyTo}; touch ${copyTo}/__init__.py) > /dev/null 2>&1 - elif [ ${moduleDir} = pandac ]; then - copyTo=${destdir}/pandac - (mkdir ${copyTo}; touch ${copyTo}/__init__.py) > /dev/null 2>&1 - fi - fi - - if cp -R ${file} ${copyTo} - then - echo "copying ${file} to ${copyTo}" - else - echo "ERROR: could not find ${file}" - exit 1 - fi -done - diff --git a/direct/src/leveleditor/copyfiles.pl b/direct/src/leveleditor/copyfiles.pl deleted file mode 100755 index ee1a03be49..0000000000 --- a/direct/src/leveleditor/copyfiles.pl +++ /dev/null @@ -1,136 +0,0 @@ -#!perl -w -use strict; -#use File::Copy; -use File::Basename; - -my ($destdir, $printfilesCmd, $debug_state); - -if ($ARGV[0] && $ARGV[0] eq '-d') { - $destdir = $ARGV[1]; - $printfilesCmd = $ARGV[2]; - $debug_state = "-d"; -} -else { - $destdir = $ARGV[0]; - $printfilesCmd = $ARGV[1]; - $debug_state = ""; -} - -if (!$destdir || !$printfilesCmd) { - print "Usage: copyfiles.pl [-d] destdir printfilesCmd\n"; - exit 1; -} - -if (! -d $destdir ) { - print "Error: destdir must be a directory\n"; - exit 1; -} - -my @fileline = `$printfilesCmd $debug_state`; - -my (%tree, %package); -my ($moduleDir, $packageDir, $installDir); -my ($file); - -sub notsource($) -{ - my ($line) = @_; - print "unrecognized line:|$line|\n"; -} - -sub add_file($ $) -{ - my ($dir,$line) = @_; - if (! exists $package{$dir}) { - $package{$dir} = []; # create a new array entry if module/package key doesn't exist - } - push @{$package{$dir}}, $line; # add the source dir of this file to module/package's list -} - -foreach my $line (@fileline) -{ - chomp($line); - #print "$line\n"; - - - if ( ($line =~ /CVS/) - || ($line =~ /Opt\d\-/) - || ($line =~ /\.cxx|\.obj|\.h|\.I|\.in|\.pdb|\.pp|\.cvsignore|Makefile/) - ) - { # skip if ... - print "skipping $line\n"; - next; - } - - $installDir = ''; - - if ($line =~ /\/([^\/]+)\/src\/([^\/]+)\/(.+)$/ && $3) - { # $1 is module aka dtool or pirates; $2 is package aka ai or battle - if ($3) - { - $moduleDir = $1; - $packageDir = $2; - $file = $3; - - if (-d $file) { # don't handle bare directories - notsource($file); - next; - } - $installDir = "$moduleDir/$packageDir" - if $file =~ /\.py/; # tree install only for Python files - - $tree{$moduleDir} = 1; - #print "recognized module:$moduleDir package:$packageDir\n"; - } - else { - notsource($line); # don't know how to handle this file - } - } - elsif ($line =~ /pandac/) - { - $installDir = 'pandac'; - } - - add_file($installDir, $line); - #print "line:|$line|"; - #print "$1 $2 $3 $4\n"; -} - -############################################################################# - -print "\nSTARTING COPY\n\n"; - -sub echo_cmd($) -{ - my ($cmd) = @_; - print "$cmd\n"; - system($cmd); -} - -my $cmd; -foreach my $dir (keys %tree) -{ # create the master directories - echo_cmd("mkdir -p $destdir/$dir"); - echo_cmd("touch $destdir/$dir/__init__.py"); # linkage file for python -} - -my ($fileline, $finaldir, $files); -foreach my $key (keys %package) -{ # loop and copy each cluster of files - $finaldir = "$destdir/$key"; - print "\ncopying to $finaldir:\n"; - - $files = $package{$key}; - foreach my $file (@{$files}) - { # dump list of files being copied - print "$file\n"; - } - - $fileline = join(' ', @{$files}); # create clustered command line - #print "-t $destdir/$key $fileline\n"; - system("mkdir $destdir/$key"); - system("cp -rpt $destdir/$key $fileline"); # copy -} -print "\n"; - -0; diff --git a/direct/src/leveleditor/printdir b/direct/src/leveleditor/printdir deleted file mode 100755 index afe19d2a1a..0000000000 --- a/direct/src/leveleditor/printdir +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/sh - -# Some Cygwin users don't have find set on on their path correctly, so -# we have to be explicit. -if [ -x /bin/find ]; then - /bin/find $1 -name \*$2 -print -else - find $1 -name \*$2 -print -fi - diff --git a/direct/src/leveleditor/printfiles b/direct/src/leveleditor/printfiles deleted file mode 100755 index 5e787250a7..0000000000 --- a/direct/src/leveleditor/printfiles +++ /dev/null @@ -1,125 +0,0 @@ -#! /bin/sh - -# Configrc for running the show -# This uses the executable system now, not the configrc -echo $DIRECT/src/leveleditor/Config.prc -echo $DIRECT/src/leveleditor/run.bat - -# Python files -echo $WINTOOLS/sdk/python/Python-2.4.1/PCbuild/python.exe -echo $WINTOOLS/sdk/python/Python-2.4.1/PCbuild/python24.dll -#echo $WINTOOLS/sdk/python/Python-2.4.1/PCbuild/_sre.pyd -echo $WINTOOLS/sdk/python/Python-2.4.1/PCbuild/_tkinter_d.pyd -echo $WINTOOLS/sdk/python/Python-2.4.1/PCbuild/_socket.pyd -echo $WINTOOLS/sdk/python/Python-2.4.1/PCbuild/zlib.pyd - -echo $WINTOOLS/sdk/python/Python-2.4.1/PCbuild/_tkinter.pyd - -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/lib-tk -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/site-packages/Pmw -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/linecache.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/traceback.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/__future__.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/whrandom.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/copy_reg.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/copy.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/fnmatch.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/re.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/sre.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/sre_parse.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/sre_constants.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/sre_compile.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/types.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/string.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/os.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/site.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/stat.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/UserDict.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/ntpath.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/random.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/getopt.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/fpformat.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/bisect.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/warnings.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/inspect.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/dis.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/tokenize.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/token.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/ihooks.py - -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/opcode.py -echo $WINTOOLS/sdk/python/Python-2.4.1/Lib/weakref.py - -# Libraries -echo $WINTOOLS/lib -echo $WINTOOLS/sdk/rad/Miles6/redist/win32/Mss32.dll -echo $WINTOOLS/sdk/rad/Miles6/redist/win32/Mp3dec.asi -echo $DTOOL/built/lib/libdtool.dll -echo $DTOOL/built/lib/libdtoolconfig.dll -echo $PANDA/built/lib/libpandaexpress.dll -echo $PANDA/built/lib/libpanda.dll -echo $PANDA/built/lib/libpandaphysics.dll -echo $PANDA/built/lib/libwindisplay.dll -echo $PANDA/built/lib/libpandadx7.dll -echo $PANDA/built/lib/libpandadx8.dll -echo $PANDA/built/lib/libpandagl.dll -echo $PANDA/built/lib/libpandafx.dll -echo $PANDA/built/lib/libpandaegg.dll -echo $PANDA/built/lib/libmiles_audio.dll -echo $DIRECT/built/lib/libdirect.dll -echo $DIRECT/built/lib/libheapq.dll -echo $OTP/built/lib/libotp.dll -echo $TOONTOWN/built/lib/libtoontown.dll - -# Generated code for libpanda -printlib $DIRECT/built/lib/pandac libpanda -printlib $DIRECT/built/lib/pandac libpandaphysics -echo $DIRECT/built/lib/pandac/PandaModules.py -#echo $DIRECT/built/lib/pandac/PandaModules.pyz - -# Generated code for libdirect -printlib $DIRECT/built/lib/pandac libdirect - -# Generated code for libotp -printlib $DIRECT/built/lib/pandac libotp - -# Generated code for libtoontown -printlib $DIRECT/built/lib/pandac libtoontown - -# Chris' new stuff -printdir $DIRECT/built/lib/pandac .py -echo $WINTOOLS/built/lib/nspr4.dll -echo $WINTOOLS/built/lib/highgui096.dll -echo $WINTOOLS/built/lib/cxcore096.dll -echo $WINTOOLS/built/lib/tk84.dll -echo $WINTOOLS/built/lib/tcl84.dll - -# DIRECT stuff -printdir $DIRECT/src/actor .py -printdir $DIRECT/src/cluster .py -printdir $DIRECT/src/directbase .py -printdir $DIRECT/src/directdevices .py -printdir $DIRECT/src/directnotify .py -printdir $DIRECT/src/directscripts .py -printdir $DIRECT/src/directtools .py -printdir $DIRECT/src/directutil .py -printdir $DIRECT/src/distributed .py -printdir $DIRECT/src/ffi/ .py -printdir $DIRECT/src/fsm .py -printdir $DIRECT/src/gui .py -printdir $DIRECT/src/interval .py -printdir $DIRECT/src/leveleditor .py -printdir $DIRECT/src/particles .py -printdir $DIRECT/src/showbase .py -printdir $DIRECT/src/task .py -printdir $DIRECT/src/showbase .py -printdir $DIRECT/src/tkpanels .py -printdir $DIRECT/src/tkwidgets .py - -printdir $DIRECT/src/controls .py - -# Etc files -#echo $PANDA/etc/layout_db -#echo $PANDA/etc/setup_db -#echo $PANDA/etc/window_db - diff --git a/direct/src/leveleditor/printlib b/direct/src/leveleditor/printlib deleted file mode 100755 index 315838bbcd..0000000000 --- a/direct/src/leveleditor/printlib +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/sh - -grep -l "CMODULE \[$2\]" $1/*.py - - diff --git a/direct/src/leveleditor/run.bat b/direct/src/leveleditor/run.bat deleted file mode 100755 index be5ff7b490..0000000000 --- a/direct/src/leveleditor/run.bat +++ /dev/null @@ -1,7 +0,0 @@ -set PATH=lib -set PYTHONPATH=.;lib-tk -set TTMODELS=/i/alpha/player/install/ttmodels -set DMODELS=/i/alpha/player/install/dmodels -set CFG_PATH=. -set CONFIG_CONFIG=:configpath=CFG_PATH -python.exe direct\leveleditor\LevelEditor.py diff --git a/direct/src/leveleditor/zipfiles b/direct/src/leveleditor/zipfiles deleted file mode 100755 index fd44ae7907..0000000000 --- a/direct/src/leveleditor/zipfiles +++ /dev/null @@ -1,50 +0,0 @@ -#! /bin/sh - -if [ "$1" = "-d" ] -then - destdir=$2 - zipfile=$3 - debug_state="-d" -else - destdir=$1 - zipfile=$2 - debug_state="" -fi - -if [ "${destdir}" = "" ] -then - echo "Usage: zipfiles [-d] destdir destfile.zip" - exit 1 -fi - -if [ -d ${destdir} ] -then - echo "Removing ${destdir}" - echo "ERROR: destdir must not already exist" - exit 1 -fi - -if [ -f printfiles ] -then - echo "Found printfiles" -else - echo "Cannot find printfiles script. Run zipfiles in the same directory as printfiles" - exit 1 -fi - -if mkdir ${destdir} -then - echo "Created destdir" - if copyfiles ${debug_state} ${destdir} ./printfiles - then - if [ -f ${zipfile} ] - then - rm ${zipfile} - fi - zip -r ${zipfile} ${destdir} - rm -rf ${destdir} - echo "Done creating ${zipfile}" - fi -else - echo "ERROR: Could not mkdir ${destdir}" -fi