From 03f3af0a29c27c3adc33b0e97bb34bac1f0828c9 Mon Sep 17 00:00:00 2001 From: blobt Date: Fri, 21 Aug 2020 09:25:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=9A=E5=85=89=E7=81=AF=E9=98=B4=E5=BD=B1?= =?UTF-8?q?=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/shader3/v14/.suo | Bin 61952 -> 61952 bytes main.cpp | 4 ++-- res/shader/hdr.fs | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.vs/shader3/v14/.suo b/.vs/shader3/v14/.suo index 31c34ae24ff0bbbe67a6292b393eabdc2afefdd0..168dac381fe24cb7d8ee4f1fae49ee53f9457bc0 100644 GIT binary patch delta 2008 zcmcgteN0jgRcQ)d=?lyy0W2vbY&*U29zfu3(0VTA#PK$jD$_Ya895w3D_sF zWFN%AJ8T+sW<0V)Gq#0Z6Ild&2s0FnB5X?x#^BP#7uuh*`n}}Kz0y7Ca5%CBoA_0+%h(qi`*bw}RJt$icVS)V`l(`6W z`C?Fth`PW&3*{z6Z>4B5qU7;>75Z&Ca9eLRRH0r5X2T|P&>M@Ed*^(riM*@lso}TC z9O7fyQ41tw57|+Rs)?%U)VYeg zpmdRdJSs8iLrQ>-k1NA6$YXk#8g5hao5*(N%y*HfZ5XHLKQj#XWfQ98-62J=oaZ82 z!TI7ZCbnP|sm zx6#$BGx)1xzdjd6-Q_LRRNXglAzdml?!Ga7`Ob}J_d`~3CRFQEndXqlKbGpQ7WGU_ zUn1^W5ij10oY;|@P=i`U)z)x#okv&1zbFzwQls#KP$Sd|`-BGJF?_6zLcMU%?_S*n zZ3mx$>f=_X9dF=YPLY3Z2tolqhFzcY2O&UM;}*~wb70_z8OVq$lAq(_AwqyG=m3io z$T6sFu7(3|*x;1X4TEqRDwS1e^9V>U=l;#ct~MW{=&2=EOuhZ%*>yDt7Gyf8ilhLOwcoXh)JGf z1U%LcV1C*Gj=2)`dN{~)GMx36LD_u1`UO!Jb)d~kAbB)+dMF9ThflrkAUhWN1=V$=yWy0OJLR76AAtk@!ROfHXq zoDk`E7H5oMvm|C?OT=FO*&k}1j|{_<;bY63*k!QcA1ZE|8RP8Et?k6P#qA`&-gED{ z_uO-S=YFSjR7FQsU3N)`h*1!tQCA@z1%pApOb|yMM+gMT+gjtXWrovks25ww0J|sZ z37G;!ovfLLn{1G#POi>FO^-lN!gPcS;YJi7&|^s6KwU!cE7swtMWlx3u{ahZ_{O;K zSQ{SsT0ZI?hdCh`M+1WU;1U&Dx59)vOH+pW8c5OPr>sVeTlucnP=6g!iAaL=n$4!E zVQV~&4Tv3x6okhiDPof<0k*c*2blu;Ro~Et8A^ z;!PL5W>J~bC>9ggIcFy+hkJ9H$x3kNHS1r+qdYSd7QEO(Aig&VcJ-RTHoD52BYN$k z&m@UVN)He?dTu%dI@K)0_7hQxB_=IF=P#%g>s?X;_pHt2C2-H$qhz_r3g*sgCfcRw z)sV;@EYNDbg`)3eNd(E5sUf@`;3&!jyBG~F;{`Y+7JzGNhqp{rDqqnMUhjyVxhlUP zAel1_p|Xo;;w1%#DhpiZ)jI3sg}df*IAum(X;ga>4XuPdSpL3fynS81R_4<0`r5u{ zEdKo2AXpY>z*gNaT0e;}+X`mu_mlWpX&~In+d*WPp4SZLTv*UyQ8VdHWOj?_ zt9%|~zS;qep&!rjcEYg)N-a5=+l4K{dZAj_B-9IY1si^a8-+%}iLYm{U_xu?)utpiJU9`t!Cz`lPro4x-sVS#-Tmj1JizPbUGp&MO4m8IpmSwi!r zWw6-+}@jcL5BIYa#GsJgm7q8)!ELKc@4^@mvUA zF|vidXT=`bLKKS(y;3@?o3TO3q(G1RLGF`5DN2IAGch3bNzC8pCqQx0G;clx2XzXg z%6ZB<_N^z<>BrZFeuwe50x>BJ0fyeS!w22vK;0DN@j`rRu}t<;k;xX3z*o|)@a;2{ z%y!m(tO*sRlYUQj9^n|RicE~{o&ELerY2P9s{fmJPP&hC%7l!(^%z3U0 zABhyl;)Z-Ml}e$o9BXIo(FtIviFJ(ek)2R z0$lI3=y*{=U9H7yhxrpr!9PK!0%V8_}`-$%=G8^u+%r-iV nli@0mt_7YG|C1xDNGRSh+9QvXP^|I|na2sA7Tsro+miSf1oRgF diff --git a/main.cpp b/main.cpp index 9280661..f54e4bf 100644 --- a/main.cpp +++ b/main.cpp @@ -188,8 +188,8 @@ INT WINAPI WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _ float lightPos[] = { 1.0f, 3.0f, -0.8f,1.0f }; float diffuseIntensity = 2.0f; - float spotLightDirection[] = { 0.0f, -1.0f, 0.0f, 128.0f };//把最后一位改成...... - float spotLightCutoff = 0.0f; + float spotLightDirection[] = { 0.0f, -1.0f, 0.0f, 32.0f };//把最后一位改成...... + float spotLightCutoff = 20.0f; float specularLightColor[] = { 1.0f,1.0f,1.0f,1.0f }; diff --git a/res/shader/hdr.fs b/res/shader/hdr.fs index 773311b..bb3413c 100644 --- a/res/shader/hdr.fs +++ b/res/shader/hdr.fs @@ -89,8 +89,13 @@ void main() //gl_FragColor = ambientColor + diffuseColor; - vec4 color = ambientColor + diffuseColor * vec4(vec3(1.0 - CalculateShadow()),1.0); - + float shadow = CalculateShadow(); + vec4 color = vec4(0.0); + if(shadow > 0.0){ + color = ambientColor + diffuseColor * vec4(vec3(0.0),1.0); + } else { + color = ambientColor + diffuseColor; + } gl_FragData[0] = color; gl_FragData[1] = vec4(0.0);