From 6cc1be1b0da143e806462ae3de3eb17104d5bffc Mon Sep 17 00:00:00 2001 From: Michael Fabian Dirks Date: Sun, 20 Aug 2017 00:25:20 +0200 Subject: [PATCH] effect: Minor formatting changes --- data/effects/color-conversion.effect | 2 +- data/effects/displace.effect | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/effects/color-conversion.effect b/data/effects/color-conversion.effect index d20e4bec..30a3f1e9 100644 --- a/data/effects/color-conversion.effect +++ b/data/effects/color-conversion.effect @@ -27,7 +27,7 @@ VertDataOut VSDefault(VertDataIn v_in) { // ************************************************************************** // // RGB <-> YUV // ************************************************************************** // -float4 RGBtoYUV(float4 rgba, float3x3 yuv) { +float4 RGBtoYUV(float4 rgba, float3x3 yuv) { return float4( rgba.r * yuv._m00 + rgba.g * yuv._m01 + rgba.b * yuv._m02, rgba.r * yuv._m10 + rgba.g * yuv._m11 + rgba.b * yuv._m12, diff --git a/data/effects/displace.effect b/data/effects/displace.effect index 08f1afaf..0dbc6ae7 100644 --- a/data/effects/displace.effect +++ b/data/effects/displace.effect @@ -41,10 +41,10 @@ float4 PSDisplace(VertDataOut v_in) : TARGET float2 signdisp = disp * float2(281474976710656.0, 281474976710656.0); float2 signs = float2(clamp(disp.r, -1.0, 1.0), clamp(disp.g, -1.0, 1.0)); disp = (floor(abs(disp * 127.0)) / 127.0) * signs; - + float2 uv = v_in.uv + (disp * texelScale * displacementScale); float4 rgba = image.Sample(textureSampler, uv); - + return rgba; }