From bc80fbf9662158ee5871ad60e83e473ce089d50f Mon Sep 17 00:00:00 2001 From: LuisAntonRebollo Date: Thu, 17 Apr 2014 20:33:51 +0200 Subject: [PATCH 1/2] Handle texel-pixel offset with diferents graphics APIs. --- Engine/source/gfx/util/screenspace.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Engine/source/gfx/util/screenspace.cpp b/Engine/source/gfx/util/screenspace.cpp index 3ef64be48..727eccb63 100644 --- a/Engine/source/gfx/util/screenspace.cpp +++ b/Engine/source/gfx/util/screenspace.cpp @@ -21,6 +21,7 @@ //----------------------------------------------------------------------------- #include "gfx/util/screenspace.h" +#include "gfx/gfxDevice.h" // The conversion from screen space to the render target // is made more complex because screen space is relative @@ -41,9 +42,11 @@ void ScreenSpace::RenderTargetParameters(const Point3I &targetSize, const RectI Point2F targetScale( (F32)targetViewport.extent.x / (F32)targetSize.x, (F32)targetViewport.extent.y / (F32)targetSize.y ); + bool hasTexelPixelOffset = GFX->getAdapterType() == Direct3D9; + // Get the target half pixel size. - const Point2F halfPixel( 0.5f / targetSize.x, - 0.5f / targetSize.y ); + const Point2F halfPixel( hasTexelPixelOffset ? 0.5f / targetSize.x : 0.0, + hasTexelPixelOffset ? 0.5f / targetSize.y : 0.0); rtParams.set( targetOffset.x + halfPixel.x, targetOffset.y + halfPixel.y, From 823b413c1f9212a57cc1bfa22be399d6658eccac Mon Sep 17 00:00:00 2001 From: LuisAntonRebollo Date: Thu, 27 Nov 2014 00:57:54 +0100 Subject: [PATCH 2/2] Handle texel-pixel offset with diferents graphics APIs. --- Engine/source/gfx/util/screenspace.cpp | 6 +++--- Engine/source/postFx/postEffect.cpp | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Engine/source/gfx/util/screenspace.cpp b/Engine/source/gfx/util/screenspace.cpp index 727eccb63..c6a159417 100644 --- a/Engine/source/gfx/util/screenspace.cpp +++ b/Engine/source/gfx/util/screenspace.cpp @@ -42,11 +42,11 @@ void ScreenSpace::RenderTargetParameters(const Point3I &targetSize, const RectI Point2F targetScale( (F32)targetViewport.extent.x / (F32)targetSize.x, (F32)targetViewport.extent.y / (F32)targetSize.y ); - bool hasTexelPixelOffset = GFX->getAdapterType() == Direct3D9; + const bool hasTexelPixelOffset = GFX->getAdapterType() == Direct3D9; // Get the target half pixel size. - const Point2F halfPixel( hasTexelPixelOffset ? 0.5f / targetSize.x : 0.0, - hasTexelPixelOffset ? 0.5f / targetSize.y : 0.0); + const Point2F halfPixel( hasTexelPixelOffset ? (0.5f / targetSize.x) : 0.0f, + hasTexelPixelOffset ? (0.5f / targetSize.y) : 0.0f ); rtParams.set( targetOffset.x + halfPixel.x, targetOffset.y + halfPixel.y, diff --git a/Engine/source/postFx/postEffect.cpp b/Engine/source/postFx/postEffect.cpp index aff1e6f2c..5ff5e8387 100644 --- a/Engine/source/postFx/postEffect.cpp +++ b/Engine/source/postFx/postEffect.cpp @@ -637,7 +637,9 @@ void PostEffect::_setupConstants( const SceneRenderState *state ) Point2F offset((F32)viewport.point.x / (F32)targetSize.x, (F32)viewport.point.y / (F32)targetSize.y ); Point2F scale((F32)viewport.extent.x / (F32)targetSize.x, (F32)viewport.extent.y / (F32)targetSize.y ); - const Point2F halfPixel( 0.5f / targetSize.x, 0.5f / targetSize.y ); + const bool hasTexelPixelOffset = GFX->getAdapterType() == Direct3D9; + const Point2F halfPixel( hasTexelPixelOffset ? (0.5f / targetSize.x) : 0.0f, + hasTexelPixelOffset ? (0.5f / targetSize.y) : 0.0f ); Point4F targetParams; targetParams.x = offset.x + halfPixel.x;