From 12f1332d9d821d23f8b695fcdb3bba7e9d783093 Mon Sep 17 00:00:00 2001 From: Matt Penny Date: Tue, 3 Sep 2024 21:29:44 -0400 Subject: [PATCH] Copy awe_total via .ims file, not makefile Simplifies asset conversion for CMake transition --- Makefile | 9 ---- .../models/props_animsigns/awe_total.ims | 46 +++++++++++++++++++ .../props_animsigns/awe_total_copy_0.ims | 1 - .../props_animsigns/awe_total_copy_1.ims | 20 -------- .../props_animsigns/awe_total_copy_2.ims | 1 - 5 files changed, 46 insertions(+), 31 deletions(-) delete mode 100644 assets/materials/models/props_animsigns/awe_total_copy_0.ims delete mode 100644 assets/materials/models/props_animsigns/awe_total_copy_1.ims delete mode 100644 assets/materials/models/props_animsigns/awe_total_copy_2.ims diff --git a/Makefile b/Makefile index 8bbca3c..a7c80d6 100644 --- a/Makefile +++ b/Makefile @@ -235,15 +235,6 @@ portal_pak_dir/materials/signage/clock/clock_digits.png: portal_pak_dir/material convert_all_png: $(ALL_PNG_IMAGES) -portal_pak_dir/%_copy_0.png: portal_pak_dir/%.png - cp $< $@ - -portal_pak_dir/%_copy_1.png: portal_pak_dir/%.png - cp $< $@ - -portal_pak_dir/%_copy_2.png: portal_pak_dir/%.png - cp $< $@ - portal_pak_modified/%.png: portal_pak_dir/%.png assets/%.ims @mkdir -p $(@D) convert $< $(shell cat $(@:portal_pak_modified/%.png=assets/%.ims)) $@ diff --git a/assets/materials/models/props_animsigns/awe_total.ims b/assets/materials/models/props_animsigns/awe_total.ims index fa09ec0..574ce35 100644 --- a/assets/materials/models/props_animsigns/awe_total.ims +++ b/assets/materials/models/props_animsigns/awe_total.ims @@ -1 +1,47 @@ +\( + +clone + + -alpha extract -crop 154x1024+1894+0 -resize 32x212 + + -write portal_pak_modified/materials/models/props_animsigns/awe_total_copy_0.png + +delete +\) + +\( + +clone + + -alpha extract + \( +clone -crop 436x146+1061+438 -rotate 90 \) -insert 0 + \( +clone -crop 146x436+1463+147 \) -insert 1 + \( +clone -crop 146x436+1609+147 \) -insert 2 + \( +clone -crop 146x436+1755+147 \) -insert 3 + \( +clone -crop 146x436+1025+583 \) -insert 4 + \( +clone -crop 146x436+1171+583 \) -insert 5 + \( +clone -crop 146x436+1317+583 \) -insert 6 + \( +clone -crop 146x436+1463+583 \) -insert 7 + \( +clone -crop 146x436+1609+583 \) -insert 8 + \( +clone -crop 146x436+1755+583 \) -insert 9 + +append + +repage + -crop 1460x436+0+0 + -fill black + -background black + -draw 'rectangle 141,310 189,424' + -draw 'rectangle 1447,337 1460,404' + -resize 140x + -extent 144x + + -write portal_pak_modified/materials/models/props_animsigns/awe_total_copy_1.png + +delete +\) + +\( + +clone + + -alpha extract -crop 342x682+682+342 -resize 32x64 + + -write portal_pak_modified/materials/models/props_animsigns/awe_total_copy_2.png + +delete +\) + -alpha extract \( +clone -crop 682x342+682+0 \) -gravity west -append -crop 682x1364+0+0 -resize 64x128 \ No newline at end of file diff --git a/assets/materials/models/props_animsigns/awe_total_copy_0.ims b/assets/materials/models/props_animsigns/awe_total_copy_0.ims deleted file mode 100644 index d603a78..0000000 --- a/assets/materials/models/props_animsigns/awe_total_copy_0.ims +++ /dev/null @@ -1 +0,0 @@ --alpha extract -crop 154x1024+1894+0 -resize 32x212 \ No newline at end of file diff --git a/assets/materials/models/props_animsigns/awe_total_copy_1.ims b/assets/materials/models/props_animsigns/awe_total_copy_1.ims deleted file mode 100644 index 20df0fd..0000000 --- a/assets/materials/models/props_animsigns/awe_total_copy_1.ims +++ /dev/null @@ -1,20 +0,0 @@ --alpha extract - \( +clone -crop 436x146+1061+438 -rotate 90 \) -insert 0 - \( +clone -crop 146x436+1463+147 \) -insert 1 - \( +clone -crop 146x436+1609+147 \) -insert 2 - \( +clone -crop 146x436+1755+147 \) -insert 3 - \( +clone -crop 146x436+1025+583 \) -insert 4 - \( +clone -crop 146x436+1171+583 \) -insert 5 - \( +clone -crop 146x436+1317+583 \) -insert 6 - \( +clone -crop 146x436+1463+583 \) -insert 7 - \( +clone -crop 146x436+1609+583 \) -insert 8 - \( +clone -crop 146x436+1755+583 \) -insert 9 - +append - +repage - -crop 1460x436+0+0 - -fill black - -background black - -draw 'rectangle 141,310 189,424' - -draw 'rectangle 1447,337 1460,404' - -resize 140x - -extent 144x \ No newline at end of file diff --git a/assets/materials/models/props_animsigns/awe_total_copy_2.ims b/assets/materials/models/props_animsigns/awe_total_copy_2.ims deleted file mode 100644 index 96a84f4..0000000 --- a/assets/materials/models/props_animsigns/awe_total_copy_2.ims +++ /dev/null @@ -1 +0,0 @@ --alpha extract -crop 342x682+682+342 -resize 32x64 \ No newline at end of file