Browse Source

Merge pull request #622 from BeamNG/texel_pixel_offset

Handle texel-pixel offset with diferents graphics APIs.
LuisAntonRebollo 10 years ago
parent
commit
3e7c7b3e49
2 changed files with 8 additions and 3 deletions
  1. 5 2
      Engine/source/gfx/util/screenspace.cpp
  2. 3 1
      Engine/source/postFx/postEffect.cpp

+ 5 - 2
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 );
 
+   const 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.0f,
+                            hasTexelPixelOffset ? (0.5f / targetSize.y) : 0.0f );
 
    rtParams.set( targetOffset.x + halfPixel.x,
                  targetOffset.y + halfPixel.y,

+ 3 - 1
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;