Merge pull request #6 from mwpenny/build-time-assets

Get all textures from VPK

Makefile

@@ -207,6 +207,14 @@ portal_pak_dir/materials/signage/indicator_lights/indicator_lights_floor.png: po
 portal_pak_dir/materials/signage/indicator_lights/indicator_lights_floor_on.png: portal_pak_dir/materials/signage/indicator_lights/indicator_lights_corner_floor_on.png
 portal_pak_dir/materials/models/props/round_elevator_sheet_1.png: portal_pak_dir/materials/models/props/round_elevator_sheet_3.png
 
+portal_pak_dir/materials/signage/clock/clock_digits.png: portal_pak_dir/materials/signage/clock/countdown.vtf portal_pak_dir/materials/signage/clock/clock_dots.png
+	for i in $(shell seq 0 9); do \
+		$(VTF2PNG) -f $$((60 - $$i)) portal_pak_dir/materials/signage/clock/countdown.vtf $(@D)/$$i.png; \
+	done
+	convert $(@D)/[0-9].png -crop 64x128+64+0 +append $@
+	convert $@ $(@D)/clock_dots.png -background '#e9fbff' +smush +16 -extent 704x128 $@
+	rm $(@D)/[0-9].png
+
 convert_all_png: $(ALL_PNG_IMAGES)
 
 portal_pak_dir/%_copy_0.png: portal_pak_dir/%.png

assets/materials/ball_catcher.skm.yaml

@@ -17,7 +17,7 @@ materials:
           wrap: false
         t:
           wrap: false
-      - filename: ./models/props/combine_ball_catcher.png
+      - filename: ../../portal_pak_modified/materials/models/props/combine_ball_launcher.png
         fmt: G_IM_FMT_RGBA
         siz: G_IM_SIZ_16b
         tmem: 384
@@ -53,7 +53,7 @@ materials:
           wrap: false
         t:
           wrap: false
-      - filename: ./models/props/combine_ball_catcher.png
+      - filename: ../../portal_pak_modified/materials/models/props/combine_ball_launcher.png
         fmt: G_IM_FMT_RGBA
         siz: G_IM_SIZ_16b
         tmem: 384
@@ -89,7 +89,7 @@ materials:
           wrap: false
         t:
           wrap: false
-      - filename: ./models/props/combine_ball_catcher.png
+      - filename: ../../portal_pak_modified/materials/models/props/combine_ball_launcher.png
         fmt: G_IM_FMT_RGBA
         siz: G_IM_SIZ_16b
         tmem: 384
@@ -126,7 +126,7 @@ materials:
           wrap: false
         t:
           wrap: false
-      - filename: ./models/props/combine_ball_catcher.png
+      - filename: ../../portal_pak_modified/materials/models/props/combine_ball_launcher.png
         fmt: G_IM_FMT_RGBA
         siz: G_IM_SIZ_16b
         tmem: 384
@@ -163,7 +163,7 @@ materials:
           wrap: false
         t:
           wrap: false
-      - filename: ./models/props/combine_ball_catcher.png
+      - filename: ../../portal_pak_modified/materials/models/props/combine_ball_launcher.png
         fmt: G_IM_FMT_RGBA
         siz: G_IM_SIZ_16b
         tmem: 384
@@ -198,7 +198,7 @@ materials:
           wrap: false
         t:
           wrap: false
-      - filename: ./models/props/combine_ball_catcher.png
+      - filename: ../../portal_pak_modified/materials/models/props/combine_ball_launcher.png
         fmt: G_IM_FMT_RGBA
         siz: G_IM_SIZ_16b
         tmem: 384
@@ -233,7 +233,7 @@ materials:
           wrap: false
         t:
           wrap: false
-      - filename: ./models/props/combine_ball_catcher.png
+      - filename: ../../portal_pak_modified/materials/models/props/combine_ball_launcher.png
         fmt: G_IM_FMT_RGBA
         siz: G_IM_SIZ_16b
         tmem: 384

assets/materials/chell.skm.yaml

@@ -1,7 +1,7 @@
 materials:
   chell_face:
     gDPSetTile: 
-      filename: ./models/player/chell_face.png
+      filename: ../../portal_pak_modified/materials/models/player/chell_face.png
       siz: G_IM_SIZ_16b
       s:
         wrap: false
@@ -16,7 +16,7 @@ materials:
 
   chell_head:
     gDPSetTile: 
-      filename: ./models/player/chell_head.png
+      filename: ../../portal_pak_modified/materials/models/player/chell_head.png
       siz: G_IM_SIZ_16b
       s:
         wrap: false
@@ -31,7 +31,7 @@ materials:
 
   chell_pants:
     gDPSetTile: 
-      filename: ./models/player/chell_pants.png
+      filename: ../../portal_pak_modified/materials/models/player/chell_pants.png
       siz: G_IM_SIZ_16b
       s:
         wrap: false
@@ -46,7 +46,7 @@ materials:
 
   chell_shirt:
     gDPSetTile: 
-      filename: ./models/player/chell_shirt.png
+      filename: ../../portal_pak_modified/materials/models/player/chell_body.png
       siz: G_IM_SIZ_16b
       s:
         wrap: false
@@ -61,7 +61,7 @@ materials:
 
   chell_back_logo:
     gDPSetTile: 
-      filename: ./models/player/chell_back_logo.png
+      filename: ../../portal_pak_modified/materials/models/player/chell_back_logo.png
       siz: G_IM_SIZ_16b
       s:
         wrap: false
@@ -91,7 +91,7 @@ materials:
 
   chell_arm:
     gDPSetTile: 
-      filename: ./models/player/chell_shirt.png
+      filename: ../../portal_pak_modified/materials/models/player/chell_body.png
       siz: G_IM_SIZ_16b
 
     gDPSetCombineMode:
@@ -110,7 +110,7 @@ materials:
 
   chell_leg:
     gDPSetTile: 
-      filename: ./models/player/chell_pants.png
+      filename: ../../portal_pak_modified/materials/models/player/chell_pants.png
       siz: G_IM_SIZ_16b
 
     gDPSetCombineMode:
@@ -129,7 +129,7 @@ materials:
 
   chell_boots_white:
     gDPSetTile: 
-      filename: ./models/player/chell_pants.png
+      filename: ../../portal_pak_modified/materials/models/player/chell_pants.png
       siz: G_IM_SIZ_16b
 
     gDPSetCombineMode:
@@ -148,7 +148,7 @@ materials:
 
   chell_boots_black:
     gDPSetTile: 
-      filename: ./models/player/chell_pants.png
+      filename: ../../portal_pak_modified/materials/models/player/chell_pants.png
       siz: G_IM_SIZ_16b
 
     gDPSetCombineMode:

assets/materials/models/player/chell_body.ims

@@ -0,0 +1,28 @@
+\(
+    +clone
+    -crop 348x348+879+180
+    -resize 32x32
+    -write portal_pak_modified/materials/models/player/chell_back_logo.png
+    +delete
+\)
+\(
+    +clone
+    -rotate -17
+    -crop 388x766+230+929
+    -resize 32x64
+    -fill '#392821'
+    -draw 'rectangle 0,0 21,2'
+    -draw 'point 22,1'
+    -fill '#8c8a84'
+    -draw 'line 0,1 21,1'
+    -fill '#512818'
+    -draw 'point 22,0'
+    -fill '#5c2e1b'
+    -draw 'point 22,2'
+    -write portal_pak_modified/materials/models/player/chell_pants.png
+    +delete
+\)
+-fill '#914421'
+-draw 'polygon 227,194 197,73 280,38 321,142'
+-crop 273x546+113+39
+-resize 32x64

assets/materials/models/player/chell_face.ims

@@ -0,0 +1,54 @@
+\(
+    +clone
+    \(
+        +clone
+        \(
+            +clone
+            -evaluate set 0
+            -fill white
+            -strokewidth 4
+            -stroke '#808080'
+            -draw 'polygon 521,1000 520,919 526,889 541,853 563,831 580,823 607,823 635,833 650,853 657,906 642,958 614,988 584,1000 551,1004'
+        \)
+        -alpha off
+        -compose CopyOpacity
+        -composite
+        -crop 155x210+510+808
+    \)
+    -compose Over
+    -geometry +761+229
+    -composite
+    -crop 265x530+678+65
+    -resize 32x64
+    -write portal_pak_modified/materials/models/player/chell_head.png
+    +delete
+\)
+\(
+    +clone
+    \(
+        +clone
+        -evaluate set 0
+        -fill white
+        -strokewidth 4
+        -stroke '#808080'
+        -draw 'polygon 966,81 974,79 986,90 1004,100 1013,112 1017,135 1013,160 1003,160 988,152 978,141 971,117 962,88'
+    \)
+    -alpha off
+    -compose CopyOpacity
+    -composite
+    -crop 60x90+960+75
+    -background none
+    -rotate 291
+\)
+-compose Over
+-geometry +537+213
+-composite
+-crop 265x530+513+65
+-resize 32x64
+-fill '#6f3532'
+-draw 'point 0,47'
+-fill '#824545'
+-draw 'point 0,48'
+-draw 'point 1,48'
+-fill '#b37474'
+-draw 'point 0,49'

assets/materials/models/props/autoportal_frame/autoportal_frame.ims

@@ -0,0 +1,6 @@
+-alpha off
+    \( -clone 0 -crop 17x16+171+243 -repage +0+0 \)
+    \( -clone 0 -crop 38x16+90+233 -repage +17+0 \)
+    \( -clone 0 -crop 9x16+240+192 -repage +55+0 \)
+    -layers merge
+    -crop 64x16+0+0

assets/materials/models/props/combine_ball_launcher.ims

@@ -0,0 +1,10 @@
+-alpha off
+    \( -clone 0 -crop 64x32+366+359 -resize 32x16 -repage +0+0 \)
+    \( -clone 0 -crop 52x43+248+158 -fuzz 25% -fill transparent -opaque black -flip -resize 19x15 -repage +0+1 \)
+    -compose Over
+    -layers merge
+    -crop 32x16+0+0
+    -fill 'rgba(107,214,250,0.8)'
+    -draw 'line 16,8 29,8'
+    -fill 'rgba(102,111,109,0.8)'
+    -draw 'line 0,0 32,0'

assets/materials/models/props/metal_box.ims

@@ -0,0 +1,46 @@
+\( -clone 0 -alpha off -fuzz 50% -fuzz 50% -fill '#97a19f' -opaque black -alpha on \)
+\( -clone 0 -fill '#495254' -draw 'rectangle 0,0 512,512' \)
+\(
+    -clone 1 -crop 144x144+15+42 -resize 89x89 -repage +0+0
+    \( -clone 0 -repage +0+0 \)
+    \( -clone 0 -flop -repage +167+0 \)
+    \( -clone 0 -rotate 180 -repage +167+167 \)
+    \( -clone 0 -flip -repage +0+167 \)
+    -delete 0
+\)
+\(
+    -clone 1 -crop 85x53+207+409 -resize 66x41 -rotate 180
+    -fill '#5d6463'
+    -draw 'polygon 0,24 0,41 15,41'
+    -draw 'polygon 70,24 70,41 51,41'
+    \( -clone 0 -repage +95+0 \)
+    \( -clone 0 -rotate 90 -repage +215+95 \)
+    \( -clone 0 -rotate 180 -repage +95+215 \)
+    \( -clone 0 -rotate 270 -repage +0+95 \)
+    -delete 0
+\)
+\( -clone 1 -evaluate set 0 -fill '#5d6463' -draw 'circle 128,128,128,217' -blur 2x4 \)
+\(
+    -clone 0 -crop 4x18+493+352 -resize 8x36
+    \( -clone 0 -repage +124+39 \)
+    \( -clone 0 -rotate 90 -repage +183+124 \)
+    \( -clone 0 -rotate 180 -repage +124+183 \)
+    \( -clone 0 -rotate 270 -repage +39+124 \)
+    -delete 0
+\)
+\( -clone 1 -evaluate set 0 -fill 'rgba(0,0,0,0.5)' -draw 'circle 128,128,128,184' -blur 0x4 \)
+\(
+    -clone 1
+    \( +clone -evaluate set 0 -fill white -draw 'circle 255,240,255,319' \)
+    -alpha off
+    -compose CopyOpacity
+    -composite
+    -crop 166x166+172+157
+    -resize 112x112
+    -repage +72+72
+\)
+-compose Over
+-layers merge
+-crop 128x128+0+0
++repage
+-resize 32x32

assets/materials/signage/clock/clock_digits.ims

@@ -0,0 +1 @@
+-resize 176x32

assets/materials/static.skm.yaml

@@ -426,7 +426,7 @@ materials:
 
   autoportal_frame:
     gDPSetTile:
-      filename: ./props/autoportal_frame/autoportal_frame.png
+      filename: ../../portal_pak_modified/materials/models/props/autoportal_frame/autoportal_frame.png
       siz: G_IM_SIZ_16b
 
     gDPSetCombineMode: G_CC_DECALRGBA
@@ -435,8 +435,7 @@ materials:
     
   cube:
     gDPSetTile: 
-      filename:
-        ../images/cube.png
+      filename: ../../portal_pak_modified/materials/models/props/metal_box.png
       siz: G_IM_SIZ_16b
       fmt: G_IM_FMT_RGBA
       s:
@@ -450,8 +449,7 @@ materials:
 
   cube_fizzled:
     gDPSetTile: 
-      filename:
-        ../images/cube.png
+      filename: ../../portal_pak_modified/materials/models/props/metal_box.png
       siz: G_IM_SIZ_16b
       fmt: G_IM_FMT_RGBA
       s:
@@ -878,7 +876,7 @@ materials:
           wrap: false
         t:
           wrap: false
-      - filename: ./models/props/combine_ball_catcher.png
+      - filename: ../../portal_pak_modified/materials/models/props/combine_ball_launcher.png
         fmt: G_IM_FMT_RGBA
         siz: G_IM_SIZ_16b
         tmem: 384
@@ -1062,7 +1060,7 @@ materials:
 
   clock_digits:
     gDPSetTile:
-      filename: ./signage/clock_digits.png
+      filename: ../../portal_pak_modified/materials/signage/clock/clock_digits.png
       siz: G_IM_SIZ_4b
       twoTone: true