From 610537fe9ded8fbb441497944bfd5cb08434a43a Mon Sep 17 00:00:00 2001 From: Xiang Silian Date: Mon, 22 Sep 2025 19:14:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=BA=BF=E7=94=BB=E5=87=BA=E6=9D=A5?= =?UTF-8?q?=E4=BA=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shaders/texture_loading/glsl/point_line.frag | 13 ++++++---- .../texture_loading/glsl/point_line.frag.spv | Bin 5068 -> 3872 bytes .../texture_loading/glsl/point_line.vert.spv | Bin 2508 -> 2328 bytes .../glsl/point_line_solid.frag | 11 +++++++++ .../glsl/point_line_solid.frag.spv | Bin 0 -> 512 bytes .../glsl/point_line_solid.vert | 23 ++++++++++++++++++ .../glsl/point_line_solid.vert.spv | Bin 0 -> 1832 bytes 7 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 shaders/texture_loading/glsl/point_line_solid.frag create mode 100644 shaders/texture_loading/glsl/point_line_solid.frag.spv create mode 100644 shaders/texture_loading/glsl/point_line_solid.vert create mode 100644 shaders/texture_loading/glsl/point_line_solid.vert.spv diff --git a/shaders/texture_loading/glsl/point_line.frag b/shaders/texture_loading/glsl/point_line.frag index c51c141..cc437e2 100644 --- a/shaders/texture_loading/glsl/point_line.frag +++ b/shaders/texture_loading/glsl/point_line.frag @@ -3,7 +3,7 @@ layout(location = 0) in vec3 fragColor; layout(location = 1) in vec3 fragSegmentStart; layout(location = 2) in vec3 fragSegmentEnd; -layout(location = 3) in vec3 fragWorldPos; +//layout(location = 3) in vec3 fragWorldPos; layout(location = 0) out vec4 outColor; @@ -56,9 +56,12 @@ void main() { currentPos); // 如果alpha接近0，直接丢弃片元 - if (alpha < 0.01) { - discard; - } - outColor = vec4(fragColor, alpha); + // if (alpha < 0.01) { + // discard; + // } + + // outColor = vec4(fragColor, alpha); + + outColor = vec4(1, 0, 0, 1.0); } \ No newline at end of file diff --git a/shaders/texture_loading/glsl/point_line.frag.spv b/shaders/texture_loading/glsl/point_line.frag.spv index 0b2c07a140953fa1723dff659c58ce8beac7385a..29e4b7a1d3aeb90f9e94858020e7b11cdc48543c 100644 GIT binary patch literal 3872 zcmZvd>vvN{6vYRUv=z!r-8upuFarg4jj~_J zQ3GRHIjyf@9QEvugClNMW^wEt#^LXdgClNB#u>Pu2^quu$${&R>X!ulMEa}ZQhZ!^ zNZh#WgyPAMpOKBrr{{1O{yxonyg%c8?ilWv`~#ZDWsK9_KPb$;#Pb%=vWLa^5XG}`o zDQlq(G+FnNc=Dp5HhkU~9JQdkCS$NyK{IRQvh|`cXE%RU*y7RMmN9JoYhk;aEsw1? z_}iX4quSvg%IF7qFtGJ~N0_}&sqo?m<{(ZxlQU7o9sf{;H4*bWSyPz1>h-Xma z-(q;bXh$^jA2S^I{D*`-{}twQPy8o@KK}{kb8q|~gg*ZTp}(}t=l3;S=eHIAlImmT zw}iJmr>c3UeAoEAUo_mu5gGi7JYt^q96a_!vG7M_!kxm|xnB{6`@{F?RbjYOGRytCFz?iC$7|mZhn{uI4QIKhg*kgs zr{w#7O9qEAIHzgP3Ueo>eOnj~W1wYU^1LG>7n)JsJKVc6G>bCUsfYIpZ+n~<=B&2I z1z|Xh5!Umb{IH&j^5HN>SkL?N$%Te}`7Yqtm)bs*!I^(anA-l-d3eK@WoY1upYfd4 zJu5%#!H0W8U9=>CE-Xp)6pUC)Ky(XhZ z;;zf!O|v45hTl`ud@2mT?a%$0Fmdqgv!of$^f!d*h2{KQn4GIJ)7%t>x13)H69;da zFNMkdyWjUKVRZ29Tha^%zNMLWZhL+s%%1$tTfVX|y!m&8=@H)?y{O30+>x1PO_;Nc z>YGPXmCM`<;9^w02%NJ6|Hq`NB8Y zl@D*4-v4O&;^0lQ={4c~-V+CJwS6zVB(wXyFN_9$+xO{#Fu7T?xF3XhTXyF^3R_>O ml^8VEm!E{`3p&g3vvAm#U*yA~wZ6cCw>3YM{i9tj%KinBpD#QB literal 5068 zcmZ9O`IlTp6~|vP3mC#CVN-~m1ceBO9V1&Z%p?=cKNdT85 zB8m&RApt~177^3~xFW(Y{uBNwdOUiLpU>-eL(z54o%-Hy-K}m_^_!8kTTaQcHQ8y| z>DhbPV4R(;g~{N?%XxZcer8**-`sZH^;c3z14ByG~`^QhP;Wq zg}jZNg`ajL1dWg-%l<)-(QI8dJ+m-9J3BqIYoW2Sve4^4+|C!;txmqsY!!K<-#VOY zcWPqS>NMJ`&D3BFi?oihY%Kc_IXcb8e7|1wfiUA`eTzkXX@>Z*pznr(?XFH!yRmW) zVJE50#n{O0oti9T)zFvP3%j8vyWIlMf$tT}y+)Deok0fUU3ro#QGm(%^Q_4cezOnkuBbF&ZoTFr9LiYk4* z%iY!fWVhWt*+1{L_aR8nz`HKz{fa{zV?Xb}-_vO=c8lfPRu>oZV)meCSN6pLX>3UE4z> z`|a2=m`-xWlJkthP9M2b6K_Xush{-?`$cbdCVu8l{nUs3 zJoZe5ehC~qpSptX8u#OfHu7O}DVVV{^sS|OY==2N4Ynp@yY8NMBau`6cEn*%?q;qb zu5YBHz7KteWned&-OHN$*Umkudza+UVLkUTyB77h{s0p7s2@a9e}5e8VeD@i z%-9j}yC~j)Sbq(??w?z3-awSs!RCFVvWecS`^NN(v-OQxhq`C)8&kgk{cp_rTE|At z!nYz9VvfI~TeoY*Q1_0@-GGm?{tom08^$-It#{Y&wr3UkhD7&n`5lgRb-%Z%e&vwv zcQ)3&2ip@}f4{Hk`b46;zAMr7_j{V!`yEa714Fvsp>*BvP^$Y4O7#9V8S}t;(2lj18uJbEB&2<5s zeB`Av#y6^tUio2}hFJ+#q zxKDz&R`O`YU5>7;Yu4fYk&8Wl3Tz*uj%{E$#bF)#dCy!6zpKFRDg3Sm%PEfV^FF$! zpL@9$kqiAgu(6}w>%rQ{ujf4VxdAbrchPn0@m|YEoX>#MxHqDwac@G`M&7vIo0}2i z-iEktT;GR$#Jv@4&qCh;PUG%G*G67{-_uSc?2RoK`Xt!epW=M1VG7YkUjK=T^A7sn zrV;ITBgW8Y4k&-_xJfN^w_8IwAaR(jxxI*zTXD> zn-cjR2M_1_4xD`S>APV4`AbG@)73;;0Ywo?1$jki+T0Y zCTjT+cq^h^#P~7Tea5-`1T3d*^gu4`p8{(i`cJ{>xjv09r(K+@T=eW2uzTH)M2u&_ z@?rBFc(@-wgOiWFJP+1SKKyjJVS_=nMs+Qfq{{Mn}L_XZ6dEJBkx3K!;Lk67&otATEMtDg9XT1!p6eP@fWDb G0*C=nrVR1` delta 222 zcmbOsbVit$nMs+Qfq{{Mn}L_Xdm^tXBmYEaLsoYN1_sZKh5s3KSsBG&2x`_#mYqKFelamj8^F3P2$@ zs5BdpwubUSHi5K&2#D=~nm}4X{J%g=7C;OD D)r=j8 diff --git a/shaders/texture_loading/glsl/point_line_solid.frag b/shaders/texture_loading/glsl/point_line_solid.frag new file mode 100644 index 0000000..b34cd22 --- /dev/null +++ b/shaders/texture_loading/glsl/point_line_solid.frag @@ -0,0 +1,11 @@ +#version 450 + +layout(location = 0) in vec3 fragColor; + + +layout(location = 0) out vec4 outColor; + + +void main() { + outColor = vec4(1, 0, 0, 1.0); +} \ No newline at end of file diff --git a/shaders/texture_loading/glsl/point_line_solid.frag.spv b/shaders/texture_loading/glsl/point_line_solid.frag.spv new file mode 100644 index 0000000000000000000000000000000000000000..e70baf4521379b8683bdfd4411602080ea1a15a9 GIT binary patch literal 512 zcmYjN%}T>S7#y2!TU+}hg5IR!Q7Im@2!b9&_7dp92UtoHWg#XdO$Bd0n@{CMaAq}- zg)iUEWWJr*jXLLjU=JgVF~i?FM28H>^+LDtbG+Er>Ein4N{R`hAe3f`KDz9xx3w?y zW1lr;&8QPk1MVW83Vd;>iy>_6>}qA>CzotCZd-rknah2Vxztx#Qv3Hzx%whb-Xpp~0hoflE$l?tmqYc$N0@8nbI&XUS{A&Swm~ eyo8ls+>-ZIcIDF2%r_aseov%K^7*0qmh}t62re}M literal 0 HcmV?d00001 diff --git a/shaders/texture_loading/glsl/point_line_solid.vert b/shaders/texture_loading/glsl/point_line_solid.vert new file mode 100644 index 0000000..90a467a --- /dev/null +++ b/shaders/texture_loading/glsl/point_line_solid.vert @@ -0,0 +1,23 @@ +#version 450 + +layout(location = 0) in vec3 inPosition; +layout(location = 1) in vec3 inColor; +layout(location = 2) in vec3 inLineStart; +layout(location = 3) in vec3 inLineEnd; + +layout(location = 0) out vec3 fragColor; + +layout(binding = 0) uniform UniformBufferObject { + mat4 proj; + mat4 model; + mat4 view; +} ubo; + +void main() { + //mat4 worldviewproj = ubo.proj * ubo.view * ubo.model; + mat4 mvp = ubo.proj * ubo.view * ubo.model; + //gl_Position = worldviewproj * vec4(inPosition, 1.0); + gl_Position = mvp * vec4(inPosition, 1.0); + + fragColor = inColor; +} \ No newline at end of file diff --git a/shaders/texture_loading/glsl/point_line_solid.vert.spv b/shaders/texture_loading/glsl/point_line_solid.vert.spv new file mode 100644 index 0000000000000000000000000000000000000000..8cfc36a942a80d4a85d749df023dca7410b6914a GIT binary patch literal 1832 zcmZ9MTTc^F6orqyA}WZ;MMWIIJ6dmOOpI3`^`QxvMqiuKPRSwDnPxi0%M*V=f0Dn- z7ZcYvol_^AX7}v1_TFcovsa;5*r*zF#+)-3%$6CiIa3g0#8uM0-e@*z!=zi=dj6P< z8B(% zt-ywUt7~Jwlh|XQys2EC4LiZ8n@=b!Bj3BM9@Fa4KOUH}siwF49NJzK_dkq!JwM(% zIMUgASvkA8F@rcdQptqlUHz!*2RV*=A6x&cHdPiiEn`Lpk^G8Tm46tt_Wk&aA1D4d zaw-{*Pb?bR#73dmYMM`vl(%8hv_JGxYQ`~oDYhNh!Hyj!?XcrdVoaXcC!Gjh%gySKf{Ff)W(5T4QQ$++`o zhG*ros7HHpIn%}GGtS{9Vd^>Wns!gdA`V`W5nmC$uAMi*t;%B_?w!Oi`rgpaT!?dT zuqT6KHtX6s2TcBkc6z{*4@NII?m_NtnK37C$$ub^T6%+P8Fuwx^d-lghrXQWF#6^( z`hs6b3ucB+EYA2NhTl51=*IsxdcPOTjOS$N!t7rwhk0L;!MmKx^2uTTE@weL{4bqD z&7zDtcvrV9pE`7MbywuWySl6LsfB-|8*@K6m%k<-4$O>h$(Zja^<}nqGEUosyPI*$ z#O2+~IOemj2{42EGU~}Ej!r*yF0oA+y~*J{==M