Adopted the changes from most up to date fork + additional fixes

.gitignore

@@ -0,0 +1,2 @@
+*.o
+pigmap

Makefile

@@ -1,29 +1,38 @@
-objects = pigmap.o blockimages.o chunk.o map.o render.o region.o rgba.o tables.o utils.o world.o
-
-pigmap : $(objects)
-	g++ $(objects) -o pigmap -l z -l png -l pthread -O3
-
-pigmap.o : pigmap.cpp blockimages.h chunk.h map.h render.h rgba.h tables.h utils.h world.h
-	g++ -c pigmap.cpp -O3
-blockimages.o : blockimages.cpp blockimages.h rgba.h utils.h
-	g++ -c blockimages.cpp -O3
-chunk.o : chunk.cpp chunk.h map.h region.h tables.h utils.h
-	g++ -c chunk.cpp -O3
-map.o : map.cpp map.h utils.h
-	g++ -c map.cpp -O3
-render.o : render.cpp blockimages.h chunk.h map.h render.h rgba.h tables.h utils.h
-	g++ -c render.cpp -O3
-region.o : region.cpp map.h region.h tables.h utils.h
-	g++ -c region.cpp -O3
-rgba.o : rgba.cpp rgba.h utils.h
-	g++ -c rgba.cpp -O3
-tables.o : tables.cpp map.h tables.h utils.h
-	g++ -c tables.cpp -O3
-utils.o : utils.cpp utils.h
-	g++ -c utils.cpp -O3
-world.o : world.cpp map.h region.h tables.h world.h
-	g++ -c world.cpp -O3
-
-clean :
-	rm -f *.o pigmap
-
+objects = pigmap.o blockimages.o chunk.o map.o render.o region.o rgba.o tables.o utils.o world.o
+
+ifeq ($(mode),debug)
+	CFLAGS = -g -Wall -D_DEBUG
+else ifeq ($(mode),profile)
+	CFLAGS = -Wall -O3 -DNDEBUG -pg
+else ifeq ($(mode),coverage)
+	CFLAGS = -Wall -O3 -DNDEBUG -fprofile-arcs -ftest-coverage
+else
+	CFLAGS = -Wall -O3 -DNDEBUG
+endif
+
+pigmap : $(objects)
+	g++ $(objects) -o pigmap -l z -l png -l jpeg -l pthread $(CFLAGS)
+
+pigmap.o : pigmap.cpp blockimages.h chunk.h map.h render.h rgba.h tables.h utils.h world.h
+	g++ -c pigmap.cpp $(CFLAGS)
+blockimages.o : blockimages.cpp blockimages.h rgba.h utils.h
+	g++ -c blockimages.cpp $(CFLAGS) -std=c++0x
+chunk.o : chunk.cpp chunk.h map.h region.h tables.h utils.h
+	g++ -c chunk.cpp $(CFLAGS)
+map.o : map.cpp map.h utils.h
+	g++ -c map.cpp $(CFLAGS)
+render.o : render.cpp blockimages.h chunk.h map.h render.h rgba.h tables.h utils.h
+	g++ -c render.cpp $(CFLAGS)
+region.o : region.cpp map.h region.h tables.h utils.h
+	g++ -c region.cpp $(CFLAGS)
+rgba.o : rgba.cpp rgba.h utils.h
+	g++ -c rgba.cpp $(CFLAGS)
+tables.o : tables.cpp map.h tables.h utils.h
+	g++ -c tables.cpp $(CFLAGS)
+utils.o : utils.cpp utils.h
+	g++ -c utils.cpp $(CFLAGS)
+world.o : world.cpp map.h region.h tables.h world.h
+	g++ -c world.cpp $(CFLAGS)
+
+clean :
+	rm -f *.o pigmap

README

@@ -40,6 +40,24 @@ Use supplied makefile to build with g++.
 
 Change log (important stuff only):
 
+%LATEST_VERSION%
+-new block up to Minecraft 1.6 13w18c snapshot
+-new textures should be added to image folder (or updated):
+    textures/blocks/blockCoal.png
+    textures/blocks/blockLapis.png
+    textures/blocks/clayHardened.png
+    textures/blocks/clayHardenedStained_[0-15].png
+    textures/blocks/hayBlock.png
+    textures/blocks/hayBlock_top.png
+
+1.5
+-fire.png, terrain.png, chest.png (and similar) are no longer required
+-pigmap now works with upcoming Minecraft 1.5 textures
+-folders /item, /textures/blocks from minecraft.jar or your texture pack are
+  required (in image path), including their contents
+-new blocks up to 13w03a Minecraft snapshot (upcoming Minecraft 1.5)
+-possibility to render custom blocks
+
 1.2
 -new blocks up to Minecraft 1.3
 -chest.png, etc. now required
@@ -116,15 +134,15 @@ Usage examples:
 
 full render:
 
-pigmap -B 6 -T 1 -Z 10 -i input/World1 -o output/World1 -g images -h 3
+pigmap -B 6 -T 1 -Z 10 -i input/World1 -o output/World1 -g images -t 3
 
 ...builds a map with parameters B = 6, T = 1, baseZoom = 10, reading world data from the path
 "input/World1", writing tiles out to the path "output/World1", reading terrain images from the path
 "images", and using 3 threads.
 
 incremental update:
 
-pigmap -i input/World1 -o output/World1 -r regionlist -h 3 -x
+pigmap -i input/World1 -o output/World1 -r regionlist -t 3 -x
 
 ...updates an existing map by redrawing any tiles touched by regions listed in the file "regionlist",
 with the input and output dirs as before.  Terrain images are read from the path ".", and 3 threads
@@ -168,7 +186,7 @@ incremental update; make a copy if you need to add fancier abilities to it.
 
 c. [optional (kind of)] image path (-g)
 
-This is where pigmap expects to find either a copy of your tileset (terrain.png, etc.), or a copy of
+This is where pigmap expects to find either a copy of your textures (texture/ folder of your minecraft.jar etc.), or a copy of
 blocks-B.png (substituting the actual numeric value of B; see below for definition of B), a
 pigmap-generated file that contains the isometric renderings of each block.  These files are not
 optional, but the -g parameter itself may be omitted, in which case "." is used as the image path.
@@ -187,22 +205,29 @@ This means that pigmap will need your tileset the first time it runs, so it can
 subsequent runs will use the existing blocks-B.png, which can be manually edited if insufficiently
 pretty, or for special effects, etc.
 
-The following images are required to generate blocks-B.png:
--terrain.png, chest.png, largechest.png, enderchest.png: these files come from your tileset
-  or minecraft.jar
--fire.png, endportal.png: these files are included with pigmap
-All of these must be RGBA png files (not just RGB).
-
-High-res tilesets are supported.  The textures in terrain.png, fire.png, and endportal.png can be
-any size, as long as they remain square.  The textures in the chest pngs can be scaled up, but their
-size must be an integer multiple of the original size.
+The generate blocks-B.pngi, extract the item/ and textures/ folder of your minecraft.jar into the folder you have specified.
+All of these must be RGBA png files (not just RGB). So check the alpha channels, if one file is not recognized. From minecraft version 1.5 it is known that the lava.png is missing an alpha channel. You can simply add one by using tools like GIMP.
 
-d. [optional] number of threads (-h)
+d. [optional] number of threads (-t)
 
 Defaults to 1.  Each thread requires around 250-300 MB of RAM (they work in different areas of the
 map and keep separate caches of chunk data).  Returns from extra threads may diminish quickly as the
 disk becomes a bottleneck.
 
+e. [optional] output image file format (-f)
+
+Defaults to png. The output is either done as png files, jpeg files or both. Jpeg can be compressed to
+smaller file sizes than png and may be preferrable for web use, but incremental rendering only reads
+png files, since jpeg is a lossy format. The "both" option is supplied to deal with this situation -
+both file formats will be written, jpeg used in the html map and png files can be kept for future
+incremental renders.
+
+f. [optional] Jpeg quality (-j)
+
+Defaults to 75. A number between 1 and 100 that determines what quality level jpeg files are written.
+Higher means better quality but larger file sizes. Has no effect (obviously) if the output file format
+is not set to jpeg or both.
+
 
 2. Params for full renders only:
 
@@ -312,4 +337,4 @@ furnaces: 68->183, 69->186, 149->184, 150->185, 151->187, 152->188
 fire: 48->189
 buttons: 123->190, 124->191, 125->192, 126->193
 levers: 104->194, 105->195, 106->196, 107->197, 108->198, 109->199
-ascending tracks: 88->200, 89->201, 90->202, 91->203
+ascending tracks: 88->200, 89->201, 90->202, 91->203