Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions 1

Fix problem with not replacing non-blank tiles with newly blank ones

Browse source
This commit is contained in:
Mike Primm 2011-10-04 12:25:27 +08:00 • committed by mikeprimm
parent bc31599378
commit a143e5e73e
1 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

82
src/main/java/org/dynmap/hdmap/IsoHDPerspective.java
View file

@ -1124,12 +1124,46 @@ public class IsoHDPerspective implements HDPerspective {
long crc = hashman.calculateTileHash(argb_buf[i]); long crc = hashman.calculateTileHash(argb_buf[i]);
boolean tile_update = false; boolean tile_update = false;
String prefix = shaderstate[i].getMap().getPrefix(); String prefix = shaderstate[i].getMap().getPrefix();
if(rendered[i]) {
renderone = true; MapType.ImageFormat fmt = shaderstate[i].getMap().getImageFormat();
MapType.ImageFormat fmt = shaderstate[i].getMap().getImageFormat(); String fname = tile.getFilename(prefix, fmt);
String fname = tile.getFilename(prefix, fmt); File f = new File(tile.getDynmapWorld().worldtilepath, fname);
File f = new File(tile.getDynmapWorld().worldtilepath, fname); FileLockManager.getWriteLock(f);
try {
if(rendered[i])
renderone = true;
if((!f.exists()) || (crc != hashman.getImageHashCode(tile.getKey(), prefix, tile.tx, tile.ty))) {
/* Wrap buffer as buffered image */
Debug.debug("saving image " + f.getPath());
if(!f.getParentFile().exists())
f.getParentFile().mkdirs();
try {
FileLockManager.imageIOWrite(im[i].buf_img, fmt, f);
} catch (IOException e) {
Debug.error("Failed to save image: " + f.getPath(), e);
} catch (java.lang.NullPointerException e) {
Debug.error("Failed to save image (NullPointerException): " + f.getPath(), e);
}
MapManager.mapman.pushUpdate(tile.getWorld(), new Client.Tile(fname));
hashman.updateHashCode(tile.getKey(), prefix, tile.tx, tile.ty, crc);
tile.getDynmapWorld().enqueueZoomOutUpdate(f);
tile_update = true;
}
else {
Debug.debug("skipping image " + f.getPath() + " - hash match");
}
} finally {
FileLockManager.releaseWriteLock(f);
DynmapBufferedImage.freeBufferedImage(im[i]);
}
MapManager.mapman.updateStatistics(tile, prefix, true, tile_update, !rendered[i]);
/* Handle day image, if needed */
if(dayim[i] != null) {
fname = tile.getDayFilename(prefix, fmt);
f = new File(tile.getDynmapWorld().worldtilepath, fname);
FileLockManager.getWriteLock(f); FileLockManager.getWriteLock(f);
prefix = prefix+"_day";
tile_update = false;
try { try {
if((!f.exists()) || (crc != hashman.getImageHashCode(tile.getKey(), prefix, tile.tx, tile.ty))) { if((!f.exists()) || (crc != hashman.getImageHashCode(tile.getKey(), prefix, tile.tx, tile.ty))) {
/* Wrap buffer as buffered image */ /* Wrap buffer as buffered image */
@ -1137,7 +1171,7 @@ public class IsoHDPerspective implements HDPerspective {
if(!f.getParentFile().exists()) if(!f.getParentFile().exists())
f.getParentFile().mkdirs(); f.getParentFile().mkdirs();
try { try {
FileLockManager.imageIOWrite(im[i].buf_img, fmt, f); FileLockManager.imageIOWrite(dayim[i].buf_img, fmt, f);
} catch (IOException e) { } catch (IOException e) {
Debug.error("Failed to save image: " + f.getPath(), e); Debug.error("Failed to save image: " + f.getPath(), e);
} catch (java.lang.NullPointerException e) { } catch (java.lang.NullPointerException e) {
@ -1153,43 +1187,9 @@ public class IsoHDPerspective implements HDPerspective {
} }
} finally { } finally {
FileLockManager.releaseWriteLock(f); FileLockManager.releaseWriteLock(f);
DynmapBufferedImage.freeBufferedImage(im[i]); DynmapBufferedImage.freeBufferedImage(dayim[i]);
} }
MapManager.mapman.updateStatistics(tile, prefix, true, tile_update, !rendered[i]); MapManager.mapman.updateStatistics(tile, prefix, true, tile_update, !rendered[i]);
/* Handle day image, if needed */
if(dayim[i] != null) {
fname = tile.getDayFilename(prefix, fmt);
f = new File(tile.getDynmapWorld().worldtilepath, fname);
FileLockManager.getWriteLock(f);
prefix = prefix+"_day";
tile_update = false;
try {
if((!f.exists()) || (crc != hashman.getImageHashCode(tile.getKey(), prefix, tile.tx, tile.ty))) {
/* Wrap buffer as buffered image */
Debug.debug("saving image " + f.getPath());
if(!f.getParentFile().exists())
f.getParentFile().mkdirs();
try {
FileLockManager.imageIOWrite(dayim[i].buf_img, fmt, f);
} catch (IOException e) {
Debug.error("Failed to save image: " + f.getPath(), e);
} catch (java.lang.NullPointerException e) {
Debug.error("Failed to save image (NullPointerException): " + f.getPath(), e);
}
MapManager.mapman.pushUpdate(tile.getWorld(), new Client.Tile(fname));
hashman.updateHashCode(tile.getKey(), prefix, tile.tx, tile.ty, crc);
tile.getDynmapWorld().enqueueZoomOutUpdate(f);
tile_update = true;
}
else {
Debug.debug("skipping image " + f.getPath() + " - hash match");
}
} finally {
FileLockManager.releaseWriteLock(f);
DynmapBufferedImage.freeBufferedImage(dayim[i]);
}
MapManager.mapman.updateStatistics(tile, prefix, true, tile_update, !rendered[i]);
}
} }
} }
return renderone; return renderone;