diff options
| author | chai <chaifix@163.com> | 2018-12-25 08:30:33 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2018-12-25 08:30:33 +0800 |
| commit | 966d916d04c2cae78f3253ada38675f75d7301ed (patch) | |
| tree | cba30aa232c0e3a53b8d6cc052f8b379a02db6a3 | |
| parent | b5e9b7add80b271c269943d9996b206378e2d820 (diff) | |
*注释
| -rw-r--r-- | bin/game/main.lua | 7 | ||||
| -rw-r--r-- | bin/jin.exe | bin | 576512 -> 576512 bytes | |||
| -rw-r--r-- | src/libjin/graphics/shaders/je_jsl_compiler.cpp | 11 |
3 files changed, 10 insertions, 8 deletions
diff --git a/bin/game/main.lua b/bin/game/main.lua index 2dc358e..bba760e 100644 --- a/bin/game/main.lua +++ b/bin/game/main.lua @@ -186,7 +186,6 @@ function jin.core.onLoad() vec4 c1 = texel(tex, v.uv - value / jin_RenderTargetSize.x); vec4 c2 = texel(tex, v.uv); vec4 c3 = texel(tex, v.uv + value / jin_RenderTargetSize.y); - return vec4(c1.r, c2.g, c3.b, c1.a + c2.a + c3.b); } #END_FRAGMENT_SHADER @@ -322,7 +321,9 @@ function jin.core.onDraw() --jin.graphics.draw(sprs[2], 150, 150, 1, 1, 0) local x, y = jin.mouse.getPosition() animator:render(350, 150, 1, 1, 0) + jin.graphics.useShader(jin.graphics.Shaders.Font) jin.graphics.print("* Particle system test\n* Animation test.", 10, 10) + jin.graphics.unuseShader() jin.graphics.draw(spr, 100, 200, 1, 1, 0) jin.graphics.useShader(jin.graphics.Shaders.Mesh) jin.graphics.draw(mesh, 200, 100) @@ -337,8 +338,10 @@ function jin.core.onDraw() jin.graphics.rect(jin.graphics.RenderMode.FILL, 440, 0, 140, 120) jin.graphics.unuseShader() jin.graphics.setColor(255, 255, 255, 255) + jin.graphics.useShader(jin.graphics.Shaders.Font) jin.graphics.print(jin.graphics.getStatsStr(), 450, 10) - jin.graphics.unbindCanvas(screen) + jin.graphics.unuseShader() + jin.graphics.unbindCanvas(screen) jin.graphics.useShader(rgbsplit) jin.graphics.draw(screen, 0, 0) diff --git a/bin/jin.exe b/bin/jin.exe Binary files differindex c9ca1dc..581d1d5 100644 --- a/bin/jin.exe +++ b/bin/jin.exe diff --git a/src/libjin/graphics/shaders/je_jsl_compiler.cpp b/src/libjin/graphics/shaders/je_jsl_compiler.cpp index c5a004e..8904b96 100644 --- a/src/libjin/graphics/shaders/je_jsl_compiler.cpp +++ b/src/libjin/graphics/shaders/je_jsl_compiler.cpp @@ -17,21 +17,20 @@ namespace JinEngine { /// - /// Built-in variables in vertex shader: + /// Uniforms: /// jin_ProjectionMatrix --+ /// jin_ModelViewMatrix |- Uniforms /// jin_MainTexture | + /// jin_RenderTargetSize | /// jin_Time --+ + /// + /// Built-in variables in vertex shader: /// jin_VertexCoords --+ /// jin_TextureCoords |- Attributes /// jin_VertexColor --+ - /// jin_Color - GLSL built in + /// jin_Color ---- GLSL built in /// /// Built-in variables in fragment shader: - /// jin_ProjectionMatrix --+ - /// jin_ModelViewMatrix |- Uniforms - /// jin_MainTexture | - /// jin_Time --+ /// jin_Color --+ /// jin_XY |- Inputs /// jin_UV | |