From 20d35ad6534c8efabb2222b3fb373728bf73c85a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= <zaklaus@outlook.com>
Date: Sun, 16 Oct 2022 15:31:07 +0200
Subject: [PATCH] push water tex

---
 art/gen/water0.png                        | Bin 0 -> 581 bytes
 art/gen/water1.png                        | Bin 0 -> 624 bytes
 art/gen/water2.png                        | Bin 0 -> 156 bytes
 code/foundation/src/gen/texgen_fallback.c |   4 +---
 code/foundation/src/models/assets.c       |   2 +-
 code/games/sandbox/src/worldgen.c         |   2 +-
 6 files changed, 3 insertions(+), 5 deletions(-)
 create mode 100644 art/gen/water0.png
 create mode 100644 art/gen/water1.png
 create mode 100644 art/gen/water2.png

diff --git a/art/gen/water0.png b/art/gen/water0.png
new file mode 100644
index 0000000000000000000000000000000000000000..9193c20e03a4b21d37d07715e40e6effc21be9e0
GIT binary patch
literal 581
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1SD0tpLH@YF!6Z0IEG|2zMbyfciTX~W%ZAV
zkLMUYKV4Wfqe5rX?oAWYA8<}MvdPtu>BoXrv$o$W?Q=fe{w{A}w6L6Ey%9^5F)Avq
zX#8@jUzLH0VbbiD&GV)kIWQ$0fAKMfO~sQdr9*LoP|Tz)l?DAD<}ffE5m+`Ss7G&V
z*3ucLzn?!=#i+D&Lh_uTIYs9*xpth{yt_JA;KBZi5C;ZECd0PibI*h4C3PttahUM#
zpBPud1dn%-KCg`?1l!clJQqB#sLwE9Lde;(f9u~fdh(pnth4o9t{FJx$-14lo?7ic
zyLqPm*ZrH1&*I@=U_B9dc2%_L{%KWny$vUG+a7zln2AM2Wb^#%L1&-FdF`DRb%xdR
zg^=yFZw_ng4%$q2SRpq1Yz!BVtpBEVV+W>!ovV1*bmq%8#-4wuevYyH?yklZg@bXQ
z(-XhymE5j(VAwIW-hW=C>aS~O@@4+n8Gu9Q^QE~z^lNyoUlU&K$@ZoFyO_yIhaJB^
zWWCw2^ng&t0wsY?28)D6%=dhfe)9-)geWn+Xjq)fwe3A))1J`4*Pj@rOg~;?*j0UN
z<5C93Pv3Mr-k)!)|2(tT_`vz*{|S-@b|0A3_WQ+c+4S4~3vWN!S)F<67?Y694A;6V
z{kQUjqq!gKOZ~oM*Vemk<vaAvZ?=BhV=NDI8FK6aqb^?T%u5l5?SDT4lLv#RtDnm{
Hr-UW|nO_6l

literal 0
HcmV?d00001

diff --git a/art/gen/water1.png b/art/gen/water1.png
new file mode 100644
index 0000000000000000000000000000000000000000..10be34eee388d9cabc5a5089fa375232631168d0
GIT binary patch
literal 624
zcmV-$0+0QPP)<h;3K|Lk000e1NJLTq002M$002M;0ssI2B@5<>0006vNkl<ZXo2mR
zQEuBX5JYE&QXBM?JztO0yR=Pg?M^=^2QAVfrju%GfbYW)BtV`=a;cU0`O8<_GpY{o
zR;EBTQ=pnDP|XymW(rg@1*(|>)l7kE?p|Q2_)~%~2mml`!Z1u=KRG~&K*s=KBZCfr
zP&0M8bS;Mq*hDfDFl;!PA%~$@KY|V5e=R^K^W5@GCmghq0oz)#t!^;Df&51c5J<(T
zZBKi80I&h0?Q_DhGB`}YpbQeE6W*8xWddlH+}2(aL=N5e_#&n$Ycc6wwUi~ZS?z|~
z9VS57BtW`-h&}g`6u`c0`sLC47R*3urItSMi9K|G6b$V@onr-Tlb{Ur%zfxDv4_*6
z>`DBL^A9ISD0~ukZp{76-8XYnpqeRA&F#Ao0dQ}9eajC1KHMO%hfe>tiw`!D@5a>v
zwn>SN0uY(D(?)M)=(q3aw{fjNUn5O=SXYS=xkW|>02_Ay`DZcz&g%kw#iUJOY5MfA
zuFH~{5t*53M8;{0(-skV{6vh^fXH=e59<OTdlA@M#J8u@IkKdZUl-`HNcNQ;k<n6;
zL|Cn%NvACUq%DBbk&Eft86ZI-B7Z!cBeFG-BDgGsk?x-uhTmx4&eZ}SfGy(tqaQ_*
z5=E_xNS@ANn*hm!Yk8ywjI_hszNo+^wkDF7(J$CZ$BNj$92t&u+C8@~2M04I(Ax*?
zN4R{}scR%|>xC-wzTob=(J4^P6sTqjR5JytnF7^Jfoi5eH9rBn;~8cWHS*{H0000<
KMNUMnLSTYh#u<44

literal 0
HcmV?d00001

diff --git a/art/gen/water2.png b/art/gen/water2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c02bb06a6237287d9b53270964175589cb369b05
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1SD0tpLGJMWKS2zkc`H+=N)+uC@>swaM1iU
wp?Oi~gTly5!57ZezWcFxDRZ3Z0!m=*Pe!Jgi7sxUK<gMhUHx3vIVCg!0E7%TO8@`>

literal 0
HcmV?d00001

diff --git a/code/foundation/src/gen/texgen_fallback.c b/code/foundation/src/gen/texgen_fallback.c
index a13b47c..2f6c84b 100644
--- a/code/foundation/src/gen/texgen_fallback.c
+++ b/code/foundation/src/gen/texgen_fallback.c
@@ -7,9 +7,7 @@ Texture2D texgen_build_anim_fallback(asset_id id, int64_t counter) {
     (void)counter;
     switch (id) {
         case ASSET_WATER: {
-            Image img = LoadImageEco("water");
-            ImageColorBrightness(&img, zpl_abs((counter % 64 - 32)*2));
-            return Image2TexEco(img);
+            return LoadTexEco(zpl_bprintf("%s%d", "water", counter%3));
         }break;
 
         default: return GenColorEco(PINK); break;
diff --git a/code/foundation/src/models/assets.c b/code/foundation/src/models/assets.c
index aeff721..a5edd04 100644
--- a/code/foundation/src/models/assets.c
+++ b/code/foundation/src/models/assets.c
@@ -18,7 +18,7 @@ typedef struct {
 
 #include "lists/assets_list.c"
 
-#define ASSET_FRAME_RENDER_MS (1.0/5.0)
+#define ASSET_FRAME_RENDER_MS (1.0/1.0)
 #define ASSET_FRAME_SKIP 4
 static int64_t assets_frame_counter = 1;
 static double assets_frame_next_draw = 0.0;
diff --git a/code/games/sandbox/src/worldgen.c b/code/games/sandbox/src/worldgen.c
index 6163a8f..c81d680 100644
--- a/code/games/sandbox/src/worldgen.c
+++ b/code/games/sandbox/src/worldgen.c
@@ -60,7 +60,7 @@ int32_t worldgen_build(world_data *wld) {
     // water
 #if 1
     for (int i=0; i<RAND_RANGE(58, 92); i++) {
-        world_fill_rect_anchor(world->data, watr_id, RAND_RANGE(0, world->dim), RAND_RANGE(0, world->dim), 4+RAND_RANGE(0,3), 4+RAND_RANGE(0,3), 0.5f, 0.5f, shaper_noise80);
+        world_fill_rect_anchor(world->outer_data, watr_id, RAND_RANGE(0, world->dim), RAND_RANGE(0, world->dim), 4+RAND_RANGE(0,3), 4+RAND_RANGE(0,3), 0.5f, 0.5f, shaper_noise80);
     }
 #endif