From 8fef6cdd3ed58cf99049378200851fe85174f9c4 Mon Sep 17 00:00:00 2001 From: dotlive Date: Thu, 19 Oct 2017 07:30:33 +0800 Subject: [PATCH] =?UTF-8?q?fix=20shader=20file=E2=80=99s=20variable=20name?= =?UTF-8?q?=20dismatched=20with=20source=20file=E2=80=99s.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../6.3.coordinate_systems.fs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/1.getting_started/6.3.coordinate_systems_multiple/6.3.coordinate_systems.fs b/src/1.getting_started/6.3.coordinate_systems_multiple/6.3.coordinate_systems.fs index be379bd..91b9fe8 100644 --- a/src/1.getting_started/6.3.coordinate_systems_multiple/6.3.coordinate_systems.fs +++ b/src/1.getting_started/6.3.coordinate_systems_multiple/6.3.coordinate_systems.fs @@ -3,10 +3,10 @@ out vec4 FragColor; in vec2 TexCoord; -uniform sampler2D ourTexture1; -uniform sampler2D ourTexture2; +uniform sampler2D texture1; +uniform sampler2D texture2; void main() { - FragColor = mix(texture(ourTexture1, TexCoord), texture(ourTexture2, TexCoord), 0.2); + FragColor = mix(texture(texture1, TexCoord), texture(texture2, TexCoord), 0.2); } \ No newline at end of file