From 3ef3f6cb617789bed314c59c8ee84bbdcfd3b553 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Tue, 19 Jul 2011 16:39:09 -0500 Subject: [PATCH] Undo bad fix - broke some models --- src/main/java/org/dynmap/hdmap/HDBlockModels.java | 2 +- src/main/java/org/dynmap/hdmap/TexturePack.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/dynmap/hdmap/HDBlockModels.java b/src/main/java/org/dynmap/hdmap/HDBlockModels.java index 3c468c3e..0f071461 100644 --- a/src/main/java/org/dynmap/hdmap/HDBlockModels.java +++ b/src/main/java/org/dynmap/hdmap/HDBlockModels.java @@ -164,7 +164,7 @@ public class HDBlockModels { } } } - map[off] = (short)((255*raw_w) / (res*res*res)); + map[off] = (short)((255*raw_w) / (nativeres*nativeres*nativeres)); if(map[off] > 255) map[off] = 255; if(map[off] < 0) map[off] = 0; } diff --git a/src/main/java/org/dynmap/hdmap/TexturePack.java b/src/main/java/org/dynmap/hdmap/TexturePack.java index 5b1e51ee..60862477 100644 --- a/src/main/java/org/dynmap/hdmap/TexturePack.java +++ b/src/main/java/org/dynmap/hdmap/TexturePack.java @@ -463,8 +463,8 @@ public class TexturePack { } } /* Generate weighted compnents into color */ - c.setRGBA(accum_red / (res*res), accum_green / (res*res), - accum_blue / (res*res), accum_alpha / (res*res)); + c.setRGBA(accum_red / (nativeres*nativeres), accum_green / (nativeres*nativeres), + accum_blue / (nativeres*nativeres), accum_alpha / (nativeres*nativeres)); dest_argb[(y*res) + x] = c.getARGB(); } }