From 50d7c2d00888214042341fc871df4b708bd3a31d Mon Sep 17 00:00:00 2001
From: blobt <klm777x7@gmail.com>
Date: Sun, 21 Jun 2020 11:21:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=81=E5=AE=9A=E7=94=BB=E5=B8=83=E7=9A=84?=
 =?UTF-8?q?=E7=BB=98=E5=88=B6=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore           |   1 +
 .vs/shader2/v14/.suo | Bin 42496 -> 43520 bytes
 main.cpp             |  30 ++++++++++++++++++------------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index e286847..a6c1ad3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ x64
 .git
 ipch
 shader2.VC.db
+shader2.VC.VC.opendb
diff --git a/.vs/shader2/v14/.suo b/.vs/shader2/v14/.suo
index 006dfea6fcbddfe1c53e50eba51b69c1b25aacbc..5874f40a67f1b107244617864a9a5731aeebdd2c 100644
GIT binary patch
delta 1051
zcmb`FUr5tY6vuz}{C;!JHv7358s@ZG#<H5*G!x3CMWGq~3m>FnK@fyc&>yg(Rtc#O
zr8~V8GUA$#5&muu1rduq)I%k~(3c*1?4cflQB>qQ$NdZmA3gBdx##TMbI<+WU*at!
zvM}CI4VrDHra5WJ@j^bI=d6z34Bt%L4X*gLr_+}Y&53}z2)YojaY(-{N>CUz!L?La
zMfeHYm)}U<ML38}#BPEc_Hna`xY=G!2`;Q9?;$o5Zlai|A-K4nJlC)V?RCWVJ8Zv|
z8@5C#Y9yM7T|_fMSJ7ICy+ol$;kT9IeMB44ZjTe}px`jkNqC9n8_Jf&-Mm4?9Uf7v
zJ^N1#=iMVERQiYZ^7L#hgF!5pr^s%{@^B5y!=9~=*5$;aToXMN|72Q2$t9V%aCKzz
z*+;L6OzZ4sJf1C+D{ZJ+^OKMpK$b$XEru~~!lUt9R@l|}AsSFQuUk+0GagY&*`+>(
zfBbGCO|SwnftkQ@e7Ge}&8*6dz}U91;~3SSRzIUoL)L+HRRE?Q6qUWZa&NF>zV1t^
z{QHZU1L-Dh@zLrV=XC`;7lhTCft804RwEb)+h1V@!YX$#EAUO_Z$3%o+Ov*g)`_pj
zqhYRVcBO&4yLBT(b$If+4?jlNs|!cFz$5rYm%jPJ&HCK}&4F{+0H#U|B!uiV<Oz_y
zAmd>58>TV_Z#l8&e6xBv6f=|<&g<ws6;Y8(?;XjJX*@exh3SzeI6D?nsnM{YL`W@+
z{em({XBDh2{hStF<+}4j$YIkO@72X;?8C=+=7vxCCco-(vS{k&eUOhp?cXB>&VgU0
Hr`q5zRd|D#

delta 1224
zcmb`HUr19?9LMiDcbl8(+~zDbN3-t4O6xi^U5d?3mzA}Ql08Tmg_2lEn9x66Gcrh0
z@2`i{9_;pqz=vpu-bV{62&E980!0X-M56Xkf!gobR`%zyvwirT^E<!uyXX5m=icBX
z4ZfrUvQ0=dlOW(<pvdCV(h_$QAleO&ng)nM+YF;)kH@liO_2h2hKhtNz*(`E7=UQj
z)ns6-1Ib5l=~8;!CZo+lw1^(5N32L5vKlcWJf62IsMoI@Y_i(S=-d>aNQqm%p+f9$
zhDWA!vV(8SP>$mYBn?ODHV^i^NHtP}_>f&lEwYbCnD=APf@CB7fqtH4u<53vJE?!j
z{*ac`f7pO=3mC_r&D$y*bAbu5+{eXmt3jKDtci~kV)@)kv2l?(zlqev7yVC>nem(n
zk>O;!hS@DML^V>y8cih|SL_yEIV2XdrieHhwnqs>X_28316mM)Eto~Bny8W)<r7Mt
zhJDG@6E&YZ!#Q4(O1MmZk+|i_pu^Uu=Kaj2UCsqxYxcs^T$y$F`iN2%)e;vjfum>A
z;f*5;Vr72tW)wk(%b&V@IT8|hLLI*l4>assp^hr+pP4_uAFB&IIn{sTZR5Mf9*GM4
zgxQDn8De-F)c~#RqyZf}S9yhiEak)ekOjs^^bnC|VRkeJ+(Qx5;NqGVuT9@AJec1(
zedon>7{Bd=pu@<F(hUNyB@4)o<ggs2|E?8*;1&}zReU7sY5JEM7Au=1`mHNV60=XF
z3jA)%E4(aLKB<N0{xZe$tGJ#z5vntIo&1zV8>-TvVfQJJsgVWu1c`b?A8zdxVR|?h
z((Y!m$VoQ^%W)@jc8+Vq?SwLNWhYGz;H~1XA;HpgcS7XCA!zQpY1InVS4s5_8Gq+X
zJw8`Sv9Agu7u_&7um>i(wz6y8B?N|*gX(1y%qh)gUid`g@0b9FP$^9HSRfJ%-cdpX
z+#xqp`fG`ae?3HmAgu+19>@tvDaU*#+5!{&Lx4;BLTh26-v;iH{4AGeyIfdYyuHNb
wbb6gtPUl5W58qiDTpH<C?j0Zj$dyVHN5|~y43^ws1f$fh-qQUzsr#SA?`z6~KmY&$

diff --git a/main.cpp b/main.cpp
index 421174b..3a2e8fb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -144,26 +144,16 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	/*监听并处理用户请求*/
 	MSG msg;
 
-	while (true) {
-		if (PeekMessage(&msg, NULL, NULL, NULL, PM_REMOVE)) {
-			if (msg.message == WM_QUIT) {
-				break;
-			}
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
-		}
-
+	auto what = [&]()->void {
 		glm::mat4 normalMatrix = glm::inverseTranspose(model);
 
-		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-		
 		glUseProgram(program);
 		glUniformMatrix4fv(MLocation, 1, GL_FALSE, glm::value_ptr(model));
 		glUniformMatrix4fv(VLocation, 1, GL_FALSE, identify);
 		glUniformMatrix4fv(PLocation, 1, GL_FALSE, glm::value_ptr(projection));
 		glUniformMatrix4fv(NMLocation, 1, GL_FALSE, glm::value_ptr(normalMatrix));
 
-		glBindTexture(GL_TEXTURE_2D, secondTexture);
+		glBindTexture(GL_TEXTURE_2D, mainTexture);
 		glUniform1i(textureLocation, 0);
 
 		glBindBuffer(GL_ARRAY_BUFFER, vbo);
@@ -179,6 +169,22 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 		glDrawElements(GL_TRIANGLES, indexCount, GL_UNSIGNED_INT, 0);
 		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
 		glUseProgram(0);
+	};
+
+	while (true) {
+		if (PeekMessage(&msg, NULL, NULL, NULL, PM_REMOVE)) {
+			if (msg.message == WM_QUIT) {
+				break;
+			}
+			TranslateMessage(&msg);
+			DispatchMessage(&msg);
+		}
+
+		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+		
+		glEnable(GL_SCISSOR_TEST);
+		glScissor(400,300, 100, 100);
+		what();
 
 		SwapBuffers(dc);
 	}