From 5594b8886dd60af65c52e1f288fcb0782ce7e7c9 Mon Sep 17 00:00:00 2001
From: blobt <klm777x7@gmail.com>
Date: Sun, 21 Jun 2020 12:43:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=98=E5=88=B6=E7=82=B9=E7=B2=BE=E7=81=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/shader2/v14/.suo      | Bin 43520 -> 43520 bytes
 main.cpp                  |  14 ++++++++------
 res/shader/PointSprite.fs |   5 +++++
 res/shader/PointSprite.vs |  13 +++++++++++++
 shader2.vcxproj           |   7 ++-----
 shader2.vcxproj.filters   |  13 ++-----------
 6 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 res/shader/PointSprite.fs
 create mode 100644 res/shader/PointSprite.vs

diff --git a/.vs/shader2/v14/.suo b/.vs/shader2/v14/.suo
index 8cc6f7ad1eb095516eadcd8fd094cd656bb25d2a..ab310b6ad448185dccf729f2c0b7172e743a21e3 100644
GIT binary patch
delta 411
zcmZp;!qjkuX+sVZ>j!74sV$oenN~AO{s#g+1_lNYEeE9k0ck}btuWb?Mcz^#$WnsJ
zf>g)=*~(D92$bdp(%e8S3B(*gEDXf|HutjJXJmcg;yeXt58HZ1M#0I79MYUDKsk^(
z?2}zN>=`*Ww{lc-PV!LLtRVM*ag&Gw*JK5S6&&JFMUw+vR3?8>I6wI?li}tsiabo4
zloXgYD<}Y!swuEdRuE8OkpL>4oLDM6ImShDbBRC?<0if1OoCtLyA_rEI9&War|DV$
z>9-OLlNnisH@`LzW!_}u%sAOu)Npc%alqswiUvGdKm%5QTm=M+%vdJbIP)@s9H<ZE
zgJ_T&Hka7+F>YqE`Nuj*<OGKpvdk9|9>zs3Op^?bW4CnjYl8^Eo0GrV?>SlaBdOu!
ZyUORwcp%P6x17l|`J!jT<_52ZcmQ|HoeTf~

delta 307
zcmZp;!qjkuX+sVZD}&^nj)u*JOsg3s<rx?l{sVyokd_1De?Yb(kmj6h$|5hz4rECJ
zF-V0hkQN4F87TkX<U$T%PCh8_|K?tn`;4p&ow^{C+14{MvP@RwkmdxL0MgAr*_Fed
zQE+oBM>Xdn1*T0R3S65NgdQ+1QegseC#fiad7IP}*fuMuJYd|Ucbti{@vmp(h4p0$
zy_+vsI52J&F#5na$>2DOumR&DGnPdjOp~mfH#^(xWu2sTn3oacCQ+!plLPfsHh<CL
xVO-?GG)cgjl~ErkF*&hRcyf%M<mM8AHH?!LBpxgZXPlg%r+|z%H+VI~0|3n&YAgT%

diff --git a/main.cpp b/main.cpp
index ad062f4..0658ee1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -90,7 +90,7 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	glewInit();
 
 	/*创建program*/
-	GLuint program = CreateGPUProgram("res/shader/UI FullScreemQuad.vs", "res/shader/UI.fs");
+	GLuint program = CreateGPUProgram("res/shader/PointSprite.vs", "res/shader/PointSprite.fs");
 
 	GLuint posLocation, texcoordLocation, normalLocation, MLocation, VLocation, PLocation, NMLocation, textureLocation;
 	posLocation = glGetAttribLocation(program, "pos");
@@ -115,6 +115,9 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 		printf("load obj model fail\n");
 	}
 
+	vertexes[0].position[0] = 0.0f;
+	vertexes[0].position[1] = 0.0f;
+
 	/*创建vbo*/
 	GLuint vbo = CreateBufferObject(GL_ARRAY_BUFFER, sizeof(VertexData) * vertexCount, GL_STATIC_DRAW, vertexes);
 
@@ -125,8 +128,10 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	GLuint mainTexture = CreateTextureFromFile("res/image/stone.jpg");
 	GLuint secondTexture = CreateTextureFromDds("res/image/150001.dds");
 
-	glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+	glClearColor(0.1f, 0.4f, 0.7f, 1.0f);
 	glEnable(GL_DEPTH_TEST);
+	glEnable(GL_POINT_SPRITE);
+	glEnable(GL_PROGRAM_POINT_SIZE);
 	glViewport(0,0, windowWidth, windowHeight);
 
 	//创建一个单位矩阵和一个投影矩阵，后面用来传递到shader
@@ -170,7 +175,7 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 		glBindBuffer(GL_ARRAY_BUFFER, 0);
 
 		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo);
-		glDrawElements(GL_TRIANGLES, indexCount, GL_UNSIGNED_INT, 0);
+		glDrawElements(GL_POINTS, 1, GL_UNSIGNED_INT, 0);
 		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
 		glUseProgram(0);
 	};
@@ -185,9 +190,6 @@ INT WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 		}
 
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-		
-		glEnable(GL_SCISSOR_TEST);
-		glScissor(400,300, 100, 100);
 		what();
 
 		SwapBuffers(dc);
diff --git a/res/shader/PointSprite.fs b/res/shader/PointSprite.fs
new file mode 100644
index 0000000..5518475
--- /dev/null
+++ b/res/shader/PointSprite.fs
@@ -0,0 +1,5 @@
+uniform sampler2D U_MainTexture;
+void main()
+{
+    gl_FragColor=texture2D(U_MainTexture,gl_PointCoord.xy);
+}
\ No newline at end of file
diff --git a/res/shader/PointSprite.vs b/res/shader/PointSprite.vs
new file mode 100644
index 0000000..7c9cab0
--- /dev/null
+++ b/res/shader/PointSprite.vs
@@ -0,0 +1,13 @@
+attribute vec3 pos;
+attribute vec2 texcoord;
+attribute vec3 normal;
+
+uniform mat4 M;
+uniform mat4 V;
+uniform mat4 P;
+
+void main()
+{
+	gl_PointSize = 30.0;
+    gl_Position=P*V*M*vec4(pos,1.0);
+}
\ No newline at end of file
diff --git a/shader2.vcxproj b/shader2.vcxproj
index ce6f785..206e497 100644
--- a/shader2.vcxproj
+++ b/shader2.vcxproj
@@ -157,11 +157,8 @@
     <ClInclude Include="timer.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\shader\test.fs" />
-    <None Include="res\shader\test.vs" />
-    <None Include="res\shader\UI FullScreemQuad.vs" />
-    <None Include="res\shader\UI.fs" />
-    <None Include="res\shader\UI.vs" />
+    <None Include="res\shader\PointSprite.fs" />
+    <None Include="res\shader\PointSprite.vs" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/shader2.vcxproj.filters b/shader2.vcxproj.filters
index 96d48a3..e0e406c 100644
--- a/shader2.vcxproj.filters
+++ b/shader2.vcxproj.filters
@@ -40,19 +40,10 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\shader\test.fs">
+    <None Include="res\shader\PointSprite.fs">
       <Filter>婧愭枃浠�</Filter>
     </None>
-    <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>
-    <None Include="res\shader\UI FullScreemQuad.vs">
+    <None Include="res\shader\PointSprite.vs">
       <Filter>婧愭枃浠�</Filter>
     </None>
   </ItemGroup>