*格式化代码

7 files changed, 11 insertions, 11 deletions

diff --git a/bin/SDL2.dll b/bin/SDL2.dll
index 051c861..c45142b 100644
--- a/bin/SDL2.dll
+++ b/bin/SDL2.dll
diff --git a/bin/cembed.exe b/bin/cembed.exe
index 56f8692..7f800af 100644
--- a/bin/cembed.exe
+++ b/bin/cembed.exe
diff --git a/bin/game/config.lua b/bin/game/config.lua
index ba2e9df..095ee28 100644
--- a/bin/game/config.lua
+++ b/bin/game/config.lua
@@ -1,6 +1,6 @@
 return 
 {
     title = "window form", 
-    --icon = "splash.png",
+    icon = "splash.png",
 	vsync = true
 }
\ No newline at end of file
diff --git a/bin/jin.exe b/bin/jin.exe
index 8588f84..385f0ec 100644
--- a/bin/jin.exe
+++ b/bin/jin.exe
diff --git a/bin/lua51.dll b/bin/lua51.dll
index c7592fb..bb4e450 100644
--- a/bin/lua51.dll
+++ b/bin/lua51.dll
diff --git a/src/libjin/graphics/fonts/je_texture_font.cpp b/src/libjin/graphics/fonts/je_texture_font.cpp
index bd1b061..016367c 100644
--- a/src/libjin/graphics/fonts/je_texture_font.cpp
+++ b/src/libjin/graphics/fonts/je_texture_font.cpp
@@ -276,14 +276,14 @@ namespace JinEngine
                 const vector<GlyphArrayDrawInfo>& glyphinfolist = page->glyphinfolist;
                 const vector<GlyphVertex>& glyphvertices = page->glyphvertices;
                 Matrix modelMatrix = gl.getModelViewMatrix(x, y, 1, 1, 0, 0, 0);
-                shader->prepare();
-                shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix);
-                shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
+                shader->prepare()
+                    .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix)
+                    .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
                 for (int i = 0; i < glyphinfolist.size(); ++i)
                 {
                     const GlyphArrayDrawInfo& info = glyphinfolist[i];
-                    shader->uploadVertices(2, GL_INT, sizeof(GlyphVertex), &glyphvertices[info.start].x);
-                    shader->uploadUV(2, GL_FLOAT, sizeof(GlyphVertex), &glyphvertices[info.start].u);
+                    shader->uploadVertices(2, GL_INT, sizeof(GlyphVertex), &glyphvertices[info.start].x)
+                        .uploadUV(2, GL_FLOAT, sizeof(GlyphVertex), &glyphvertices[info.start].u);
                     gl.bindTexture(info.texture);
                     gl.drawArrays(GL_QUADS, 0, info.count);
                     gl.bindTexture(0);
diff --git a/src/libjin/graphics/fonts/je_ttf.cpp b/src/libjin/graphics/fonts/je_ttf.cpp
index 0e9f672..1df7fa7 100644
--- a/src/libjin/graphics/fonts/je_ttf.cpp
+++ b/src/libjin/graphics/fonts/je_ttf.cpp
@@ -295,14 +295,14 @@ namespace JinEngine
                 const vector<GlyphArrayDrawInfo>& glyphinfolist = page->glyphinfolist;
                 const vector<GlyphVertex>& glyphvertices = page->glyphvertices;
                 Matrix modelMatrix = gl.getModelViewMatrix(x, y, 1, 1, 0, 0, 0);
-                shader->prepare();
-                shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix);
-                shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
+                shader->prepare()
+                    .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix)
+                    .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
                 for (int i = 0; i < glyphinfolist.size(); ++i)
                 {
                     const GlyphArrayDrawInfo& info = glyphinfolist[i];
-                    shader->uploadVertices(2, GL_INT, sizeof(GlyphVertex), &glyphvertices[info.start].x);
-                    shader->uploadUV(2, GL_FLOAT, sizeof(GlyphVertex), &glyphvertices[info.start].u);
+                    shader->uploadVertices(2, GL_INT, sizeof(GlyphVertex), &glyphvertices[info.start].x)
+                        .uploadUV(2, GL_FLOAT, sizeof(GlyphVertex), &glyphvertices[info.start].u);
                     gl.bindTexture(info.texture);
                     gl.drawArrays(GL_QUADS, 0, info.count);
                     gl.bindTexture(0);