Load pixels directly into sprite definition, not sure what these offsets are

This commit is contained in:
Adam
2016-06-09 19:24:03 -04:00
parent e62381a65e
commit 24754772f6
5 changed files with 61 additions and 209 deletions

View File

@@ -28,14 +28,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.cache.loaders;
package net.runelite.cache;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.util.List;
import javax.imageio.ImageIO;
import net.runelite.cache.IndexType;
import net.runelite.cache.StoreLocation;
import net.runelite.cache.definitions.SpriteDefinition;
import net.runelite.cache.definitions.loaders.SpriteLoader;
import net.runelite.cache.fs.Archive;
@@ -43,7 +41,6 @@ import net.runelite.cache.fs.File;
import net.runelite.cache.fs.Index;
import net.runelite.cache.fs.Store;
import net.runelite.cache.io.InputStream;
import net.runelite.cache.renderable.RGBSprite;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
@@ -51,9 +48,9 @@ import org.junit.rules.TemporaryFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SpriteLoaderTest
public class SpriteDumperTest
{
private static final Logger logger = LoggerFactory.getLogger(SpriteLoaderTest.class);
private static final Logger logger = LoggerFactory.getLogger(SpriteDumperTest.class);
@Rule
public TemporaryFolder folder = StoreLocation.getTemporaryFolder();
@@ -82,24 +79,23 @@ public class SpriteLoaderTest
byte[] contents = file.getContents();
SpriteLoader loader = new SpriteLoader();
loader.load(new InputStream(contents));
SpriteDefinition[] defs = loader.getSprites();
for (int i = 0; i < defs.length; ++i)
{
RGBSprite sp = RGBSprite.fromSpriteDefinition(defs[i]);
SpriteDefinition[] sprites = loader.load(new InputStream(contents));
int frame = 0;
for (SpriteDefinition def : sprites)
{
// I don't know why this happens
if (sp.getSpriteHeight() <= 0 || sp.getSpriteWidth() <= 0)
if (def.getHeight() <= 0 || def.getWidth() <= 0)
continue;
BufferedImage image = sp.getBufferedImage();
java.io.File targ = new java.io.File(outDir, a.getArchiveId() + "-" + i + ".png");
BufferedImage image = getBufferedImage(def);
java.io.File targ = new java.io.File(outDir, a.getArchiveId() + "-" + frame + ".png");
targ.mkdirs();
ImageIO.write(image, "png", targ);
++count;
++frame;
}
}
}
@@ -108,4 +104,11 @@ public class SpriteLoaderTest
logger.info("Dumped {} sprites to {}", count, outDir);
}
private BufferedImage getBufferedImage(SpriteDefinition def)
{
BufferedImage bi = new BufferedImage(def.getWidth(), def.getHeight(), BufferedImage.TYPE_INT_ARGB);
bi.setRGB(0, 0, def.getWidth(), def.getHeight(), def.getPixels(), 0, def.getWidth());
return bi;
}
}

View File

@@ -28,7 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.cache.loaders;
package net.runelite.cache;
import java.io.IOException;
import java.nio.file.Files;