From 6726417ad8eaf97cfd0c9496a499d3d8baa29855 Mon Sep 17 00:00:00 2001 From: Pinchuk Aleksei Date: Fri, 2 Aug 2019 18:33:41 +0300 Subject: [PATCH] updated fonts shader and material --- samples/bin/library/font_material.json | 7 +------ samples/bin/library/font_shader.frag | 2 -- samples/bin/library/font_shader.vert | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/samples/bin/library/font_material.json b/samples/bin/library/font_material.json index d16987f8..13216dd9 100644 --- a/samples/bin/library/font_material.json +++ b/samples/bin/library/font_material.json @@ -12,10 +12,5 @@ } } }], - "property_block" : { - "samplers" : [{ - "name" : "u_texture", - "texture" : "bmruen.png" - }] - } + "property_block" : {} } diff --git a/samples/bin/library/font_shader.frag b/samples/bin/library/font_shader.frag index a04c8752..c6b20f0a 100644 --- a/samples/bin/library/font_shader.frag +++ b/samples/bin/library/font_shader.frag @@ -1,5 +1,3 @@ -#version 120 - uniform sampler2D u_texture; varying vec2 v_st0; diff --git a/samples/bin/library/font_shader.vert b/samples/bin/library/font_shader.vert index 0e2e9922..321b34fe 100644 --- a/samples/bin/library/font_shader.vert +++ b/samples/bin/library/font_shader.vert @@ -1,5 +1,3 @@ -#version 120 - uniform mat4 u_matrix_m; uniform mat4 u_matrix_vp;