From b174b8c00026253fd40ec262e430b0bb764e31ea Mon Sep 17 00:00:00 2001 From: Alexander M Pickering Date: Sat, 25 Jan 2025 20:40:09 -0600 Subject: work --- data_src/ui/Makefile | 2 +- data_src/ui/fish_blue.png | Bin 0 -> 6541 bytes data_src/ui/fish_purple.png | Bin 0 -> 6450 bytes data_src/ui/hook.png | Bin 0 -> 6346 bytes data_src/ui/ui.png | Bin 16936 -> 15931 bytes data_src/world/Makefile | 45 +++++++++++++++++++++++++++++++++++++++ data_src/world/floor_normal.png | Bin 0 -> 1774570 bytes data_src/world/player_normal.png | Bin 0 -> 3628 bytes data_src/world/rocks_normal.png | Bin 0 -> 1899810 bytes data_src/world/sea_normal.png | Bin 0 -> 1785825 bytes 10 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 data_src/ui/fish_blue.png create mode 100644 data_src/ui/fish_purple.png create mode 100644 data_src/ui/hook.png create mode 100644 data_src/world/Makefile create mode 100644 data_src/world/floor_normal.png create mode 100644 data_src/world/player_normal.png create mode 100644 data_src/world/rocks_normal.png create mode 100644 data_src/world/sea_normal.png (limited to 'data_src') diff --git a/data_src/ui/Makefile b/data_src/ui/Makefile index 69e6436..1a5f6f7 100644 --- a/data_src/ui/Makefile +++ b/data_src/ui/Makefile @@ -2,7 +2,7 @@ MAGICK=magick SED=sed CONVERT=magick -assets_ui=button_up_upper_left.png button_up_upper_right.png button_up_upper_mid.png button_up_mid_left.png button_up_mid_mid.png button_up_mid_right.png button_up_lower_left.png button_up_lower_mid.png button_up_lower_right.png button_down_upper_left.png button_down_upper_right.png button_down_upper_mid.png button_down_mid_left.png button_down_mid_mid.png button_down_mid_right.png button_down_lower_left.png button_down_lower_mid.png button_down_lower_right.png +assets_ui=button_up_upper_left.png button_up_upper_right.png button_up_upper_mid.png button_up_mid_left.png button_up_mid_mid.png button_up_mid_right.png button_up_lower_left.png button_up_lower_mid.png button_up_lower_right.png button_down_upper_left.png button_down_upper_right.png button_down_upper_mid.png button_down_mid_left.png button_down_mid_mid.png button_down_mid_right.png button_down_lower_left.png button_down_lower_mid.png button_down_lower_right.png hook.png fish_blue.png fish_purple.png assets_ui_built=$(assets_ui:%=data_src/ui/%) assets_ui_src=data_src/ui/ui.png data_src/ui/Makefile data_src/ui/ui_raw.png diff --git a/data_src/ui/fish_blue.png b/data_src/ui/fish_blue.png new file mode 100644 index 0000000..3260feb Binary files /dev/null and b/data_src/ui/fish_blue.png differ diff --git a/data_src/ui/fish_purple.png b/data_src/ui/fish_purple.png new file mode 100644 index 0000000..1365133 Binary files /dev/null and b/data_src/ui/fish_purple.png differ diff --git a/data_src/ui/hook.png b/data_src/ui/hook.png new file mode 100644 index 0000000..d5f2f70 Binary files /dev/null and b/data_src/ui/hook.png differ diff --git a/data_src/ui/ui.png b/data_src/ui/ui.png index 302e060..c6f46be 100644 Binary files a/data_src/ui/ui.png and b/data_src/ui/ui.png differ diff --git a/data_src/world/Makefile b/data_src/world/Makefile new file mode 100644 index 0000000..24e972b --- /dev/null +++ b/data_src/world/Makefile @@ -0,0 +1,45 @@ +MAGICK=magick +SED=sed + +assets_world=$(filter-out data_src/world/sprites.png, $(wildcard data_src/world/*.png)) +# assets_world_diffuse=$(assets_world:%.png=data_src/world/%_diffuse.png) +# assets_world_normal=$(assets_world:%.png=data_src/world/%_normal.png) +# assets_world_emissive=$(assets_world:%.png=data_src/world/%_emissive.png) +assets_world_built=data/world/sprites.png data/world/sprites.lua +# assets_world_all=$(assets_world_diffuse) $(assets_world_normal) $(assets_world_emissive) +# assets_world_src=data_src/world/albedo.tga data_src/world/emission.png data_src/world/normalmap.png data_src/world/Makefile data_src/palette_trans.png + +all: data/world/sprites.png data/world/sprites.lua + +data_src/world/sprites.png data_src/world/sprites.lua: $(assets_world) data_src/world/Makefile + $(AMULET) pack -png data_src/world/sprites.png -lua data_src/world/sprites.lua $(assets_world) + $(SED) -i 's;data_src/;;g' data_src/world/sprites.lua + $(SED) -i 's;data/;;g' data_src/world/sprites.lua + +$(assets_world_built) : data/world/% : data_src/world/% $(assets_world_src) + $(CP) $< $@ + +# data_src/world/albedo.png : $(assets_world_src) +# $(MAGICK) data_src/world/albedo.tga -scale 1024 $(MAGICKFLAGS) $@ +# +# # Wall1 - 2867.13, 3683.68 +# data_src/world/floor1_diffuse.png : $(assets_world_src) data_src/world/albedo.png +# $(MAGICK) data_src/world/albedo.png -crop 104x104+305+614 $@ +# +# data_src/world/floor1_normal.png: $(assets_world_src) data_src/world/normalmap.png +# $(MAGICK) data_src/world/normalmap.png -crop 104x104+305+614 $@ +# +# data_src/world/floor1_emissive.png : $(assets_world_src) data_src/world/emission.png +# $(MAGICK) data_src/world/emission.png -crop 104x104+305+614 $@ +# +# data_src/world/wall1_diffuse.png : $(assets_world_src) data_src/world/albedo.png +# $(MAGICK) data_src/world/albedo.png -crop 205x205+614+1 $@ +# +# data_src/world/wall1_normal.png : $(assets_world_src) data_src/world/normals.png +# $(MAGICK) data_src/world/normals.png -crop 205x205+614+1 $@ +# +# data_src/world/wall1_emissive.png : $(assets_world_src) data_src/world/glows.png +# $(MAGICK) data_src/world/glows.png -crop 205x205+614+1 $@ +# +# data_src/world/guy_diffuse.png : data_src/world/guy.png +# $(MAGICK) data_src/world/guy.png -colorspace gray -auto-level -dither FloydSteinberg -remap data_src/palette_trans.png $@ diff --git a/data_src/world/floor_normal.png b/data_src/world/floor_normal.png new file mode 100644 index 0000000..a8b1499 Binary files /dev/null and b/data_src/world/floor_normal.png differ diff --git a/data_src/world/player_normal.png b/data_src/world/player_normal.png new file mode 100644 index 0000000..3d8d384 Binary files /dev/null and b/data_src/world/player_normal.png differ diff --git a/data_src/world/rocks_normal.png b/data_src/world/rocks_normal.png new file mode 100644 index 0000000..b03e87c Binary files /dev/null and b/data_src/world/rocks_normal.png differ diff --git a/data_src/world/sea_normal.png b/data_src/world/sea_normal.png new file mode 100644 index 0000000..8298bf6 Binary files /dev/null and b/data_src/world/sea_normal.png differ -- cgit v1.2.3-70-g09d2