From f03f73e5c8e07a4f538f287e615da3c4962dd516 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 3 Aug 2014 21:09:55 +0200
Subject: [PATCH] 3D: Cleanup bloom effect

---
 code/nel/include/nel/3d/driver.h              |  3 ++
 code/nel/src/3d/bloom_effect.cpp              | 51 ++++++++++++++-----
 code/nel/src/3d/driver.cpp                    |  2 +-
 .../src/3d/driver/direct3d/driver_direct3d.h  |  1 +
 code/nel/src/3d/driver/opengl/driver_opengl.h |  2 +
 5 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/code/nel/include/nel/3d/driver.h b/code/nel/include/nel/3d/driver.h
index cb6ec349c..f19428cfb 100644
--- a/code/nel/include/nel/3d/driver.h
+++ b/code/nel/include/nel/3d/driver.h
@@ -974,6 +974,9 @@ public:
 													) = 0;
 	// @}
 
+	/// Hack for bloom
+	virtual bool			textureCoordinateAlternativeMode() const = 0;
+
 
 
 	/// \name Render state: Polygon mode
diff --git a/code/nel/src/3d/bloom_effect.cpp b/code/nel/src/3d/bloom_effect.cpp
index 5bc6a2bf4..7d009e29b 100644
--- a/code/nel/src/3d/bloom_effect.cpp
+++ b/code/nel/src/3d/bloom_effect.cpp
@@ -112,6 +112,9 @@ void CBloomEffect::init()
 	if (!((CDriverUser *)_Driver)->getDriver()->supportBloomEffect())
 		return;
 
+	CDriverUser *dru = static_cast<CDriverUser *>(_Driver);
+	IDriver *drv = dru->getDriver();
+
 	_BlurWidth = 256;
 	_BlurHeight = 256;
 
@@ -218,10 +221,20 @@ void CBloomEffect::init()
 	_BlurQuad.V1 = CVector(1.f,	 -1.f,	0.5f);
 	_BlurQuad.V2 = CVector(1.f,	 1.f,	0.5f);
 	_BlurQuad.V3 = CVector(-1.f, 1.f,	0.5f);
-	_BlurQuad.Uv0 = CUV(0.f, 0.f);
-	_BlurQuad.Uv1 = CUV(1.f, 0.f);
-	_BlurQuad.Uv2 = CUV(1.f, 1.f);
-	_BlurQuad.Uv3 = CUV(0.f, 1.f);
+	if (drv->textureCoordinateAlternativeMode())
+	{
+		_BlurQuad.Uv0 = CUV(0.f, 1.f);
+		_BlurQuad.Uv1 = CUV(1.f, 1.f);
+		_BlurQuad.Uv2 = CUV(1.f, 0.f);
+		_BlurQuad.Uv3 = CUV(0.f, 0.f);
+	}
+	else
+	{
+		_BlurQuad.Uv0 = CUV(0.f, 0.f);
+		_BlurQuad.Uv1 = CUV(1.f, 0.f);
+		_BlurQuad.Uv2 = CUV(1.f, 1.f);
+		_BlurQuad.Uv3 = CUV(0.f, 1.f);
+	}
 
 	_Init = true;
 }
@@ -395,20 +408,30 @@ void CBloomEffect::doBlur(bool horizontalBlur)
 	// set several decal constants in order to obtain in the render target texture a mix of color
 	// of a texel and its neighbored texels on the axe of the pass.
 	float decalL, decal2L, decalR, decal2R;
-	// if(_InitBloomEffect)
-	// {
+	if (drvInternal->textureCoordinateAlternativeMode())
+	{
+		if (horizontalBlur)
+		{
+			decalL = 0.5f;
+			decal2L = -0.5f;
+			decalR = 1.5f;
+			decal2R = 2.5f;
+		}
+		else
+		{
+			decalL = 0.0f;
+			decal2L = -1.0f;
+			decalR = 1.0f;
+			decal2R = 2.0f;
+		}
+	}
+	else
+	{
 		decalL = -0.5f;
 		decal2L = -1.5f;
 		decalR = 0.5f;
 		decal2R = 1.5f;
-	// }
-	// else
-	// {
-	//	decalL = 0.f;
-	//	decal2L = -1.f;
-	//	decalR = 1.f;
-	//	decal2R = 2.f;
-	// }
+	}
 	drvInternal->setUniform2f(IDriver::VertexProgram, 10, (decalR/(float)_BlurWidth)*blurVec.x,		(decalR/(float)_BlurHeight)*blurVec.y);
 	drvInternal->setUniform2f(IDriver::VertexProgram, 11, (decal2R/(float)_BlurWidth)*blurVec.x,		(decal2R/(float)_BlurHeight)*blurVec.y);
 	drvInternal->setUniform2f(IDriver::VertexProgram, 12, (decalL/(float)_BlurWidth)*blurVec.x,		(decalL/(float)_BlurHeight)*blurVec.y);
diff --git a/code/nel/src/3d/driver.cpp b/code/nel/src/3d/driver.cpp
index 2bfb0ea1f..134c24410 100644
--- a/code/nel/src/3d/driver.cpp
+++ b/code/nel/src/3d/driver.cpp
@@ -32,7 +32,7 @@ namespace NL3D
 {
 
 // ***************************************************************************
-const uint32 IDriver::InterfaceVersion = 0x6d; // gpu program interface
+const uint32 IDriver::InterfaceVersion = 0x6e; // gpu program interface
 
 // ***************************************************************************
 IDriver::IDriver() : _SyncTexDrvInfos( "IDriver::_SyncTexDrvInfos" )
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.h b/code/nel/src/3d/driver/direct3d/driver_direct3d.h
index 8b8ac62df..039b6f3ed 100644
--- a/code/nel/src/3d/driver/direct3d/driver_direct3d.h
+++ b/code/nel/src/3d/driver/direct3d/driver_direct3d.h
@@ -944,6 +944,7 @@ public:
 	virtual ITexture		*getRenderTarget() const;
 	virtual bool			copyTargetToTexture (ITexture *tex, uint32 offsetx, uint32 offsety, uint32 x, uint32 y, uint32 width,
 													uint32 height, uint32 mipmapLevel);
+	virtual bool			textureCoordinateAlternativeMode() const { return true; };
 	virtual bool			getRenderTargetSize (uint32 &width, uint32 &height);
 	virtual bool			fillBuffer (CBitmap &bitmap);
 
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.h b/code/nel/src/3d/driver/opengl/driver_opengl.h
index 67a5895dc..c4540b9da 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl.h
+++ b/code/nel/src/3d/driver/opengl/driver_opengl.h
@@ -572,6 +572,8 @@ public:
 	virtual bool			copyTargetToTexture (ITexture *tex, uint32 offsetx, uint32 offsety, uint32 x, uint32 y,
 													uint32 width, uint32 height, uint32 mipmapLevel);
 
+	virtual bool			textureCoordinateAlternativeMode() const { return false; };
+
 	virtual bool			getRenderTargetSize (uint32 &width, uint32 &height);