From 5ee096de203eb0d635ff09699be234c590ebd10e Mon Sep 17 00:00:00 2001 From: Areloch Date: Sat, 29 Aug 2015 12:41:35 -0500 Subject: [PATCH] Added in explicit setting to vec2 in the shader functions per Az's suggestion, to avoid GLSL problems --- Templates/Empty/game/shaders/common/gl/torque.glsl | 8 ++++---- Templates/Full/game/shaders/common/gl/torque.glsl | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Templates/Empty/game/shaders/common/gl/torque.glsl b/Templates/Empty/game/shaders/common/gl/torque.glsl index fcb54ba5f..9032a57f7 100644 --- a/Templates/Empty/game/shaders/common/gl/torque.glsl +++ b/Templates/Empty/game/shaders/common/gl/torque.glsl @@ -139,12 +139,12 @@ mat3x3 quatToMat( vec4 quat ) vec2 parallaxOffset( sampler2D texMap, vec2 texCoord, vec3 negViewTS, float depthScale ) { float depth = texture( texMap, texCoord ).a; - vec2 offset = negViewTS.xy * ( depth * depthScale ); + vec2 offset = negViewTS.xy * vec2( depth * depthScale ); for ( int i=0; i < PARALLAX_REFINE_STEPS; i++ ) { depth = ( depth + texture( texMap, texCoord + offset ).a ) * 0.5; - offset = negViewTS.xy * ( depth * depthScale ); + offset = negViewTS.xy * vec2( depth * depthScale ); } return offset; @@ -154,12 +154,12 @@ vec2 parallaxOffset( sampler2D texMap, vec2 texCoord, vec3 negViewTS, float dept vec2 parallaxOffsetDxtnm(sampler2D texMap, vec2 texCoord, vec3 negViewTS, float depthScale) { float depth = texture(texMap, texCoord).r; - vec2 offset = negViewTS.xy * (depth * depthScale); + vec2 offset = negViewTS.xy * vec2(depth * depthScale); for (int i = 0; i < PARALLAX_REFINE_STEPS; i++) { depth = (depth + texture(texMap, texCoord + offset).r) * 0.5; - offset = negViewTS.xy * (depth * depthScale); + offset = negViewTS.xy * vec2(depth * depthScale); } return offset; diff --git a/Templates/Full/game/shaders/common/gl/torque.glsl b/Templates/Full/game/shaders/common/gl/torque.glsl index fcb54ba5f..9032a57f7 100644 --- a/Templates/Full/game/shaders/common/gl/torque.glsl +++ b/Templates/Full/game/shaders/common/gl/torque.glsl @@ -139,12 +139,12 @@ mat3x3 quatToMat( vec4 quat ) vec2 parallaxOffset( sampler2D texMap, vec2 texCoord, vec3 negViewTS, float depthScale ) { float depth = texture( texMap, texCoord ).a; - vec2 offset = negViewTS.xy * ( depth * depthScale ); + vec2 offset = negViewTS.xy * vec2( depth * depthScale ); for ( int i=0; i < PARALLAX_REFINE_STEPS; i++ ) { depth = ( depth + texture( texMap, texCoord + offset ).a ) * 0.5; - offset = negViewTS.xy * ( depth * depthScale ); + offset = negViewTS.xy * vec2( depth * depthScale ); } return offset; @@ -154,12 +154,12 @@ vec2 parallaxOffset( sampler2D texMap, vec2 texCoord, vec3 negViewTS, float dept vec2 parallaxOffsetDxtnm(sampler2D texMap, vec2 texCoord, vec3 negViewTS, float depthScale) { float depth = texture(texMap, texCoord).r; - vec2 offset = negViewTS.xy * (depth * depthScale); + vec2 offset = negViewTS.xy * vec2(depth * depthScale); for (int i = 0; i < PARALLAX_REFINE_STEPS; i++) { depth = (depth + texture(texMap, texCoord + offset).r) * 0.5; - offset = negViewTS.xy * (depth * depthScale); + offset = negViewTS.xy * vec2(depth * depthScale); } return offset;