Blocks up to Minecraft 1.4

.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

@@ -4,8 +4,8 @@ essentially the same thing, just faster and with fewer fancy options.  Features
 
 -isometric projection; level of detail on max zoom is user-settable
 -Google Maps tile output
--custom tilesets (supply your own terrain.png)
--ability to manually edit the isometric block images generated from terrain.png,
+-custom tilesets (supply your own texture pack)
+-ability to manually edit the isometric block images generated from texture pack,
   for further beautification
 -incremental map updates, but you must supply your own list of modified chunks (most
   likely via rsync or something similar)
@@ -25,12 +25,15 @@ Andrew Brown and contributors).
 The official pigmap repository is at:
 https://github.com/equalpants/pigmap
 
+Latest textures to build tile set is at (if you don't want to manually extract textures):
+https://www.dropbox.com/s/qkckuwbu1an77sm/pigmap_mc_textures.7z
+
 ---------------------------------------------------------------------------------------------------
 
 Supported platforms are Linux and cygwin.  OS X should also be fine, but I haven't tried it
 myself.  (I've heard reports of it working, though.)
 
-Dependencies are zlib, libpng, pthreads, and some very basic system stuff: getopt, mkdir,
+Dependencies are zlib, libpng, libjpeg, pthreads, and some very basic system stuff: getopt, mkdir,
 dirent.h.  If your platform has a separate development package for libpng (called libpng-dev,
 libpng-devel, or something like that), you'll need that one, too.
 
@@ -39,6 +42,32 @@ Use supplied makefile to build with g++.
 ---------------------------------------------------------------------------------------------------
 
 Change log (important stuff only):
+1.8
+-new blocks up to Minecraft 1.8 (andesite, diorite, granite, coarse dirt
+  prismarine blocks, sea lantern, sponge, iron trapdoor, inverted daylight sensor)
+-new fence & fence gate variants
+-new door variants
+-added different bottom texture for stairs (sandstone, quartz, red sandstone)
+-fixed farmland block not showing if it is wet
+
+1.7
+-added support for RGB PNG images (with no alpha channel)
+-endportal.png is no longer included in root directory
+-texture names are aligned with 1.6+/1.7 textures
+-new blocks up to Minecraft 1.7 (packed ice, tall flowers, new flowers, stained glass, stained glass pane)
+-new block type (used for tall flowers)
+-new texture directive (to combine multiple textures in one, to be used for generating tiles)
+
+1.6
+-new blocks up to Minecraft 1.6
+
+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
@@ -116,15 +145,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 +197,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 (textures/ 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.
@@ -179,30 +208,42 @@ are stored in blocks-B.png.  (As more blocks are added to the game, the version
 The selection of block images works thusly:
 
 -If blocks-B.png does not exist, then the tileset you provide will be used to create it.
--If blocks-B.png exists but has an old version, your tileset will be used to fill in any missing
-  (i.e. new) blocks, but the existing portions of blocks-B.png will be preserved.
+-If blocks-B.png exists but has an old version, your tileset will be used to create new replacement. Old blocks-B.png data will be lost.
 -If blocks-B.png exists and is up-to-date, its block images will be used.
 
 This means that pigmap will need your tileset the first time it runs, so it can generate blocks-B.png;
 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).
+To generate blocks-B.png, extract the entity/ and blocks/ folders from your minecraft.jar into textures/ folder inside the folder 
+you have specified, so folder structure looks like this:
+/%specified_image_path%
+    /textures
+        /blocks
+        /entity
 
-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.
+All of these must be RGBA/RGB (32BPP/24BPP) png files.
 
-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:
 
@@ -283,33 +324,26 @@ are redrawn.
 
 ---------------------------------------------------------------------------------------------------
 
+Custom blocks:
+
+1. Textures
+blocktextures.list file is used to declare and pre-process textures, before generating blocks-B.png
+tiles. For more info read blocktextures.list;
+
+2. Blocks
+blockdescriptor.list file is used to declare and describe new blocks by their respective IDs.
+It also describes how blocks look and what textures do they use. Textures must be declared in
+blocktextures.list file. For more info read blockdescriptor.list;
+
+Note: Block IDs >= 256 will be not used by renderer.
+
+---------------------------------------------------------------------------------------------------
+
 Special note for those who choose to manually edit blocks-B.png:
 
-When new block types are introduced, their block images are added on to the end of blocks-B.png,
-and the existing contents are preserved, so you don't need to worry about previous modifications
-getting destroyed.  However, sometimes it may be necessary to remove existing block images and
-replace them with new versions; when this happens, the old block image offset will no longer be
-used, and a new block image will be added to the end of the file.
-
-Example: prior to pigmap 0.6, the furnace block images were located at offsets 68, 69, and 149-152.
-Starting with 0.6, they are instead located at 183-188.  (This is because the furnace graphics
-were changed in Minecraft Beta 1.2.)  So if you modified the furnace block images while using a
-pre-0.6 version of pigmap, your modified images can still be found at their old locations in your
-blocks-B.png, but they must be copied to the new locations.
-
-Complete list of block image moves:
-
---- pigmap 1.2 ---
-gravel: 21->483
-chests: 54->484, 177->485, 297->486, [173-176]->[487,490], [298-301]->[491-494]
-
---- pigmap 1.0 ---
-beds: 232->281, 233->282, 234->283, 235->284, 236->285, 237->286, 238->287, 239->288
-cake: 228->289
-
---- pigmap 0.6 ---
-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
+Block positions in blocks-B.png are dynamic. When new blocks are declared in blockdescriptor.list, 
+old blocks-B.png is overwritten by newly generated. Don't forget to make backups.
+
+Block images are generated in order of appearance in blockdescriptor.list. You can use that to your advantage
+by declaring new blocks at the end of the list. Then you can easily combine old and new ones with image editor,
+as new blocks-B.png will look similar to the old one with new tiles added at the end.