From 1c8aefca349836da0ec3c70ced4a2270112b5a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 12 Dec 2019 19:31:10 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@698 a8b55f48-bf90-11e4-a774-851b48703e85 --- qglengine/core/glshaders_headers.h | 2 +- qglengine/shaders/ds_geom.glsl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qglengine/core/glshaders_headers.h b/qglengine/core/glshaders_headers.h index 28a3447..8ddd960 100644 --- a/qglengine/core/glshaders_headers.h +++ b/qglengine/core/glshaders_headers.h @@ -57,7 +57,7 @@ const char qgl_fragment_head[] = " vec4 t = texture(qgl_texture_array[qgl_material[qgl_MaterialIndex].map[type].array_index],\n" " vec3(coord, qgl_material[qgl_MaterialIndex].map[type].map_index));\n" " t += tex_shift;\n" - " t = t * qgl_material[qgl_MaterialIndex].map[type].amount + qgl_material[qgl_MaterialIndex].map[type].offset;\n" + " t.rgb = t.rgb * qgl_material[qgl_MaterialIndex].map[type].amount + qgl_material[qgl_MaterialIndex].map[type].offset;\n" " return t;\n" "}\n" "#define qgl_FragColor qgl_FragData[0]\n" diff --git a/qglengine/shaders/ds_geom.glsl b/qglengine/shaders/ds_geom.glsl index 66e38f2..2d7967a 100644 --- a/qglengine/shaders/ds_geom.glsl +++ b/qglengine/shaders/ds_geom.glsl @@ -30,7 +30,8 @@ const float _pe = 2.4e-7; void main(void) { vec2 tc = qgl_FragTexture.xy; - vec4 diffuse = qgl_materialTexture(QGL_MAP_DIFFUSE, tc, vec4(0)) * qgl_material[qgl_MaterialIndex].color_diffuse * object_color; + vec4 diffuse = qgl_materialTexture(QGL_MAP_DIFFUSE, tc, vec4(0)) * object_color; + diffuse.rgb *= qgl_material[qgl_MaterialIndex].color_diffuse.rgb; diffuse.a *= (1.f - qgl_material[qgl_MaterialIndex].transparency); vec3 normal, dn;