diff options
Diffstat (limited to 'Data/Resources')
| -rw-r--r-- | Data/Resources/Font/simsun.ttc | bin | 0 -> 18214472 bytes | |||
| -rw-r--r-- | Data/Resources/Metatable/Excel/Icons.xlsx | bin | 12425 -> 12447 bytes | |||
| -rw-r--r-- | Data/Resources/Shaders/Editor-Text.glsl | 7 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Data/Resources/Font/simsun.ttc b/Data/Resources/Font/simsun.ttc Binary files differnew file mode 100644 index 0000000..5f22ce3 --- /dev/null +++ b/Data/Resources/Font/simsun.ttc diff --git a/Data/Resources/Metatable/Excel/Icons.xlsx b/Data/Resources/Metatable/Excel/Icons.xlsx Binary files differindex 7259175..c4c454a 100644 --- a/Data/Resources/Metatable/Excel/Icons.xlsx +++ b/Data/Resources/Metatable/Excel/Icons.xlsx diff --git a/Data/Resources/Shaders/Editor-Text.glsl b/Data/Resources/Shaders/Editor-Text.glsl index 34412e3..7548507 100644 --- a/Data/Resources/Shaders/Editor-Text.glsl +++ b/Data/Resources/Shaders/Editor-Text.glsl @@ -1,3 +1,5 @@ +// 渲染编辑器文字 + #version 330 core CMD_BEGIN @@ -8,6 +10,7 @@ CMD_END uniform mat4 gamelab_mat_mvp; uniform sampler2D gamelab_main_tex; +uniform vec2 gamelab_ui_position; VSH_BEGIN layout (location = 0) in vec2 vPos; @@ -19,7 +22,7 @@ out vec4 color; void main() { - vec2 pos = vPos + vec2(10, 40); + vec2 pos = vPos + gamelab_ui_position; vec4 clip = gamelab_mat_mvp * vec4(pos, -1, 1.0); gl_Position = clip; uv = vUV; @@ -38,7 +41,7 @@ void main() //vec2 uv = vec2(uv.x, 1 - uv.y); vec4 sampled = vec4(0.8,0.8,0.8,texture(gamelab_main_tex, uv).r); sampled *= color; - // vec4 sampled = vec4(1,1,1,1); + //sampled = vec4(1,1,1,1); FragColor = sampled; } FSH_END |