From f4665a4c9fefb012a20ed5922ea2814d80b559ab Mon Sep 17 00:00:00 2001
From: xiangsilian <youmiss@163.com>
Date: Mon, 29 Sep 2025 23:23:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=88=B0android=20=E5=8C=85=E9=87=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shaders/texture_loading/glsl/bg.vert      |  21 ++++------
 .../shaders/texture_loading/glsl/bg.vert.spv  | Bin 1592 -> 1836 bytes
 .../texture_loading/glsl/point_line.frag      |  14 +++++++
 .../texture_loading/glsl/point_line.frag.spv  | Bin 1752 -> 2512 bytes
 .../texture_loading/glsl/point_line.vert      |  11 ++++-
 .../texture_loading/glsl/point_line.vert.spv  | Bin 2328 -> 2732 bytes
 .../texture_loading/glsl/pointcloud.vert      |  14 ++++++-
 .../texture_loading/glsl/pointcloud.vert.spv  | Bin 1784 -> 1936 bytes
 .../shaders/texture_loading/glsl/texture.frag |  39 ++++++------------
 .../texture_loading/glsl/texture.frag.spv     | Bin 2076 -> 1144 bytes
 .../shaders/texture_loading/glsl/texture.vert |  38 +++++------------
 .../texture_loading/glsl/texture.vert.spv     | Bin 3288 -> 2368 bytes
 12 files changed, 65 insertions(+), 72 deletions(-)

diff --git a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/bg.vert b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/bg.vert
index 0769410..5ff8f1b 100644
--- a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/bg.vert
+++ b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/bg.vert
@@ -25,20 +25,6 @@ const vec2 positions[6] = vec2[6](
 );
 
 
-//const float offset = (640-480)/(640.0*2); // 假设宽高比为4:3
-// const float offset = 0;
-
-// const vec2 positions[6] = vec2[6](
-//     vec2( -1.0 - offset,  1.0),  // 右上 -> 左上
-//     vec2(-1.0 - offset,  -1.0),  // 左上 - 左下
-//     vec2(1.0 + offset, -1.0),  // 左下 - 右下
-
-//     vec2(1.0 + offset, -1.0),  // 左下 - 右下  
-//     vec2( 1.0 + offset, 1.0),  // 右下 - 右上
-//     vec2( -1.0 - offset,  1.0)   // 右上 - 左上
-// );
-
-
 
 const vec2 texCoords[6] = vec2[6](
     vec2(1.0, 1.0),  // 右上
@@ -50,12 +36,19 @@ const vec2 texCoords[6] = vec2[6](
     vec2(1.0, 1.0)   // 右上
 );
 
+// 定义 Push Constant，只有一个 float
+layout(push_constant) uniform PushConstants {
+    float myValue;
+} pushConstants;
+
+
 // 输出变量
 layout(location = 0) out vec2 outTexCoord;
 
 void main() {
     // 获取顶点位置
     vec2 position = positions[gl_VertexIndex];
+    position = position * pushConstants.myValue;
     
     // 设置输出位置（Vulkan使用不同的坐标系）
     gl_Position = vec4(position, 0.0, 1.0);
diff --git a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/bg.vert.spv b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/bg.vert.spv
index 1d843ffbcb5c017dc74d90bb1ca2a92827688de1..9569f0bee7234b446fb51655775cd7dcc0f9d32b 100644
GIT binary patch
literal 1836
zcmZ9N?M@R>5QYzwEeHZ40)8O2qN0NM1&AUPgQl7^p$5a>rnVd1WZ5?D)_}jf0xtwF
z!o;ickBRTIyMv8~OwY_a@64Gqb6RqPi^I+hxG^{Gc3rxr+@KIAET8P<%0Xqd8#h<i
z)*r!`aJhsCXVQ%%`j9@4>Oq8YS+XKom*n&}sQs77LvGZSE4A|ee!23d)@ZkD-S{N*
zYhe)iwPw)q8*%W(hd0v43!+BYYxWa7G5XK*oafHzjCQLV#6c^m!Bg$j@hPkw`kmN6
zeit?UV<)EPt_cq?>mNfMCnWD~Xs`CVpZ8i(H?Bu<S9V?=aMsbuVLj~m3AZS_{U4Vc
z_l4`cs^3YEBrc!f==iL}yc<sV^f1ALC_V_jQjQ{0AAOT=FAUnR1FCBHXFeu?uNQ`A
zK2N=-?=0>~|69HIgMYl&YIT|k_EK2?-OK7EeHxQce_1)WGiSe5gx!BpHVZ#I^P{tf
zXAuL&y};NFBL<Ax4MPWGp439k3li3}P9dhK2zcnT((>91k~#79coQ36K{l@u44IKV
zn&A4-TFz|FBgee#^V;Ep;Rhd=IQOk&_Jph-r>8$xbT_z@5;)+-xgcGfl5wUo4!ChH
zN>|>qJkzqk;8@(H3?ui7UN!a2NH~+6#31m%xZ|w$f`nevgSkux-^y%eZ2qg#xd*uy
z)K6xd_H-!8!*>ac*n;+=1dMx-^QMHwS-cB;#50ejOlO|(>Hl5HfP{YE(+(GGK^kwx
zV(=m4UDnRb@lyvjZyU_|xhkCn|A}^d<icLdZ0<=scKUntuh$#Gm?L8Se<q#0{n%!P
zfgA66#!0bsPA`O!lN`h#@W8C*l61Y3oejMu-Yk7$QTuNpo_6Zx9n)8<pPBKy)o=4%
z#@-g6xm=Mj=N)B(%e#4{jO3b^fWd)J+;s^!e9po)AKyVR;up2wk`yJ(9u70SEdl>7
z4*Bj#hy%BrV3zZNbaK8IpZJFoFqUEbg8>_mRF!o}`(p`Qd^Q{EV&+dJybJ2$Ol<g^
hNl&&U))V^0jI1Zy(!t<ZjXQ~+=Hk6z|4}uYlE07kk{$p6

literal 1592
zcmYk6ZBG+H6om)cEeHZ40=^)&)^|#M10*p*44T!X2{jnMZfd(RldRjO-J0qre-Hi$
z6MvOoOgzu-PP5aT&b{ZJxpU{vw58eloG~+I(JYxmlZ{m~E5?Ycq_f{TYc)qnuerDX
z1jVu`r9w0-W<Isc`u^InG0s(?F6;^=eP%WPk+^IYjNc0U(^J3oHs}rp!6^A2g+XNF
zFzDG~*iG!W5Z!!1XX9=(?iB@|6vh2K<CzQEW6&Sj#P-t~Jk?GeU!vesI84IH`?wcQ
zjFg_aA>QJ4K1bS4OvThPZ95!ha=BtN9$R_ZE`7z!rFzbv@-|M+><?0DMHb`Cik(Du
z@WzgkPTUQrF}g==97WTZr#{g$1~t;V{y6y<PEPv$VK3$O#1-rI)dkMDC_EB;<=`Cb
z{Z1>e8N?Zmqi#56$FT;E+8l=sN3Yq7nzjYTns#ALO)Jo0Z^)`>t_qvd>tUrnv8sGt
z3LIFMzmW3!(%8v;_9MrZ{EM2=!V!mG5{&tI?EGbUzs}EpH*{XKD*_sLr@16snq#L~
z%{A~&b6K|XPV=nEgG1xiUCB9eH}vADZ(U$da<T@XgX4@FnyUi6rU#q34gWItxkDGf
zE}L_Zn;z0{&dnWAD?Pg<pr=Pw&BWohW!2I-<EpYVl+A6~+!Jy3#jocad8y})z;Hde
zm$}MOPTv>nsRzHI8J}9ohtK<fbNy<{<}QHa9?K?gk>gJV4mjP@T$6EGub+t{CplOH
z(80NyU&z*7A06mD@b2gvgS!5T@ibE}Z;}5DS3iB{f1&8}d&7SvJ^i^Ra92mlhL*d3
zt&HT_65!CFXWdN!9zA>EyVzaXa38e3qWQi6$8g*O*>E#LTN&y7Ljf%@dP5(nf#3g*
pP#3sI_QXf;>VGcV)z8`Jr>lQoHXIsP<AH2=a_wry|EFpWh5u7pdzAnH

diff --git a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/point_line.frag b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/point_line.frag
index 1c8908e..63eec64 100644
--- a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/point_line.frag
+++ b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/point_line.frag
@@ -6,6 +6,20 @@ layout(location = 2) in vec3 fragLineEnd;
 
 layout(location = 0) out vec4 outColor;
 
+layout(binding = 0) uniform UniformBufferObject {
+    mat4 proj;
+    mat4 model;
+    mat4 view;
+} ubo;
+
+layout(binding = 1) uniform DashParameters {
+    float dashSize;
+    float gapSize;
+    float dashOffset;
+    float uAASize;
+    int useWorldSpace;
+} dashParams;
+
 void main() {
     vec2 fragPos = gl_FragCoord.xy;
     
diff --git a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/point_line.frag.spv b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/point_line.frag.spv
index 982d99e2a9d2c7ca29d574bd04db58a9104ea4d3..9893ce988e31bb294fefd2ca1aecaf92d03aa100 100644
GIT binary patch
delta 797
zcmZ8d(N4lZ5Zt!37`4X4nD|6cKEoGL6x0VW#Q0pwRY9?&rJDFs|G_UYe1N~;qo3o<
z(SxRKHhVj}b2~SG{_lbB*sZ#VB|GBF?YF<Qa#!lo5s~}XNfalu^DK%~(jQG#xDZcV
z-9uaENjzmXn1%B!9;=rUX5;)eQSV4#I&y`ajbfZV>EYZ7(x*X?1T(czNy@vtTsKG<
zqdA;>D4w~51TJ|D<{HMZ#<+yD{U}P+Vl(Ri&)V%`wytMu#8UMTCokjSJP3KYi~pv$
zV-UDdlgihRb(eRcm`-p(PipIzySm;u0Rv^fg0)cdGdv0}^H^7T#K=2CfS0eAmx&Zp
zB@!d?6VZiG+I)=QXX=wxiQ3Ulkkf-Cy2@`O*f<@oKw4%7&7!Rm<`m@J5=IU$q$?Ca
zdnt%7G_@AA^zCOWKf=fbTH6Rx8_?B3CT60E&LwI}VDGf3`Bq|wsJqBb1lKg+65r-k
XVl`8fYvANzW=~&6fI97E=7i2ax~5G$

delta 36
scmca0e1n&lnMs+Qfq{{Mn}L_Xc_Z&;#>q#R0ybB$WH4?nU`t>I0FKHCpa1{>

diff --git a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/point_line.vert b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/point_line.vert
index cc00794..9837258 100644
--- a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/point_line.vert
+++ b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/point_line.vert
@@ -16,9 +16,18 @@ layout(binding = 0) uniform UniformBufferObject {
     mat4 view;
 } ubo;
 
+layout(push_constant) uniform PushConstants {
+    float myValue;
+} pushConstants;
+
 void main() {
     mat4 worldviewproj = ubo.proj * ubo.view * ubo.model;
-    gl_Position = worldviewproj * vec4(inPosition, 1.0);
+    //gl_Position = worldviewproj * vec4(inPosition, 1.0);
+
+    vec2 position = vec2(inPosition.xy*2 -1);
+    //gl_Position = vec4(inPosition.xy*2 -1, 0.5, 1.0);
+    position = position * pushConstants.myValue;
+    gl_Position = vec4(position, 0.5, 1.0);
     
     fragColor = inColor;
     
diff --git a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/point_line.vert.spv b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/point_line.vert.spv
index eb72c72656fac0a17e64d8077c016b84f15ce403..a54c81cc2c7686fd1393585f381a0a6c7916cb3d 100644
GIT binary patch
literal 2732
zcmZ9N*>e*|5XJ|~5@$HWP0SiY2r)PZM@R^^g)lN8A`t_xDq*c*sr9aEwc^MVRe4Vp
z`IGpoc%h2#x0)7P8dq!j`}&yfnU-9cS=i~^4!75R<DR<lI^<@=IB~UNZ?-mCOT)as
zbnW`jc<gtT!V#YXiet@6wtG>69!RcBmL)5ax}+g_D0w8Q=x;{*M<tkbdt9^CZMNIZ
z)>?OSFz62RcX8N_qa^J1qb%Iaqt_vRyGnjhvKf#1WrwOf$~9C~`yQR~Ce7mh>nMCP
z$kJEBRku@pIrlV)w$g0-&S+~Z%-YXi=^RB=3!BW&yH7ZJ-A?;qtlj+Rfz;X*St)K}
z^gNYbb>E2_q{AqW(&A3w0&!8&nXuG&NnB?%eA!5oVctvfp)mR3S=;ZP_2N+|rsfuf
z2UEWASH-`GyPYt57G`<)mbjYd(XrW~HT91_{S<tZ<QvgHx?y6*Hu{pS5l4f&5mjx5
z6B{p&Z4}278@==1Ec)c#x3b=gMjEGC!Oa$P5G7-Vn(N-DrFY)Qds*&dnUg5_%94+{
zAs_5o(l5?nj>dj4&NWp7?@I0Kngn!KRkE&6!y0yXaEe<HW?39}Q;q{q$H5V|DzP}u
zF2{kV<KT#UFKMbyzCH62mf>?_Sl~eV+yqyOxgZBU*^F5I+yQTEc665YPK>=h96cCE
z3|ytep~LaLqBh?3Yc1n91(OGR-P;W}JSI2xhf|n0B%X7QsA~M?g}~^?q}8+slH-c!
zF2U4uLZ7>|!+`^R?)DgdPQ6k)x(Pn}gss<G9`gopM}_xm4<z)k=<xyREaI6Re939{
zBc3yST$p%jKCPXai6Q=sc4~&lPXE~H8T(o7#KKb_IFP`RAKwLu)~ewP1$@6Ur!33_
zKIHmQJ9h#{F7Tq~uwV8%{`Ag|dmv$v8~lrev(E_ssvTdrIcdz2y$Lpiyw|kT4|dK4
z^ZNj2HUB1EYX$#XQm~N=eA{EY1Msrv>`wT<LS10&^(lK}%FgU@hQ%{`#NW`I@HWg4
z3!hJ7_#WfS{qcW<+Q7UYzwO|<yqJeW5@v`wxh)@N<FEwYe7=>A53^!EN2SC6uRO#Y
zlMn}QaVMk`$4pt=N$KzwcS<_3@XP9edg1Wr4(BC-q^+u%yK@pagtbHRpK8E%UV?o=
z((&B)(wQ;jU(a2XjxRRO<WAr?lRQ62;OK)nyCPxs?2eeDCC}U0KM4~DZ#m&C=MCxP
ze5{<r-;}_yjQd?W96fc^FYok+1Yc~-9eq$2bN8o&*`zMc1mkaaw<?`k!^RAPvGHDa
zB;2+6-j&YWSuJbQ;aJAqlMY9H#x*@Rqupv=mrgwX*s1x0YNnt263)h_tx9;~2NHOM
zMSk*8cU?PntGgw=T=!qXk0e%4TRI%exQ=wVa@~(TSFZbSam3?~y<GQ(FlUc_#&tgt
RhDTWCy7|sx|19>V<O_zn&BXu!

literal 2328
zcmZ9MTT>H35QRrV08v3iE-GRG?<n2?QREJWhg1cN($^Fu8)~U#H?`S-`ov$*pX9Id
z#VXIY*$Gn&)tNr0PtSBuC*-<jdX2eau9+L=vuUp((<R1;>q+-wX}>hrOlouU3$IZO
zm|QAEGpIaPx9sG=5Ah4Khq6~P65h(@WuIiLvYh_9wExio-KO6ZOO;}|TrBNWs*Oga
znfwU6O5lfHrRK+8HSte9bbXG_5350|<_hvsxHaTed%x~Di{hYm>U(F6I64;2n_l&0
z%-7JbNAbyKt6ulw^5L=WQAR$EDQq%%hoje%sOAOQt&SczTAMO+=}WW@Bl$gMQruBc
z+4JIWUYvN}(ez|IKC!6jCw>%)?M?OEk@9|+?E62}H974VcPX|N_>FD9nH+>wuM=Y$
z#9BeniBV5MJS(q1=HZ8(D^rg7)Z>Grttg1%RM(x(%MaTOeK0#TCCy_$If#=~mrv*E
zhZih&Fkh?P32W&c%)70FF{Y@xcz^oY)x_{wdD*T$E!LOP+`Poi2(xS+@8#x!FXzFL
zw=T1J-0kLpFXzFLcP=ZcPQK++GM2^DZJ74Nyvd;le3tFSa?}FHZaH$`n4#tH;rKpt
z7qhcxf|;9(`Hg`&mpC(XF~2=9cM)e!E?&(r_YO;iZb}t_@kizLXfMddl+Rm%sc&4L
zecIu`1$|!4F#KdTQ+#V^t_$1Vmov;8!;J_JXfMd<X*R=y@>%5b-9XEkHa?tj7LN&&
z&w2N>7i28r;0YP=3E}(N=?QL99`9rOB!+SC1MR#Eaq0#aWN^IAw06z`qo2{v9q{PE
z%oC0}&_0$KbH0ZDg*<Y(8$6d`n-6CGXzY2+pYy=PnZFxn{%)N4yK&}Ed{MLFO_?JL
z&0jJ6Rydov@;{Z@HpDW6AsKUHHY?IFk6SW$tGO*74fC;@5&7`Hbq+bBGV<VU-ne}7
zn4`_RBOl)8-IY%+{HiLZJ~*qNk`D*w4IjyP|1Y|iw||mx+B)3RjN?tL?pen1K6`or
z-r%{6eDuVb<1d{{Y*xnIXy}KzzLXVYycM;A(b?MG$Y++sm@(M)@lL+m$AU0(we>B^
zhhtgpy?i*gkEM)r`}iP^eDuWKK0XR_H=430#Tzcm;4v2Ga~^f`-6L-6UXkzCy_V`O
yYFrnFW7)bl<iojjZ)TiZ_m;SI8G7Pw-P^+4jmFl!BOe}PxpniKApTG6lI%Y`(5UAC

diff --git a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/pointcloud.vert b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/pointcloud.vert
index 97ea1cf..fa11d28 100644
--- a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/pointcloud.vert
+++ b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/pointcloud.vert
@@ -11,11 +11,21 @@ layout(binding = 0) uniform UniformBufferObject {
     mat4 view;
 } ubo;
 
+layout(push_constant) uniform PushConstants {
+    float myValue;
+} pushConstants;
+
 void main() {
     // 预计算MVP矩阵以减少乘法次数
-    mat4 mvp = ubo.proj * ubo.view * ubo.model;
+    //mat4 mvp = ubo.proj * ubo.view * ubo.model;
     //vec3 pos = vec3(2.0, inPosition.y, inPosition.z);
-    gl_Position = mvp * vec4(inPosition, 1.0);
+    //gl_Position = mvp * vec4(inPosition, 1.0);
+
+    vec2 position = vec2(inPosition.xy*2 -1);
+    //gl_Position = vec4(inPosition.xy*2 -1, 0.5, 1.0);
+    position = position * pushConstants.myValue;
+    gl_Position = vec4(position, 0.5, 1.0);
+
     fragColor = inColor;
     gl_PointSize = 2.0;
 }
\ No newline at end of file
diff --git a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/pointcloud.vert.spv b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/pointcloud.vert.spv
index 239970f4ee11fa95861260d12f5bbef680430c44..3c9232af8303a281a13a557deb245dd0d5204ed2 100644
GIT binary patch
literal 1936
zcmZ9MT~8B16ov=dEeIkaBB+Q3{6_H$(8MSxnsU*kHAHTk(r$6ccDLDXQM@AY-XG<!
z^2WsX+3nPZA%`>Xdp_sPY;&WlW5$e_Ni$_$nQYCNQ87kbA=RbwetEr{G}kvapW$)I
z<Wfg`rp<+PpV$9(-G+dRk~@+ol66T=f1}dB6_7U*rc|z#DwR_CQ?1eI)Vj%O;MW2h
z`n9Hw{YGL>eEi0T{A}0=dd*=6PaeZHJ>#XFbfT_JY?Sr^M=v(44p>iTniE&;b-(UL
zVK=FVNmsZaUwBsg^q?N}d@%(xFWfoj3%?@%D5zEa_`r`7|2uJoKF=PTD_SsPsXy~d
zc^fAC_J>YMOlD&~vh4=8^U=~(!ynj~Hnv_63~Zie%8Xf@lUcXo`q6F_L~+XH)7jfF
zV?5Q_5dS5#ttf7P=(SpYTsb_}yj90bZ8Doq937(_N6+o3=?6m`y`EVAo0KARW=pzv
z7@3l8gn2Jv&??EsO!427r<?C8MlI~j(b?IvCNq`Bz|jL7nmjHBj@dYlJsj_XUYN=M
zUb1<B$wO`Ck=4!*&hLpMA2yag4s%&D%(?#eR0BWq4ab4c$H5V|BXM!m9*zT_kAoxb
zOv0I%^|FNJ@Ja^FtWJafvd+dV*k9AGAYGKqE1vvdY(?R5X*dM?gfw>IvAem$zv*M{
zcto-$jPJBWYscZ46rOD_DGPU=)z7OJlYXOc<O1`3@e491ydYhaxZL3D5*EGOkj9sM
z^vYeb=e~)*EnSqb=*403EebD7XT9()vTxYsz=lwVd2@c|N}pi9H8^+1d)jMl<Nrt-
zY~%tz?qfGIFmDkbH$#3GM<nFqocyqYiGMDQFTE}Zzmz67=UnQ)O*kjSYzlLyyhmz)
zc`I;Ria`_4BKIFLyght*1I(2-@K%_<rzG5SMJ)WKJ_paD*I&wjjqd|H@1WY}u4vCY
zKz{bQS?%$~_D)?;6ONkXxhjEsFMsa(riAyw8^DKoEK1;A?OWOt2k&yixtw>kC+BD7
zB>uhxj^(%q+QV_CsyboT4<-0w<E}XeeR0=o65a!SQ4@^6o843GxnFGDJD6DR^@W63
O?i)Lpx&2l3*OGr>OOnR`

literal 1784
zcmZ9M+fEZv6o$7wfv6xN2NmlSJfrml#>A*7nsU*k7^1fgv{SOlbf%e3@o>c}=p*@5
z-kA7*)7j00-K?(l|Le5(T7_a^eae_~=7PCow#@j<n}Qf4u9E6TbH7<1Cf)kx)>9&8
zO)(85X3m^X?UKIx2Q~zFlG~Ce5)z8~6r}$sp=4%EquFk>T8-wXc4shX50f8(-wtf(
zx4Sm>JBdB<iJQ*F*{~Cgy7_>zBJw@U>M^4p{gZ(yn<?Ghm@lF2MREVbsMqu3*5R>g
z>qX_%C$|~I(J|U_yr&;^{UFD2?-T2PlTv0;Q!-|B7|E`fs_dhnz30bY{W$Tz6I01}
zY<$tsCN>JiPNnhmNO>D3`}U_^O3v6vFZp%?JNRga$wAohCq5>QZxjR*ANTRZbISTK
za~n=trW`xy#Ro?_Q4qyxTq)g&4aZDFHJBB>cQsLLPFb?6Z-@0GF_+J9>%ttD$J_FG
z;Inyf<ZVk_9=-E<;Inyf<ef?yx+i<6NjMI#jiGQcoi#bUfjx2DTO7w-;LwgE2ab6=
z4jYc&8@-sbs|jYtdCYGfOx*=dmYOwHqz?9ytctWJSyn!81yg@T-_z1?U{Bxtg@NI#
z*-o&X5OY!3-TifjnGxKg@T{~a;Z7SFo|DZXpWPBmP3K?8IER;o$*0~8X-~qz4_=kv
zUlqP7&70t=vY3Z^Cq9I}x1^a1e(nwSByh}TO`1Aj;@73=0Z%-beZX-KV(&_fIeka`
zBU$9q8(hz@%LlVRVq87;m#_C+SZAC37cz*Y&r9usnXxAh{9iHrmZ`<w_@6}Y_hOmx
zyo9|l`!|YV-d7~>F6OFiVwk^+S(FX`TXo1;l8^`Q@>XP%$DUl?HQDek@49Sq;os`U
z+z-yh*JQ(inb92y^Zl&8y!l?nNlm!>8OO|A+=Gl`K6{z~Gk7Q=pLqQ2>6hx_+mO(k
s7~aF)9!oq4v*NB`;@sVy$!1sh*ddr)cC;z+B+LRom_7c}W?xDE1D@7>n*aa+

diff --git a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/texture.frag b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/texture.frag
index ccdb2fd..6943e81 100644
--- a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/texture.frag
+++ b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/texture.frag
@@ -1,41 +1,26 @@
 #version 450
-/* Copyright (c) 2019-2024, Sascha Willems
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 the "License";
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 layout (binding = 1) uniform sampler2D samplerColor;
 
 layout (location = 0) in vec2 inUV;
-layout (location = 1) in float inLodBias;
-layout (location = 2) in vec3 inNormal;
-layout (location = 3) in vec3 inViewVec;
-layout (location = 4) in vec3 inLightVec;
+layout (location = 1) in vec3 inNormal;
+
 
 layout (location = 0) out vec4 outFragColor;
 
 void main() 
 {
-	vec4 color = texture(samplerColor, inUV, inLodBias);
+	vec4 color = texture(samplerColor, inUV);
 
 	vec3 N = normalize(inNormal);
-	vec3 L = normalize(inLightVec);
-	vec3 V = normalize(inViewVec);
-	vec3 R = reflect(-L, N);
-	vec3 diffuse = max(dot(N, L), 0.0) * vec3(1.0);
-	float specular = pow(max(dot(R, V), 0.0), 16.0) * color.a;
 
-	outFragColor = vec4(diffuse * color.rgb + specular, 1.0);	
+	vec4 textureColor = color;
+	if (textureColor.a < 0.1) {
+        //textureColor = vec4(0.2, 0.2, 0.2, 0.5); 
+		discard;
+    }
+	
+	outFragColor = textureColor;
+
+//	outFragColor = vec4(1, 0, 0, 1);
 }
\ No newline at end of file
diff --git a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/texture.frag.spv b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/texture.frag.spv
index e0bc54e6d3f68f7021ab59468a846e8ea641c36c..dfcd42017eaac9658a8b5899a706db142cdecfd5 100644
GIT binary patch
literal 1144
zcmYk4TWb?h6orq?#n^l8%~~&sZAC2<A5;XXAX4)Z+6U1-hL8+0Fu5?9i2gI5eXhSp
z5e2_*l93$Pv-etioqf((OljfZdI;CTQdkMcVY)WL0!)Cb=DFE=-#Qs*y_09ppQ>05
zrCg|HE!0ApZ1g+vz{Un~i+D_|qqWB&R3#>d@STn2uo#-HcJtz***a@?N2B&Q`<g`U
zBpyWVUYthVEdCs+tIg@+K{uK7<^>fL^Jj~1a7K5S3{!H2H>{Ayo&G3^(zi1jzMS7P
z9(?#n8(a!I<nz3)<oAyU=fkw$Nv8d3*r&*%FWDrG=H^uMcMd1nyR`G^Ki_1&=Qap^
zD)0kpmsp?f<!FlaOkC*oujp^$oZdBZ7eij}P*>sV#4hvnSgap)zBRI(v4<;*Wc$va
zUj^Q0-VzOU?q8mX<X+9NZ*qCw8rgZ?OZ__8S@P<|zEMv77FoT2kNR!0cas<IlGTdc
zFV+*eZSY-kop2q`u>KVD?o$^Y*!L{`{&976y2ULIs6FQq**$7KN37R!FZdIDj~=?@
ze!*18YW39rtJv!s{BH_u-~U8>ieB$l34Igm%}qjIE}5!slTai7niHKbr(Q4i2z^-Q
zMdI6po}3Z(+~XbO-Q&zVgmdh9AMqQ`)1x{er+4c0sX^3<Z)o)CkdV{ApUikjcKt?g
d?}(7o8|y#Z$Xc$r!xL)H@ecYc{)_G<@edDYQ~>}0

literal 2076
zcmZ9NNl#Nz6vwZ;7Lged5OFA=IDj|-qR3Q)I#fW7xNMsCfiEd-(?R1(T)1`RC-PId
zG4cPqeaAH1<Z#db%)@;p=$Jn1+!@#7`rNK-ogvpDiIc3;-<j<D?0mgZoL^YHk43)=
zydgFNvP$TNj`L9&#gOQNXhL*NG%ZSt2IYsH5{e6y#kt=Kl5pKFlg(xJ_A=S+T%lUc
z)f-<+VXhRF!(1_{g@s1+ImE83%`PezO3h-sK~fg&b%4()N1;-x)O07+PoM63{<vBS
zYg@5c@`SHBDt|bTS~%(JkILCfF&*XWUKY4<-OLC*y+!5SO6@pb5-UmIuIkQuKI!|G
ze{}SzaS#?-`YGv1fIl;d$_G*S#jCyljAZY;KH+9{7o)?&W<B)wi^BD4SZJ2=v?5uj
zpJ}Dp*s0}@{`ZnmFZ4JmVn2q-%>lC?YUP0071-?Q4a|PfvqLbm1yegXh;cf`y4<k5
z@SF4-Zp9cC-ziy2G$w!c4<=qpf4g)egT}S7Zr$jqr~Me7P`n-~u*1JMHbS-%V`ji1
z-+*r7Q5W`ux`~AxdoVLWhJHBa@j(w}M(Bw*rW+moV}DUMwIc^#(%rIc`Gc7$GU9=m
zX**`7;92R3eNV(O{J^7=^*L$D^H7A$h`bBJHe2(1Dw%U9n<LUc6PE(&pa-vttdGr@
zCkAzb*)94dy*TE_&N#^aNRrfzEj#2}Ghb%H_tK7eGwpcl6rMSS`3B6M-uMQ<tIEf&
z`$g;-%r4K1*dv%3j)>UXM|t5lD#8alW{rMLolrMA{Fv=!5&P<mXMIIH_S+(K_|O}2
z^GS(kr{*&$-h9yEL;uLl=el_IZaz1}n-4mCm=SXGxhbAF-{M+tiAQGo+v2IMR~^&K
z9T71zB5ctUmsz7Tzd7;v8NMr?Jiq)ejdSzju|ZC3=F2|=ViOlVZ}z9`$@@se8^wlv
z>=K#9UlLCZh98TkSIf679vkGA?}>QJhn{?<TZwgiTiEgLH&qMoW=+J7dF$k(_H_~R
zA8~&h;)&6c2mY-gv--Bg(*u~d^jt*DJ-vMT<!vB?IMm7aLVWZ)B4S`?HLw%j^nU!#
zUWi9#^gZ@{DH;Cg-^TU65|5l?ve)8~k=tbaKSD+=`>LGU--z(X9zDMy>?o}p-Cspm
G7X1TxmVy`n

diff --git a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/texture.vert b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/texture.vert
index a836f8d..183bc7b 100644
--- a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/texture.vert
+++ b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/texture.vert
@@ -1,20 +1,5 @@
 #version 450
-/* Copyright (c) 2019-2024, Sascha Willems
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 the "License";
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+
 
 layout (location = 0) in vec3 inPos;
 layout (location = 1) in vec2 inUV;
@@ -29,10 +14,11 @@ layout (binding = 0) uniform UBO
 } ubo;
 
 layout (location = 0) out vec2 outUV;
-layout (location = 1) out float outLodBias;
-layout (location = 2) out vec3 outNormal;
-layout (location = 3) out vec3 outViewVec;
-layout (location = 4) out vec3 outLightVec;
+layout (location = 1) out vec3 outNormal;
+
+layout(push_constant) uniform PushConstants {
+    float myValue;
+} pushConstants;
 
 out gl_PerVertex 
 {
@@ -42,16 +28,12 @@ out gl_PerVertex
 void main() 
 {
 	outUV = inUV;
-	outLodBias = ubo.lodBias;
 
-	vec3 worldPos = vec3(ubo.model * vec4(inPos, 1.0));
-
-	gl_Position = ubo.projection * ubo.model * vec4(inPos.xyz, 1.0);
+	vec2 position = vec2(inPos.xy*2 -1);
+    position = position * pushConstants.myValue;
+    gl_Position = vec4(position, 0.5, 1.0);
 
     vec4 pos = ubo.model * vec4(inPos, 1.0);
 	outNormal = mat3(inverse(transpose(ubo.model))) * inNormal;
-	vec3 lightPos = vec3(0.0);
-	vec3 lPos = mat3(ubo.model) * lightPos.xyz;
-    outLightVec = lPos - pos.xyz;
-    outViewVec = ubo.viewPos.xyz - pos.xyz;		
+
 }
diff --git a/and_proj/app/src/main/assets/shaders/texture_loading/glsl/texture.vert.spv b/and_proj/app/src/main/assets/shaders/texture_loading/glsl/texture.vert.spv
index 4938ff8d5cb90df8d838193fc1fe75909863eab6..edeb674ca95c98df78aaafa192d0e03f5ef2d55b 100644
GIT binary patch
literal 2368
zcmZ9MSyNL%5QPV_hzKGgi+do73yP?KD6)$|jU<-BYbugkdaWckl?COED&H;rOa3Zf
ztnz#}w=tEWn(02h%$c6PiS?#WIoIRPxIve5?KSLrg*ai!aL;7lXJ;GD((L@g91&+-
zEDR)ONKve~q*C;&=%*#1!;)#qnj|ZU>91G&ZzaZEzsqC`nOrWD-7Xx|YK2DgsO%NW
ze$^|K{JMA0^bbAa`a0tL>Or|x>I_IIqVsHQ&JSA6y?yQ2aPh05DLWzl&eej3-}Hl!
zFEMcStNEZ2<|N%E?fF*Y^Hxx8G>g?Hcv89Gtjf`TvE1^6B;6I+wXRt38^S-83wf`;
z@70^$H}aAZj*ic0B-9&v#X^6eT^vLGq4d4YT$qc_s?~!p^oSe43!L|;1SPMm-7xxn
z=zCwenPI$MIVf%V#diJ2vRfYmRY`<zrQYoZ^-7UCV7#4QJ%L;%>hU$<ENps=4F_!c
z`QIN4`v#XC)w3R^WwSE6FTFB9I;%ZdZ9n&G`{UtV@h2qIvz};>-MKEz&e#zr>rrPO
ze7p0&$Xl0Kea;3u?!aOZ_ES4|rjL^nmf2HnGqm{*I(tN4v8g?x|Ll|M1$EKKq$Rbd
zB;%?NPi%ZC*?roH1z(PAW*-cHzxE!9`LXFK82-V?hoAaG+Np2(^paR`>SOb+U^B9b
zy&%zAH+w8JkJqlL3h&(JA9t6f!wrmD*nBr&qq47RPf4scw#^S*ugfNudT>ogdR#ka
zF*9Jq-qg+=z&HzgI>L<SZP{9D#NU%byyeeIrzhAG^3O$j`>bR*M_`8A9UlqfZJ0C8
z#bzeJIF~!kOSmKFE@;O`9qd)@@UVVkGc#cDcoF%q?LC+w>MiO!pcWii#QYJ$tP{&y
z^SfuWz#aLG!CsM{eL%u|tSXycW8;I*c?oZyQzWq?5eCkJ!w;Q?Z&ZSx*~mxOxO8R%
z`5s{t(uu{#neYQMJ{P5fZ781iPf3^==7JddJ}F5_?CdG&<bhjFFspe>IyK*^Ci!<H
zU@XJ#N(bwa<aML8_8AGW_?R8;0WW6fzJ&RL7iVG<kDoVQlrRUpJv?~tClYXM`nx2d
zzsBKdglRj$o<$hEEN(f%czfgeTsry0<A>`nap4{-63!+DuFL?Kab1_*&2>W<_=kx5
zrgX3Yb&$JkN#I1E@xhI=wk7yjIsIC3&zBN#ghgJj#Bwsyt)AuV2m?o0-8rv>kwYEJ
sc`Y3rVOdUIocWI4NZ>+kV(lH?O6QxRU+~?P5DQMf_#VOjs^XI5AI58*sQ>@~

literal 3288
zcmZ9NYj;ys5QYy;Q<1BPT)fp@yaNRl5JhfPOw~w>&}u~urHSpqG^t5i^c!pW2gIM`
zui}eq`8?;G31?+k!=Cq@nZ0Lb?~_)>W}i!vJ<0y$V6vO!awHjpN#G{3wN}4VpX(2r
zbLTIdGvZKE$pVcz3{u9?t+lkH{XDuK)iaHrMZZE<&`op;t?+M*^<Op_Pxd9XdZV_u
zSgYS`tZ#2O`h!2)twuZTv>MH{*IFN>yDj7Pmg3URdV8l?4yY1Qu0w1s-JQX*XN#>X
z?PL&K&1%G7?>6VtwZ1Wx<Ong#^NVypk=ejxyVrea9bGz{Aj%l~-|9A7ZPwuIX*X>>
zTI%+PoYQI-2e|)H@Xmv7cK)l_kGj2f(*(pComtw+i7LCC0dKS$ORe5Yt2b!<VVt$e
zEBd<qG%L>iowuTWjdh!??bSP=*IV7*)|xfTIhV9Eq%v+5uAOdd4oWrsBsav>>>iz)
zVJofmEYEv|TcLfaq*ly-5?&EIf3dR@`$nGOeD=<80iQEgs^|j$2j;;hFN|=rU?uY0
zznmu?&66|lIvV?Xw%p?qS1Gu^S*_Xon?{wuGdaw#zGppGvU|#Vst)hWIVk3PFUA`q
z_D;&!Z$|9f*6*Cf)^(ID^QJ*!?c-PztW)R-;_X|kZwkDZ)mZt<1@=3U)4z{(4;p^4
z^~&i#$ZD*6nlJVq<vi~&t3K;J$^YJ!oOlwC_b3;9Uh8=BBAhkqcVDrymOBQ1iFFFK
zj#C9bh8=Yu$2QjetmEav4*x4)dy<d**RZ3n*RjpFF8iEf)n~l*h^J9G^F3!4O_Img
zCaK~KmVKH#$LhIq=8F9;<>Ksf*oyI=vFeNbtJu~Wc%kq|En?q|InMYNt3Gkm>N_ge
z`Xg95P36YkL*+uvbKgxg_7QItIO^_zos)HU3)?y`^2Nz}&x(6Ih4DLdZ|CptUA!xM
z^!F*S{?!re?~eW}<hvd~eT!Gw-8U<~!3o~|3Do!En=sz{If=>}f2hF5d)IzL#`^}0
z_uk(?<;Biu2AxK4ljDAG797ivd#m7_b;P}0aL!|i%AL<UsQJe0pGBXrufBIt&o(CZ
zc(34DhTQuFS3c`h!R2S=cY7MneB<@ozq6N*{y)IBf8SyB{~@+~#C(K3I-~P&^8Zk~
zGrNGACm(aWh+UrB$6z@n`n!ZJSMKGLf-BGMQ#kXD*I%C7Ww7TPW6gd?SJ1Plec89z
zxajFR_GnKx;N+wJdF*oipM&L;sQ(LWxpMtC3vP@x?)^(_^NrVEuD=HMY-6m|?;+>%
zH~KYrwAOFn<nI=5wvH`#fEVh0e2ZGs464t1ePfHLK4p==0>1C1%+7uC=2?5>+{TXm
zBImozZ%i(uId_U2_lcal*z&3pIZM>+Z`U$vE$(e>+{5?SE9et?u-+d~W96Nfzkzbv
ztE~6XxaXg-M`!m7oP6}xz?M^@*8AA<suHzE&KjIK@{#iZTV7T4mFKt)Hm5w3CRkoo
zA}40jg1e8px3MvkU$N~qX0m~8th{sZH&ZU+Q*1f0@8BWoJB!+XD>!*2>iDaec^l3>
zjB|hgKFB%eF6%bxoc+5HXZ&99aYhd;rz&wq#P{LKH4VUWsuJ;0(+-?_8fQ)ZjgtG1
H$V=$|m1x+p