From 7ef9682355643cdcf89b6911a642d11d31c85d42 Mon Sep 17 00:00:00 2001 From: Dave Hoover Date: Thu, 10 Jan 2008 01:45:15 +0000 Subject: [PATCH] We can't skip these tilesets even if they're up to date like this, since we would've done some extra logic & changed the tileset on the bundle. I obviously want to fix this so things aren't so insanely grindy when nothing's changed, but it's time to run for my train, so in the meantime I'm going to make this burn cpu but do the right thing. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@389 ed5b42cb-e716-0410-a449-f6a68f950b19 --- .../media/tile/bundle/tools/DirectoryTileSetBundler.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundler.java b/src/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundler.java index 60ca877b..9b8813cd 100644 --- a/src/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundler.java +++ b/src/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundler.java @@ -92,7 +92,11 @@ public class DirectoryTileSetBundler extends TileSetBundler File outFile = new File(target, imagePath); if (outFile.lastModified() > newestMod) { // Our file's newer than the newest bundle mod - up to date. - continue; + + // FIXME: We can't just skip it, since we would've normally trimmed it, + // so we need to get an appropriate TrimmedObjectTileSet added to our + // bundle in place of this old ObjectTileSet. + //continue; } outFile.getParentFile().mkdirs(); FileOutputStream fout = new FileOutputStream(outFile);