From: adrianna Date: Wed, 2 Mar 2016 21:19:57 +0000 (+0200) Subject: wall and floor tiles; not hooked up yet X-Git-Url: https://git.ctpug.org.za/?p=koperkapel.git;a=commitdiff_plain;h=58fb4f3b150efc2b27892dd258e4e71ee27fb868 wall and floor tiles; not hooked up yet --- diff --git a/koperkapel/images/Makefile b/koperkapel/images/Makefile index 5a74a33..d6c28b9 100644 --- a/koperkapel/images/Makefile +++ b/koperkapel/images/Makefile @@ -1,12 +1,24 @@ -VPATH=../../sources/vector +VPATH=../../sources + +# Vector tiles TILE_DIRS=roach -TILE_SVGS=$(shell find $(patsubst %, $(VPATH)/%, $(TILE_DIRS)) -name "*.svg") -TILE_PNGS=$(patsubst $(VPATH)/%.svg, %.png, $(TILE_SVGS)) +TILE_SVGS=$(shell find $(patsubst %, $(VPATH)/vector/%, $(TILE_DIRS)) -name "*.svg") +TILE_PNGS=$(patsubst $(VPATH)/vector/%.svg, %.png, $(TILE_SVGS)) + +# Bitmap tiles + +BTILE_DIRS=wall floor +BTILE_SRC=$(shell find $(patsubst %, $(VPATH)/bitmap/%, $(BTILE_DIRS)) -name "*.png") +BTILE_PNGS=$(patsubst $(VPATH)/bitmap/%, %, $(BTILE_SRC)) + +# Vector images to rasterize without resizing SIMPLE_DIRS=roach_management -SIMPLE_SVGS=$(shell find $(patsubst %, $(VPATH)/%, $(SIMPLE_DIRS)) -name "*.svg") -SIMPLE_PNGS=$(patsubst $(VPATH)/%.svg, %.png, $(SIMPLE_SVGS)) +SIMPLE_SVGS=$(shell find $(patsubst %, $(VPATH)/vector/%, $(SIMPLE_DIRS)) -name "*.svg") +SIMPLE_PNGS=$(patsubst $(VPATH)/vector/%.svg, %.png, $(SIMPLE_SVGS)) + +# Aggregate cockroach sprites ROACH=$(filter roach/%, $(TILE_PNGS)) ROACH_32=$(patsubst roach/%, roach_32/%, $(ROACH)) @@ -14,36 +26,48 @@ ROACH_21=$(patsubst roach/%, roach_21/%, $(ROACH)) ROACH_QUARTET=$(patsubst roach/%, roach_quartet/%, $(ROACH)) ROACH_NONET=$(patsubst roach/%, roach_nonet/%, $(ROACH)) -all: $(TILE_PNGS) $(SIMPLE_PNGS)\ +# Default target with everything + +all: $(TILE_PNGS) $(BTILE_PNGS) $(SIMPLE_PNGS)\ $(ROACH_32) $(ROACH_21) $(ROACH_QUARTET) $(ROACH_NONET) -# Tile rules +# Vector tile rule define tile -$(1)/%.png: $(1)/%.svg +$(1)/%.png: vector/$(1)/%.svg @mkdir -p `dirname $$@` @inkscape -z -e $$@ -w 64 -h 64 $$< endef $(foreach tiledir,$(TILE_DIRS),$(eval $(call tile,$(tiledir)))) -# Simple rules +# No resize rule define simple -$(1)/%.png: $(1)/%.svg +$(1)/%.png: vector/$(1)/%.svg @mkdir -p `dirname $$@` @inkscape -z -e $$@ $$< endef $(foreach simpledir,$(SIMPLE_DIRS),$(eval $(call simple,$(simpledir)))) +# Bitmap tile rule + +define btile +$(1)/%.png: bitmap/$(1)/%.png + @mkdir -p `dirname $$@` + @convert $$< -resize 64x64 $$@ +endef + +$(foreach tiledir,$(BTILE_DIRS),$(eval $(call btile,$(tiledir)))) + # Smaller roaches -roach_32/%.png: roach/%.svg +roach_32/%.png: vector/roach/%.svg @mkdir -p `dirname $@` @inkscape -z -e $@ -w 32 -h 32 $< -roach_21/%.png: roach/%.svg +roach_21/%.png: vector/roach/%.svg @mkdir -p `dirname $@` @inkscape -z -e $@ -w 21 -h 21 $< diff --git a/koperkapel/images/floor/floor_1.png b/koperkapel/images/floor/floor_1.png new file mode 100644 index 0000000..96f3139 Binary files /dev/null and b/koperkapel/images/floor/floor_1.png differ diff --git a/koperkapel/images/floor/floor_2.png b/koperkapel/images/floor/floor_2.png new file mode 100644 index 0000000..b0973ea Binary files /dev/null and b/koperkapel/images/floor/floor_2.png differ diff --git a/koperkapel/images/floor/floor_3.png b/koperkapel/images/floor/floor_3.png new file mode 100644 index 0000000..8c68a30 Binary files /dev/null and b/koperkapel/images/floor/floor_3.png differ diff --git a/koperkapel/images/floor/floor_4.png b/koperkapel/images/floor/floor_4.png new file mode 100644 index 0000000..f5c96ce Binary files /dev/null and b/koperkapel/images/floor/floor_4.png differ diff --git a/koperkapel/images/wall/wall_1.png b/koperkapel/images/wall/wall_1.png new file mode 100644 index 0000000..ce5e107 Binary files /dev/null and b/koperkapel/images/wall/wall_1.png differ diff --git a/koperkapel/images/wall/wall_2.png b/koperkapel/images/wall/wall_2.png new file mode 100644 index 0000000..7d26151 Binary files /dev/null and b/koperkapel/images/wall/wall_2.png differ diff --git a/koperkapel/images/wall/wall_3.png b/koperkapel/images/wall/wall_3.png new file mode 100644 index 0000000..c96cd81 Binary files /dev/null and b/koperkapel/images/wall/wall_3.png differ diff --git a/koperkapel/images/wall/wall_4.png b/koperkapel/images/wall/wall_4.png new file mode 100644 index 0000000..782462c Binary files /dev/null and b/koperkapel/images/wall/wall_4.png differ diff --git a/sources/bitmap/floor/floor_1.png b/sources/bitmap/floor/floor_1.png new file mode 100644 index 0000000..1d83f60 Binary files /dev/null and b/sources/bitmap/floor/floor_1.png differ diff --git a/sources/bitmap/floor/floor_2.png b/sources/bitmap/floor/floor_2.png new file mode 100644 index 0000000..865258d Binary files /dev/null and b/sources/bitmap/floor/floor_2.png differ diff --git a/sources/bitmap/floor/floor_3.png b/sources/bitmap/floor/floor_3.png new file mode 100644 index 0000000..8ffa016 Binary files /dev/null and b/sources/bitmap/floor/floor_3.png differ diff --git a/sources/bitmap/floor/floor_4.png b/sources/bitmap/floor/floor_4.png new file mode 100644 index 0000000..c1a688e Binary files /dev/null and b/sources/bitmap/floor/floor_4.png differ diff --git a/sources/bitmap/wall/wall_1.png b/sources/bitmap/wall/wall_1.png new file mode 100644 index 0000000..530a69e Binary files /dev/null and b/sources/bitmap/wall/wall_1.png differ diff --git a/sources/bitmap/wall/wall_2.png b/sources/bitmap/wall/wall_2.png new file mode 100644 index 0000000..310d7d0 Binary files /dev/null and b/sources/bitmap/wall/wall_2.png differ diff --git a/sources/bitmap/wall/wall_3.png b/sources/bitmap/wall/wall_3.png new file mode 100644 index 0000000..e9de14c Binary files /dev/null and b/sources/bitmap/wall/wall_3.png differ diff --git a/sources/bitmap/wall/wall_4.png b/sources/bitmap/wall/wall_4.png new file mode 100644 index 0000000..c72c1db Binary files /dev/null and b/sources/bitmap/wall/wall_4.png differ diff --git a/sources/images/Concrete_Casting_Defect_Blowhole.jpg b/sources/images/Concrete_Casting_Defect_Blowhole.jpg new file mode 100644 index 0000000..b31fde3 Binary files /dev/null and b/sources/images/Concrete_Casting_Defect_Blowhole.jpg differ diff --git a/sources/images/Concrete_aggregate_grinding.jpg b/sources/images/Concrete_aggregate_grinding.jpg new file mode 100644 index 0000000..fa24b07 Binary files /dev/null and b/sources/images/Concrete_aggregate_grinding.jpg differ diff --git a/sources/images/source.txt b/sources/images/source.txt index 089ba27..eb9f047 100644 --- a/sources/images/source.txt +++ b/sources/images/source.txt @@ -6,3 +6,7 @@ https://fr.wikipedia.org/wiki/Projet:Biologie/Illustrations/Insectes/Histoire_ph The placeholder tile images floor.png and cwall.png are from the public domain roguelike tileset "RLTiles". You can find the original tileset at: http://rltiles.sf.net + +Wall and floor tiles: +https://commons.wikimedia.org/wiki/File:Concrete_aggregate_grinding.JPG +https://commons.wikimedia.org/wiki/File:Concrete_Casting_Defect_Blowhole.jpg