From 88a208b5b9700e121f52186482c3a9405fe68537 Mon Sep 17 00:00:00 2001
From: blobt <klm777x7@gmail.com>
Date: Sat, 20 Jun 2020 19:48:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8cpu=E7=BB=98=E5=88=B6?=
 =?UTF-8?q?=E5=85=A8=E5=B1=8F=E5=9B=9B=E8=BE=B9=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/shader2/v14/.suo    | Bin 42496 -> 40960 bytes
 main.cpp                |  56 +++++++++++++++++++++++++---------------
 res/shader/UI.fs        |   6 +++++
 res/shader/UI.vs        |  16 ++++++++++++
 shader2.vcxproj         |   2 ++
 shader2.vcxproj.filters |   6 +++++
 6 files changed, 65 insertions(+), 21 deletions(-)
 create mode 100644 res/shader/UI.fs
 create mode 100644 res/shader/UI.vs

diff --git a/.vs/shader2/v14/.suo b/.vs/shader2/v14/.suo
index bfba0ebcd288d3abf4bfb7a3383c81b58154ba35..cefb1ec9ebb4554d46eac0e7d23095fe2bf5156d 100644
GIT binary patch
delta 3311
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

delta 3115
zcmeHJYfO_@82-*jTgs(aC}I)i=B*Z_P%fg*rC)Ef+-jkS2qu&wlvzr(EmDS1c7eqa
zg}x^G!$`zr^T!e=-?II!amn0Vru#9oEL*l8Zp${eB@6zLWV-j1b}35K&A4AX&C~Oq
z%X>M`dC&PyFw6!&Wv5>t>6dq_*tBq9?XeW&EwYhe7)>Dzv%};yxXU)eRklo|!_JQw
z7)}_L_)v5u;2#z-5JApZE=oCw0>p!8NkTazuDu3jAwq?)#`V+bh0%6mw9bwj&qFyi
z+LmIy0dXI7im={{*upS{i~@zN2qmHzu?-<XY(h{6JAeo`%ybHbJF%k{8#$Y_DA7gf
z5e9@2QG+lc%n0g3MrVRgoH^5ZF~qvkO21Ei8ivgA3{m&Ah|%VsSW~;SP(EV3(Kh8y
zfJjE9AtF4X|2+HCvLiyR71()R<gAJ(Cs~|L7Z$?=hBAqG19AVd^%9xsEDb%)oV0w%
zmtK%CC8(H%pv=JM%8jDevGE(jFG@cqG#~kej36OLz@LffDJ>(1`Ma4Z33FNOe7>B>
zX&CYQScl5>2q-O>7RO?QYX#MFYgy3bX+V=3hA#U~D9Ou!RDT5oz2k86oG889b$0iA
z{z_}&ukTyG`GLE`;F@Jnq&S;CGWz3BSI#TkvfF|3eQPei9U0+&QLH8~a_$|t6U>Bg
zP(x<mO0WnNvzefo6$t76ZiCNGY=&v296p>afNZ4<`jo|xrIv{b^*cMd4~C>yAGdrF
z`DZJXGY-aszZF-)7b(7Y=6Ex85<<5r6BkEox?K<N40&uAParf@g&yc}p+_R-f%jF}
zh<IIGkC5I5a=4dc5!0(6HW7U5Y+#ZV!@@cX=n~4nx86cCNZ5gsdii^s>PTuj)m)~t
zB{D}u?~{uHez9D{&KcQIwNJ!hPm`1%)=oS#aTz*E<iw{e^PCa!jQO2PLRC^;y1AT4
z$P)sD#Y*#v6it!&wbuyP12XtpnJsKWPwo7@8Vf64ALo?!6;6>kIe{;gdbp8W2Hz<y
z(fUn3*yT%wh5cvY1BDdS?fDRH*Uar>L!DY+J7463ok23!vEnJ>gI*2c!-E<UDl|Rh
zuy#rkaxW~itMR-NwKz^LkRcYvN6J<+%x-4sQ?m<i#(g*F?a097ND<!daU<~H<W~6z
zGsILgRm?7&5;w*`ctk@|ftzlIKc-y}KBk!;B!cH?KBWUcR5FZ0$b>)@?1s+MiI8+!
z0aIhA$OH_G?icoX9VJe<IjR8n=y61Q0`|c9@#0m4VF)5p`ZUY*NfIwPb&^eP`rCZG
zChs1dCy$sPn&^v}j;LQx$f957Sjk6$epU5Lj;57~(01nb!&bzi{z$+Dcz5L_J}RGq
z-zR6sbp6dOP1?PB=bpAIuBE|H>v8t0dIks8riMX-uD-9r@7GpXt$GtTRP8VYybT80
zr{`LX+Ez~O?=$vt`g$(laC=l0J>{lh!_j7Kz@Xl7#I73H(_-%Ox9VC3Y}%eKuiDXY
zw9R2Q)N$3iX1$ry8gw=0G0x)99v-r^avoQMP3LXh?mhUD&!7!7S903&-bSwekk08g
zXa_mFp?;vZrmZ}{b-OA#pR>QGF5pyi-NxFQCYM*;Wj4A!LrrKm&}Xe}t3JBN(`z<p
zIg5K>Z==7_?yPCxXfe2qwnNQ+Yrl@ZBN#|Kk()@l#a9fUK6!~i>8qc}Y;-7EUd9@q
zHo%P^i0(;=nDXlIcs5XGlOoK<S_0aFpC@loJNegRMwqPdw<vE%&}Y%o;XtFFsbl|U
z+YZ3Hs#5;M%v%I(GfFm^2TKWi<Ns9o4^st_k0)dLJVTP?eHE7^i%~f)Nx-fuhvVnw
WpZpfVw@C$DRA%sDrH0_=Aov%+<o}HT

diff --git a/main.cpp b/main.cpp
index c3f5906..deaea6c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -52,19 +52,18 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	}
 
 	/*创建窗口*/
-	//调整窗口大小
-	RECT rect;
-	rect.left = 0;
-	rect.right = 800;
-	rect.top = 0;
-	rect.bottom = 600;
-	AdjustWindowRect(&rect, WS_EX_OVERLAPPEDWINDOW, NULL);
-	int windowWidth = rect.right - rect.left;
-	int windowHeight = rect.bottom - rect.top;
+	int windowWidth = 800;
+	int windowHeight = 600;
 
 	//窗口名称一定要和刚才注册窗口的保持一致
 	HWND hwnd = CreateWindowEx(NULL, L"GLWindow", L"OpenGL Window", WS_OVERLAPPEDWINDOW, 100, 100, windowWidth, windowHeight, NULL, NULL, hinstance, NULL);
 
+	//获取实际窗口大小
+	RECT rect;
+	GetClientRect(hwnd, &rect);
+	windowWidth = rect.right - rect.left;
+	windowHeight = rect.bottom - rect.top;
+
 	//设置渲染环境
 	HDC dc = GetDC(hwnd);//获取设备上下文
 	PIXELFORMATDESCRIPTOR pfd;
@@ -88,7 +87,7 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	glewInit();
 
 	/*创建program*/
-	GLuint program = CreateGPUProgram("res/shader/test.vs", "res/shader/test.fs");
+	GLuint program = CreateGPUProgram("res/shader/UI.vs", "res/shader/UI.fs");
 
 	GLuint posLocation, texcoordLocation, normalLocation, MLocation, VLocation, PLocation, NMLocation, textureLocation;
 	posLocation = glGetAttribLocation(program, "pos");
@@ -104,12 +103,33 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	/*load model*/
 	unsigned int *indexes = nullptr;
 	int vertexCount = 0, indexCount = 0;
-	VertexData* vertexes = LoadObjModel("res/model/Sphere.obj", &indexes, vertexCount, indexCount);
+	VertexData* vertexes = LoadObjModel("res/model/Quad.obj", &indexes, vertexCount, indexCount);
 
 	if (vertexes == nullptr) {
 		printf("load obj model fail\n");
 	}
 
+	float z = 4.0f;
+	float halfFOV = 22.5f;
+	float randianHalfFOV = 3.14 * halfFOV / 180.0f;//角度转弧度
+	float tanHalfFOV = sinf(randianHalfFOV) / cosf(randianHalfFOV);
+	float y = tanHalfFOV * z;
+	float aspect = (float)windowWidth / (float)windowHeight;
+	float x = y * aspect;
+
+	vertexes[0].position[0] = -x;
+	vertexes[0].position[1] = -y;
+
+	vertexes[1].position[0] = x;
+	vertexes[1].position[1] = -y;
+
+	vertexes[2].position[0] = -x;
+	vertexes[2].position[1] = y;
+
+	vertexes[3].position[0] = x;
+	vertexes[3].position[1] = y;
+
+
 	/*创建vbo*/
 	GLuint vbo = CreateBufferObject(GL_ARRAY_BUFFER, sizeof(VertexData) * vertexCount, GL_STATIC_DRAW, vertexes);
 
@@ -122,6 +142,7 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 
 	glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
 	glEnable(GL_DEPTH_TEST);
+	glViewport(0,0, windowWidth, windowHeight);
 
 	//创建一个单位矩阵和一个投影矩阵，后面用来传递到shader
 	float identify[] = {
@@ -130,8 +151,9 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 		0,0,1,0,
 		0,0,0,1
 	};
+
 	glm::mat4 model = glm::translate(0.0f, 0.0f, -4.0f);
-	glm::mat4 projection = glm::perspective(45.0f, 800.0f/600.0f, 0.1f, 1000.0f);
+	glm::mat4 projection = glm::perspective(45.0f, (float)windowWidth / (float)windowHeight, 0.1f, 1000.0f);
 	glm::mat4 normalMatrix = glm::inverseTranspose(model);
 
 	/*显示窗口*/
@@ -141,7 +163,6 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	/*监听并处理用户请求*/
 	MSG msg;
 
-	float angle = 0.0;
 	while (true) {
 		if (PeekMessage(&msg, NULL, NULL, NULL, PM_REMOVE)) {
 			if (msg.message == WM_QUIT) {
@@ -151,13 +172,6 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 			DispatchMessage(&msg);
 		}
 
-		if (angle > 360) {
-			angle = 0;
-		}
-		else {
-			angle += 0.01f;
-		}
-		model = glm::translate(0.0f, 0.0f, -4.0f) * glm::rotate(angle, 0.0f, 1.0f, 0.0f);
 		glm::mat4 normalMatrix = glm::inverseTranspose(model);
 
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -168,7 +182,7 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 		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);
diff --git a/res/shader/UI.fs b/res/shader/UI.fs
new file mode 100644
index 0000000..6324833
--- /dev/null
+++ b/res/shader/UI.fs
@@ -0,0 +1,6 @@
+uniform sampler2D U_MainTexture;
+varying vec2 V_Texcoord;
+
+void main() {
+	gl_FragColor = texture2D(U_MainTexture, V_Texcoord);
+}
\ No newline at end of file
diff --git a/res/shader/UI.vs b/res/shader/UI.vs
new file mode 100644
index 0000000..5d2859e
--- /dev/null
+++ b/res/shader/UI.vs
@@ -0,0 +1,16 @@
+attribute vec3 pos;
+attribute vec2 texcoord;
+attribute vec3 normal;
+
+uniform mat4 M;
+uniform mat4 V;
+uniform mat4 P;
+uniform mat4 NM;
+
+varying vec2 V_Texcoord;
+
+void main() {
+	//V_Texcoord = vec2(texcoord.x, 1.0-texcoord.y);
+	V_Texcoord = vec2(texcoord.x, texcoord.y);
+	gl_Position = P*V*M*vec4(pos,1.0);	
+}
\ No newline at end of file
diff --git a/shader2.vcxproj b/shader2.vcxproj
index acb980e..dc94119 100644
--- a/shader2.vcxproj
+++ b/shader2.vcxproj
@@ -157,6 +157,8 @@
   <ItemGroup>
     <None Include="res\shader\test.fs" />
     <None Include="res\shader\test.vs" />
+    <None Include="res\shader\UI.fs" />
+    <None Include="res\shader\UI.vs" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/shader2.vcxproj.filters b/shader2.vcxproj.filters
index b857b09..238dbbd 100644
--- a/shader2.vcxproj.filters
+++ b/shader2.vcxproj.filters
@@ -40,5 +40,11 @@
     <None Include="res\shader\test.vs">
       <Filter>婧愭枃浠�</Filter>
     </None>
+    <None Include="res\shader\UI.fs">
+      <Filter>婧愭枃浠�</Filter>
+    </None>
+    <None Include="res\shader\UI.vs">
+      <Filter>婧愭枃浠�</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file