From a112cecfbfacea29aa961040fe6a146b9f8d660e Mon Sep 17 00:00:00 2001 From: Xiang Silian Date: Wed, 24 Sep 2025 22:20:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E4=BA=A4=E6=8A=95=E5=BD=B1=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shaders/profiles/slang/profiles.frag.spv | Bin 832 -> 820 bytes shaders/profiles/slang/profiles.vert.spv | Bin 2488 -> 2488 bytes shaders/texture_loading/glsl/point_line.frag | 14 ++++++++++++++ .../texture_loading/glsl/point_line.frag.spv | Bin 1752 -> 2512 bytes shaders/texture_loading/glsl/pointcloud.vert | 5 ++++- .../texture_loading/glsl/pointcloud.vert.spv | Bin 1784 -> 1848 bytes 6 files changed, 18 insertions(+), 1 deletion(-) diff --git a/shaders/profiles/slang/profiles.frag.spv b/shaders/profiles/slang/profiles.frag.spv index f2bdb659a284b815fb1f4a888741f2ad144d2e72..177679d0dfccd436b05c88e34204a015956b444b 100644 GIT binary patch literal 820 zcmYk4T}uLC5QWF@k3Q5)#iY=>>8i^JqM(bA?u5*`lO>l}$W_)A?0;3it(&0pyz4?E zC9ifM!_;(MAIOg z`I{hovwh3C^VHU?VtK`^eC`DyiGBHzyd^Ko>#8STlIQf>QRHmFiY_07%XNG)_BRhq zfG@ZnvA>Dek-t)@~Tjn@>|+1u6Zn zb100y6FGW@(gsF9xr$;@4hM!G$dlRxp9*7~Z76h^d zDTwRK$@PWV7tio*)m9yE)|E1L2qw>+QUhZ>)$b}&cdTdb0;cbtA_fPpIh5o(!Uw|i zrZ0J2$<2W$-&Q2gdneyj*HXH}t-?}i$9>{ip!0RJlmSMop3Pd4xX literal 832 zcmYk4T}uK%6ow~VKl@NK6_Y~irmHR^h=MLcx)U<%Zdr1OgXt7GpA187Z zDY}|8Hn!_~rlz^{P3$^Z#dewIdZr_18O#=McBaHDF!M8B1u^~4 zb12OGW1308@CCzfD6Zf==X=f;<(D@YJ_Bi*>$!8E2qV<$O3jBB{MMiEIgZ)PrWjE_ zP!6|>-U`@+m8k9bSC>f&jP{hiG|@vcr-lck;-dSn7ddYV_4CGSW+ z=LOTNA&U?LHyuj%;no(WH*bLbt}N#uekBZ7?wDC%xN)Z$ra$+Huuna2haMN|OkT#B z*tZa~uC;Q0-W2`8oR_yn|6A37;@gFg`l>P#= CDL57Y diff --git a/shaders/profiles/slang/profiles.vert.spv b/shaders/profiles/slang/profiles.vert.spv index f0dd23b079c32504c1c23526977dff99589f9fb4..fe7b725a7758f9118266f2a24d4ee070bfec3405 100644 GIT binary patch literal 2488 zcmZvc*-ukJ6vi)<0xH2RfDcGOR8$h92{9(d{Q*rREnx9MlJ-igDMBxn3l>+D#C^ei zU;a#AO#FVgb6_4E@^#Mn&Y82#a8r%_EkRR5urCOL-vVoE&=@pmZx2$5j=VW&OXNoV z&W7a*%78E_6ojHMCUglsLP~#|v~xDCKlpNGZXrIHn~*4`Iq|D=7fZGCm13y|-xl=C zo*xP0YPmKZN7e9JDSve)3ge;LQ2uN*GZIcm)%m!1c<4}|DCxwXn8h#-*~zy{d+tmo zzwXzZaM+^{QZ_1A z;%rzAXY9-3Sf<-qbY?&uEOhRj`(>dQwEK461A4uWR5Fit>DyHqTwn4+ z>h?~_^wcYKDOQVi^d_gbI-Q<6#BR{uD-dVU>CA&=`Zmefdu8u*GI7v%I-NM?zeh6p zy7kM9sR6D>wJ|5S9@&@)Iw00w?bHR2&i@fQ_8rm(wG+#F$w;QRlz{)J_67l-TCnAW zAXq+${jwx{iGiMXy7e;Ubb2`^JH7ITh>1?Gb`R*(J0MUaI{CR<^Cus7OHS&q?U!WfD51)SR2L$+0`7rls$7xGA zW^rABXW_@(W(0VaakG-)sM9z;UU1ZHT;w=FpgQ>7T{TyVjn66yE@QQzMe$>6JJ2NPuJ6eLt2A&$5|3kqpl=?x|!re@@RF=g;Z6<81CN z(q9PV@Xx+$5y>^_RW7TnfjyK}S;rqRn4$rba-bse@bG&z)fA)jp{2U*} zk;AxV$)5yxmgV>?8P3n~#c_U)uZ|<0-Tybq%%AyCKk?1>T{8E;oalo*X8R$T`(R%5 zLq4$gLmzh>Jd6J5C+of)7bWA96ILBJ iAsL=L#$A#OzapH_G$*ygAs4iFIJv03TllL?M}>cWEW}*^ literal 2488 zcmZvdSyNL%5QVRV04j@!sAW+UNR^@}ibh0{T?JGm$l`9eK!8w?ONGngn?J#y>x)&M zZ_)$v;830JKGV~uyJr$IH9hrF?YSt5dZQD4vRb2>2&6g6I3K$uYIJsuKKJ5M8K+N@ zNDd^&k`~EjNxLMYzl+kG&FYW6QhEO{?awE~gArTBmRDp7sdHzm*i!Liw!BePQCV@{ z)_!3wPAjF8#WbnJTgAfWZW5=tlU!jc*`14blFC84F_3#0DNEMHlXD|ZV>EoXq?ae> z3uke44r716lI#@M(^8_&I8Q9KAC-!dv@%Gz)99x7F=lNVTu4 zvgx5qa!tAFrSWUcZ!n)8+J&B%?vhY5@w`mpd97XY;b9LPztw#5;9oJHJbm)fHzX|Y zcgQA(_wUH2o(_F7b7}(n0e#Yf<}D^13Rvd;i8XiNfiAW zBc3lBeG!9SF~7n5BlGEDSo`$O8=`i6dgl#!pWb;x-lsn9ni`3RkGq8vA3pBZ`|xqM z_=9>+0c z43lygv(eYy;T~g-1BQp#Bg3ehe8fFAj6OV;GmM_V;CLc|J3KpRxYX&{r-p@bLxzPM z&kPGWo(qE`j2o5@&hquWkPQ}cj2IT49W^ZE7!wAE$C$ym1f1nLCS-$!9FvBH98-po zFRw{4tCtey&wQwVT;lg$$>tuI6Mewr_g>59KA0E%z~}d-WpgjgjlSSzZ$^4n0w=l2 zL9BmMZ)EeP_)hyb^;R}Gz4E5sNx)eCzUO3vv;0in%LZq8Y+g24IH$Z};hYu>^K)lT zA0%*uXBQ2ZI^|e0ER0(=EaX@*Eadno4304FlYDTN@8h#`0J bdB3BYULp;KeIU*6CHAp&o8+&Uh9v(0XpE%P diff --git a/shaders/texture_loading/glsl/point_line.frag b/shaders/texture_loading/glsl/point_line.frag index 1c8908e..63eec64 100644 --- a/shaders/texture_loading/glsl/point_line.frag +++ b/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/shaders/texture_loading/glsl/point_line.frag.spv b/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?YFEYZ7(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/shaders/texture_loading/glsl/pointcloud.vert b/shaders/texture_loading/glsl/pointcloud.vert index 97ea1cf..3f8dd44 100644 --- a/shaders/texture_loading/glsl/pointcloud.vert +++ b/shaders/texture_loading/glsl/pointcloud.vert @@ -15,7 +15,10 @@ void main() { // 预计算MVP矩阵以减少乘法次数 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); + + gl_Position = vec4(inPosition.xy*2 -1, 0.5, 1.0); + fragColor = inColor; gl_PointSize = 2.0; } \ No newline at end of file diff --git a/shaders/texture_loading/glsl/pointcloud.vert.spv b/shaders/texture_loading/glsl/pointcloud.vert.spv index 239970f4ee11fa95861260d12f5bbef680430c44..2793ef2803af0984cc09a5354ac661c649162b3d 100644 GIT binary patch delta 561 zcmYk2y-EX75QXPvjX`8%A(BpZjsNj4$(jU2S1XGYu7wX^xd=(2eFS?!@+6YRcd_yz z0ycu@TknE*IovsC=FZI7@9?7@29;*b%-OPqHh2q%OHDKD3d#HZgIj~;qip<`Kjq_* zSyf+m`sG$#GMl^9#T2XyoNHSsp8n^_>@FC(Nv!mu5D1aVHgr1y{mgS(p*6%ebyHsv zTH?ezg3e{h_X_%)mi(aLmeT)3F|*{2c^&I`p&SUuCPn1}iDDL@L2ufweimzQNny1c zHDj%90S$0?@v7fKZdV}Bs+rgJ6|*XM@mfnUwd8K4Vee2t=Xh;mM7h0MXJKbNIg_o;wQa@dFSwx_!ojUa@B&Fvt0}AdLH(-kIk$F;*XbCw=b5A2IEOGO~xa$ zJa239?aD4*{@J4+uh|x~0(QV1s^U(7Mj5iI#yImD z$67o0n&LBG&1*T%0fTDP3!r}aRo6;$a#gFFy`>+Q=@C&oHb4aSz&+cDV_Xl{=B~X| Y)4t;B?Q&j$2pj;_#kKM;f8hrF0a#`uasU7T