aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Kramkowski <tk@the-tk.com>2018-03-28 13:46:10 +0100
committerTomasz Kramkowski <tk@the-tk.com>2018-03-28 13:47:43 +0100
commit93c76bf190d843ef77c71682570f28e9fb871a08 (patch)
treed5e414a5977810c83d1a8d694a4d4891eda18481
parent3021fd4751ec23b5252e10308480179204e60ef7 (diff)
downloadfaqe-93c76bf190d843ef77c71682570f28e9fb871a08.tar.gz
faqe-93c76bf190d843ef77c71682570f28e9fb871a08.tar.xz
faqe-93c76bf190d843ef77c71682570f28e9fb871a08.zip
Remote texture assets can now be included in the project.
-rw-r--r--assets.mk4
-rw-r--r--tex/.gitignore5
-rw-r--r--tex/grass.png.src1
-rw-r--r--tex/tex.mk7
-rw-r--r--tex/wood.png.src1
5 files changed, 17 insertions, 1 deletions
diff --git a/assets.mk b/assets.mk
index cdb2c8a..a4ea512 100644
--- a/assets.mk
+++ b/assets.mk
@@ -1,4 +1,6 @@
-ASSETS := vert.glsl frag.glsl
+include tex/tex.mk
+
+ASSETS := vert.glsl frag.glsl $(TEX)
OBJ += assets.o assets_data.o
CLEAN += assets.bie assets.idx
diff --git a/tex/.gitignore b/tex/.gitignore
new file mode 100644
index 0000000..24f0871
--- /dev/null
+++ b/tex/.gitignore
@@ -0,0 +1,5 @@
+*
+!.gitignore
+!fetch.sh
+!tex.mk
+!*.src
diff --git a/tex/grass.png.src b/tex/grass.png.src
new file mode 100644
index 0000000..4bb70ef
--- /dev/null
+++ b/tex/grass.png.src
@@ -0,0 +1 @@
+https://opengameart.org/sites/default/files/oga-textures/grass1.png
diff --git a/tex/tex.mk b/tex/tex.mk
new file mode 100644
index 0000000..d723983
--- /dev/null
+++ b/tex/tex.mk
@@ -0,0 +1,7 @@
+TEX := wood.png grass.png
+
+TEX_PATH := $(dir $(lastword $(MAKEFILE_LIST)))
+TEX := $(addprefix $(TEX_PATH), $(TEX))
+
+%: %.src
+ curl -o "$@" "$(shell cat $<)"
diff --git a/tex/wood.png.src b/tex/wood.png.src
new file mode 100644
index 0000000..325453d
--- /dev/null
+++ b/tex/wood.png.src
@@ -0,0 +1 @@
+https://opengameart.org/sites/default/files/oga-textures/wood%20floor%202.png