From 4266fe4133c89f40e29ef6c10167dbc4bb255e97 Mon Sep 17 00:00:00 2001
From: blobt <klm777x7@gmail.com>
Date: Fri, 26 Jun 2020 16:59:52 +0800
Subject: [PATCH] tmp

---
 .vs/shader2/v14/.suo            | Bin 53248 -> 53248 bytes
 main.cpp                        |  34 ++++++++++++++++++++++++--------
 res/shader/SimpleTexture.fs     |   8 ++++++++
 res/shader/SimpleTexture.vs     |  14 +++++++++++++
 res/shader/UI FullScreemQuad.vs |   1 -
 shader2.vcxproj                 |   5 +++--
 shader2.vcxproj.filters         |   7 +++++--
 7 files changed, 56 insertions(+), 13 deletions(-)
 create mode 100644 res/shader/SimpleTexture.fs
 create mode 100644 res/shader/SimpleTexture.vs

diff --git a/.vs/shader2/v14/.suo b/.vs/shader2/v14/.suo
index 7e7dfc279c446299f0af31a2d1f3136a6e141e56..1b7abfdfee021e5e05747ebbd2303d6dc7768314 100644
GIT binary patch
delta 909
zcma)3OK1~O6n%FxGfkSrw3tsD6O+kEJApK*sB|G(YDTNrBK6aipe_D&Q8d_{iMsMb
z)wzNT5y})wMHkv}DQZl+5QKt|g}BhYAQoCs!H)OE3`7*_gEQye^X|L%ym_TbS83Aq
z<eVUnJ@30N?8WoK6_~S@1r?wT+eKAsW{kzKPfVm!6s_2{EfEvhi8_xG57lF?NAa52
z0|6|HMUm&0E@>ct`n=8QU$&NI6^iTVj7snj{Ppu4#6bd|<E&Uc?<S5A(gc~%O2`v<
z9k2IN%ss{l+z<EV^xzz&JVfaEt>Zm04dDito@dbdlJ;H^c)!=g6<lmqt&I1rN2+a6
zn!}8D2{xh9srq(N$sPi4k3-r9`2{7n82<2SXpZie$~>iw93ItTs7xn_lMaB@mH2F1
zzRAz}shIn7nqeVv(}*T98P?ou8g#1=-UoizNz(2HS#kkmH>~eUlVJE$nCeupB5Z-x
z$N$5S*&)xa*TMI{maq_B@B=sA=m-mugKqwdoEv#-7D=FG**OpleNN=hg(Fwj;$f}b
zTGD-BZWfGW1@nQ8#)4>lOS-|(D^l%Q|EQbImH^J+<*tG3FgwkTvvH==cZ?O-DK^MP
zD9W;n>;jv4^x<9qkz)G&(_Z_)_}MBhJ`Q1OJ`+4dk9TJ!axx!x7un30-j7pnCQ!)+
ztz+f`uwc6l0dBovp)%hk@nfsaJwbD;TklQ}ngc%{%GHo>IC!Zx_xAnnmcM4UOno(X
GO#A}sNJljQ

delta 517
zcmZozz}&Eac|#5po4_5u+uyw=7cn(4?%Vv8NtuyRak3<fGAk<s1B1k5M;3Y303hq%
z#6V%eBp~BI6et1N{F6Ib%o({RA7rU#2?X*tyRd37vRydGjbtF3GNY#=P)-@DmlsI?
z1Dc@*q(z`?HmIB!kmdwp11Mh;NIL^D$N^w$Co_tQE1<hV6)4LG#O6TE4aAdYuxNlC
zWiH|b<iZ>bqD4W{Jgg>A*K%%QoXjGsu~~up1}Buk#JE{0EQoP(iGIlB6X6z{B%IlK
z8Qp-|WT8e)4is0JTq57I$cJf>64N3frbTLO;ta_Q1weT4ytV86^MNJb_7$F3oqOGI
z^2arzll7JfZMHKw#JI_-fl*-MKk;;DS&n*!74PitFFx5fdBWU+MFvc`<xH3+@j3G{
zumEib`3>X=kP9}K@bxfGl2X{Lp!I-pl7KTWBS;1mo(L5JJ<N;jm^SISF!EsafKwj;
DLa4cC

diff --git a/main.cpp b/main.cpp
index d028fd1..8563c3b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -91,9 +91,9 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	glewInit();
 
 	/*创建program*/
-	GLuint program = CreateGPUProgram("res/shader/ViewDepthMap.vs", "res/shader/ViewDepthMap.fs");
+	GLuint program = CreateGPUProgram("res/shader/UI FullScreemQuad.vs", "res/shader/SimpleTexture.fs");
 
-	GLuint posLocation, texcoordLocation, normalLocation, MLocation, VLocation, PLocation;
+	GLuint posLocation, texcoordLocation, normalLocation, MLocation, VLocation, PLocation, textureLocation;
 	posLocation = glGetAttribLocation(program, "pos");
 	texcoordLocation = glGetAttribLocation(program, "texcoord");
 	normalLocation = glGetAttribLocation(program, "normal");
@@ -101,13 +101,14 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	MLocation = glGetUniformLocation(program, "M");
 	VLocation = glGetUniformLocation(program, "V");
 	PLocation = glGetUniformLocation(program, "P");
+	textureLocation = glGetUniformLocation(program, "U_MainTexture");
 
 	/*load model*/
 	unsigned int *indexes = nullptr;
 	int vertexCount = 0, indexCount = 0;
 	Timer t;
 	t.Start();
-	VertexData* vertexes = LoadObjModel("res/model/niutou.obj", &indexes, vertexCount, indexCount);
+	VertexData* vertexes = LoadObjModel("res/model/Quad.obj", &indexes, vertexCount, indexCount);
 	printf("load model cost %fs %d\n", t.GetPassedTime(), t.GetPassedTickers());
 
 	if (vertexes == nullptr) {
@@ -119,9 +120,9 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	glBindBuffer(GL_ARRAY_BUFFER, vbo);
 	glEnableVertexAttribArray(posLocation);
 	glVertexAttribPointer(posLocation, 3, GL_FLOAT, GL_FALSE, sizeof(VertexData), (void*)0);
-	/*glEnableVertexAttribArray(texcoordLocation);
+	glEnableVertexAttribArray(texcoordLocation);
 	glVertexAttribPointer(texcoordLocation, 2, GL_FLOAT, GL_FALSE, sizeof(VertexData), (void*)(sizeof(float) * 3));
-	glEnableVertexAttribArray(normalLocation);
+	/*glEnableVertexAttribArray(normalLocation);
 	glVertexAttribPointer(normalLocation, 3, GL_FLOAT, GL_FALSE, sizeof(VertexData), (void*)(sizeof(float) * 5));*/
 	glBindBuffer(GL_ARRAY_BUFFER, 0);
 
@@ -131,6 +132,9 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	/*创建纹理*/
 	GLuint mainTexture = CreateTextureFromFile("res/image/niutou.bmp");
 
+	GLuint colorBuffer, depthBuffer;
+	GLuint fbo = CreateFramebufferObject(colorBuffer, depthBuffer, windowWidth, windowHeight);
+
 	glViewport(0, 0, windowWidth, windowHeight);
 
 	GL_CALL(glClearColor(0.1f, 0.4f, 0.7f, 1.0f));
@@ -164,11 +168,13 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 		glUniformMatrix4fv(VLocation, 1, GL_FALSE, identify);
 		glUniformMatrix4fv(PLocation, 1, GL_FALSE, glm::value_ptr(projection));
 
+		glBindTexture(GL_TEXTURE_2D, mainTexture);
+		glUniform1i(textureLocation, 0);
+
 		glUniformMatrix4fv(MLocation, 1, GL_FALSE, glm::value_ptr(model));
 		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo);
 		glDrawElements(GL_TRIANGLES, indexCount, GL_UNSIGNED_INT, 0);
 
-		glBindVertexArray(0);
 		glUseProgram(0);
 	};
 
@@ -187,11 +193,23 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 			DispatchMessage(&msg);
 		}
 
-		//绘制内容到fbo
-		GL_CALL(glClearColor(0.1f, 0.4f, 0.7f, 1.0f));
+		glBindFramebuffer(GL_FRAMEBUFFER, fbo);
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 		what();
+		glBindFramebuffer(GL_FRAMEBUFFER, 0);
+		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+		glEnable(GL_TEXTURE_2D);
+		glBindTexture(GL_TEXTURE_2D, colorBuffer);
+
+		glBegin(GL_QUADS);
+		glTexCoord2f(0.0f, 0.0f); glVertex3f(-0.5f, -0.5f, -2.0f);
+		glTexCoord2f(1.0f, 0.0f); glVertex3f(0.5f, -0.5f, -2.0f);
+		glTexCoord2f(1.0f, 1.0f); glVertex3f(0.5f, 0.5f, -2.0f);
+		glTexCoord2f(0.0f, 1.0f); glVertex3f(-0.5f, 0.5f, -2.0f);
+		glEnd();
 
+		glFlush();
 		SwapBuffers(dc);
 	}
 
diff --git a/res/shader/SimpleTexture.fs b/res/shader/SimpleTexture.fs
new file mode 100644
index 0000000..40af759
--- /dev/null
+++ b/res/shader/SimpleTexture.fs
@@ -0,0 +1,8 @@
+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/SimpleTexture.vs b/res/shader/SimpleTexture.vs
new file mode 100644
index 0000000..a00db95
--- /dev/null
+++ b/res/shader/SimpleTexture.vs
@@ -0,0 +1,14 @@
+attribute vec3 pos;
+attribute vec2 texcoord;
+attribute vec3 normal;
+
+uniform mat4 M;
+uniform mat4 V;
+uniform mat4 P;
+
+varying vec2 V_Texcoord;
+
+void main() {
+	V_Texcoord = texcoord;
+	gl_Position = P*V*M*vec4(pos, 1.0);	
+}
\ No newline at end of file
diff --git a/res/shader/UI FullScreemQuad.vs b/res/shader/UI FullScreemQuad.vs
index 6fdc552..2abb9c3 100644
--- a/res/shader/UI FullScreemQuad.vs	
+++ b/res/shader/UI FullScreemQuad.vs	
@@ -5,7 +5,6 @@ attribute vec3 normal;
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
-uniform mat4 NM;
 
 varying vec2 V_Texcoord;
 
diff --git a/shader2.vcxproj b/shader2.vcxproj
index bfff430..ce60435 100644
--- a/shader2.vcxproj
+++ b/shader2.vcxproj
@@ -159,8 +159,9 @@
     <ClInclude Include="timer.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\shader\ViewDepthMap.fs" />
-    <None Include="res\shader\ViewDepthMap.vs" />
+    <None Include="res\shader\SimpleTexture.fs" />
+    <None Include="res\shader\SimpleTexture.vs" />
+    <None Include="res\shader\UI FullScreemQuad.vs" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/shader2.vcxproj.filters b/shader2.vcxproj.filters
index 2a8311c..1578e22 100644
--- a/shader2.vcxproj.filters
+++ b/shader2.vcxproj.filters
@@ -46,10 +46,13 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\shader\ViewDepthMap.fs">
+    <None Include="res\shader\SimpleTexture.fs">
       <Filter>婧愭枃浠�</Filter>
     </None>
-    <None Include="res\shader\ViewDepthMap.vs">
+    <None Include="res\shader\SimpleTexture.vs">
+      <Filter>婧愭枃浠�</Filter>
+    </None>
+    <None Include="res\shader\UI FullScreemQuad.vs">
       <Filter>婧愭枃浠�</Filter>
     </None>
   </ItemGroup>