From e37a74137dfc48931a898c2377050fbea28256b7 Mon Sep 17 00:00:00 2001
From: brxxh <11dac2t@huhn-online.de>
Date: Fri, 24 Nov 2023 18:13:58 +0100
Subject: [PATCH] fixed grass again, didn't help lol

---
 examples/quickwings/assets/base.png | Bin 2300 -> 1963 bytes
 examples/quickwings/quickwings.cpp  |  41 ++++++++++++++++++----------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/examples/quickwings/assets/base.png b/examples/quickwings/assets/base.png
index 2ba45d32091724ae7160522722bb3cfa63d3a345..26fa39129aa33fe2b906d9b77751651fee1a2272 100644
GIT binary patch
literal 1963
zcmeAS@N?(olHy`uVBq!ia0y~yVEh4O7jUov$xnNd>VN`yna<7unaRlv3>p(lC)#=+
z4iIUZALhETtBKE5#wesPBT(c>;OhrLORjL$>E`A{E$mdxocKs<hlPlYi}-%F|BdUK
zRyQeVG<D409pCL?b6qUTC4Yw{|NFh~A3ovzkz9GVMEdx_EnI#{TC2{U)z3J4o`vJm
zNrin=-rW-ZSkY5|{kX1OXui^_>;J$1i)nn?v$}b`YemTRxlJ2<oO9MDXx|fhcddA3
z>O<y-8<d&3;<apJAF3a{$+cgzY*MG^ht>0<w)I^uUGrQfxWd6A<ym)CsoYo9T*>S*
zx2*m*aWO(Zg09NG6GcCXba-r4*}T8j*?wPU*wMwOZ!c?6?$fdS*ygJ1b-gFV`Ad&Y
zrI*(C`<1(nohVpZ9W63T&i4IQ{#n}}u6|QFzkS~KQWjqRg1oDLR!_QoWA}@vv&3$-
z_wicnU6J`x*5Y={gS~T$g6xBubM_}5IL*1`yz_O_EqY;_R?RD}VLw^=(=~j<ZuY-L
z`;%Wvb1ll?bNjxt9T)+e1s;*b3=DinK$vl=HlH*D1M6c?7srqa#<zDJyMzNpS|7SF
zy*u35p}=>yk%O;PHSfSq=|b^!PEybFoTr4H+OtG!Y2&-LKR@Rz`846h&v&_g^Mtp*
zkK6li=f`daMkW>x0S`_aucd-*5Y7+X4S)YVo-Dm5Rl%VFC}hZJ{^N$jQAIFkJJW6c
z__#Tx&Gp~D{ERFzzrSzZ*Wb1Oti<K*7B|daADH~_OnRQtybqG5&(2SO_n6Io{z_qx
z4GIMxnRfs8eei6D-qH5+8U-)!|M~m(c;>nJKhO9c6SiA??9b1IHFq97|K<l&>(FrE
zDEFVwZ12-{*(KZ6xHY!_O0)YnGyD9vV&C-54-cn{toZw9*TMeFUwuFhWKm*L&;PLR
z<~siw{PP1Bd^=lzX4{vX|I<UhrPq8D^Y*Wq24s~#eayDs{HqICgAvna=|8cx#TKeh
zKKq~iWBD9t<Oh9bpetsczmsC~&^YVN{MUAQA3o2thIm_C|HF5-_s@3Nd4rtu%lyCL
z>$jW#+KXA%oPU1d@ekSg$rBHM{|>aG{>2+vNRV>8dG~tu;U$kht9L#Pw>zzOS#!Q;
z($A^qH=Qmyl|Ct=?&;<?MswqK^-KRT@mvoIAqNGO4YmJ2o{aoIJ4R!-21H2v0o#1p
zwF%%5Jj--@_WAs~57t*Qr>FyCqj5=tbWPD3CqYnvZRLI=x4)+NE!!tyP_#A90m|hq
zVFJl9G@f-kc$*0v4FVzo9}X_;f&_!e9$AnyBa<T|tGvuA53rRE2XBKtpfIX*Gz3ON
eV4y<afw=a<BLRmtHa7$700vK2KbLh*2~7Yj4YySQ

literal 2300
zcmeAS@N?(olHy`uVBq!ia0y~yU|IlV7jUov$%Atb9cEx)%*%9k4#-SSW?;~mSUT~%
zHcO(!ar@mJI-W8r?Urv&HGW$B<b>6ZoJ&!ug)=2L@6IasHQwyG?$l97%Z~1N_Wz9G
zPrWo<y^4yzzgFsfe)ncnXL;50pI>V4zrSpJzp+3mU+m7UKn)RFbxXnPX_t$m{u=kX
zWTZCC$lLYp#+8t!`s>Ga6+`oXg{=So{_jqu?rGUhD;z6sY?1YkSf;q~(akRN*4t<2
z?9-@Gxbyl%!=dS3=1g@#b9jIFZk+7Z=N$3%$|n08KMtmy)8zQh;m-YYQshkcTF=R$
zb7oGvrMa7Xx{C0Tiv}7SUF7=hR=S>ilOJDy)BNP73ZKf`YaVqdd;9I#yJ*^y)vBh-
zyHx$>g--qb-sbL^3ketYYVwu#@B1&+{44jztxtc?JKz6r)ijIULO<;9=}DJQ?0yj)
zs=JF{_jN&4;ME>ki`xx-)zRf&Hial#&pCPEG^fe(g>R*#o;R=2dM<O{G0V5^qUf7<
zj@$3#NB&@Q2+dHB)b7;>MgV7lM`SSr1K$x4W}K?cC(XdXZsO_U7*Y}U_O4@AaG=QX
zhb~O-4tI7a@ZD|X;44+lJFru_P<)+JSMhd5QLQTrRNk}X)t`OvdP{%#q3gx(|K6YM
z_+9?qp1pT}DmpYUFfy@l2q*|}+H}6saE5Um9{45v|9o9sIN&T?$pp?B4QW@n1Qnnn
zcYGb}YpY8yvV1xEdAj(?yMKPvUHp8neqJ~K{A9-0uWRf-JS^5p_`jw8mi_aIZx(*{
z7ryZG{-Mbr+rTDpv+!Lm-(k562>rrO=Y79m?*88Vrt!_$>)oGE|9twVX}tc`pGizs
z|7TZBg1XWnq4B^omMdp30%764ORHu-{vsT?|JwSm*0H+#cHWq@Y5&h>sZY)I)fPl+
zpL@><wTNXJ*PJ;Gv*yeI!ZX)rooqOH;MB<jVb5>Qe|!Gh^R=O$zJLGr{Pmsrz7EfA
z-*|$91L(j;R;K^H4tLjp;B)QMXMb7cUt4ZB_3zn#Y4w};-<1EyVe{>0Dw9=w_dFF?
z7)2-)*fW|+8UW#p^(&6=v;6nlb8Y<V>%X?v`F>lMyeYkY-d}bfU^vWsifj-2WMLqj
z{L{<mr%nFR_VXJXJ|F%0sHSk=93cb7x!>E=;XV=Lcw=8zSGN0sZJZ-Kt`bxdn5>dM
z2|!}fq2Yj5<KMH_zpE`+ZL+r=9&*74SV|_JV1@_3HY=Zh{Ql^lcJGy7&Q~Z1JHQgs
z3=1}nB}_~ir`Afq%xz#;#SV)+mLNt(lc!-lFykE<t|E+H*}yQXNZSqOK!t`^Fe4Zm
zLmU`<cZw>*tQ2tg3Nxa?K}(@w*_|$U0^?Xv1vA1yK~%sYIPWOjdX@lNm=OvSxHuMQ
zZcl>yjA?}&ER70yu(Dj35^V^JR7S=S{!#BSjmF++;^Yt*QF-r!^v4(B@hP)|n1Gck
NgQu&X%Q~loCIAIj%eDXj

diff --git a/examples/quickwings/quickwings.cpp b/examples/quickwings/quickwings.cpp
index f8a4995..a49f5c6 100644
--- a/examples/quickwings/quickwings.cpp
+++ b/examples/quickwings/quickwings.cpp
@@ -176,33 +176,44 @@ struct Grass {
     paradiso::Sprite grassRight;
     paradiso::Sprite* scrolling[2] = {&grassLeft, &grassRight};
 
-    paradiso::Renderer renderer{};
+    paradiso::Renderer renderer1{};
+    paradiso::Renderer renderer2{};
 
     Grass() {
         auto grassImage = paradiso::BitmapIO::get().load("base.png");
         grassLeft = paradiso::Sprite{
             .bitmap = grassImage,
-            .pivot = {paradiso::Vector2<float>::make(1.0f, -0.9f)},
-            .scale = {paradiso::Vector2<float>::make(2.0f, 0.33333f)}};
+            .pivot = {paradiso::Vector2<float>::make(0.0f, -0.9f)},
+            .scale = {paradiso::Vector2<float>::make(((500.0f - (500.0f - 504.0f)) / 500.0f) * 2.25f, ((700.0f - (700.0f - 112.0f)) / 700.0f) * 2.25f)}};
         grassRight = paradiso::Sprite{
             .bitmap = grassImage,
-            .pivot = {paradiso::Vector2<float>::make(1.0f, -0.9f)},
-            .scale = {paradiso::Vector2<float>::make(2.6f, 0.33333f)}};
+            .pivot = {paradiso::Vector2<float>::make(1.002f, -0.9f)},
+            .scale = {paradiso::Vector2<float>::make(((500.0f - (500.0f - 504.0f)) / 500.0f) * 2.25f, ((700.0f - (700.0f - 112.0f)) / 700.0f) * 2.25f)}};
     }
 
     void draw(const paradiso::Shader& shader) {
-        for (auto sprite : scrolling) {
-            if (game_over == false) {
-                if (sprite->pivot.x() <= -1.0f) {
-                    sprite->pivot.x() += 2.0f;
-                }
-                sprite->pivot.x() -= 0.02f;
+        if (game_over == false) {
+            grassLeft.pivot.x() -= 0.02f;
+            grassRight.pivot.x() -= 0.02f;
+
+            if (grassRight.pivot.x() <= 0.0f) {
+                grassLeft.pivot.x() = 1.002f;
+            }
+            if (grassRight.pivot.x() <= -1.002f) {
+                grassRight.pivot.x() = 1.002f;
             }
-            shader.set_uniform("pivot", sprite->pivot);
-            shader.set_uniform("scale", sprite->scale);
-            shader.set_uniform("rotation", sprite->rotation);
-            renderer.draw(*sprite, shader);
         }
+
+        shader.set_uniform("pivot", grassLeft.pivot);
+        shader.set_uniform("scale", grassLeft.scale);
+        shader.set_uniform("rotation", grassLeft.rotation);
+
+        shader.set_uniform("pivot", grassRight.pivot);
+        shader.set_uniform("scale", grassRight.scale);
+        shader.set_uniform("rotation", grassRight.rotation);
+
+        renderer1.draw(grassLeft, shader);
+        renderer2.draw(grassRight, shader);
     }
 };