Moved the driver dimension restrictions (multiple of two) from the windows...

Moved the driver dimension restrictions (multiple of two) from the windows device into the software drivers.
Added OpenGL 2D drawing accuracy patch by tuXXX.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@850 dfc29bdd-3216-0410-991c-e03cc46cb475

changes.txt

 Changes in version 1.4 (... 2007)
 
+ - OpenGL 2D drawing accuracy fix by tuXXX
+
  - Added OnResize and getCurrentRenderTargetSize to the software video drivers.
 
  - Added Spot light type for dynamic lights. Note that both position and direction for all dynamic lights are now determined by the LightSceneNode, the SLight attributes are only used for internal purposes.

source/Irrlicht/CIrrDeviceWin32.cpp

@@ -600,12 +600,6 @@ void CIrrDeviceWin32::resizeIfNecessary()
 		sprintf(tmp, "Resizing window (%ld %ld)", r.right, r.bottom);
 		os::Printer::log(tmp);
 
-		if ( r.right % 2 )
-			r.right += 1;
-
-		if ( r.bottom % 2 )
-			r.bottom += 1;
-
 		getVideoDriver()->OnResize(irr::core::dimension2d<irr::s32>(r.right, r.bottom));
 	}
 

source/Irrlicht/CSoftwareDriver.cpp

@@ -732,18 +732,29 @@ void CSoftwareDriver::createPlanes(const core::matrix4& mat)
 //! the window was resized.
 void CSoftwareDriver::OnResize(const core::dimension2d<s32>& size)
 {
-	if (ViewPort.getWidth() == ScreenSize.Width &&
-		ViewPort.getHeight() == ScreenSize.Height)
-		ViewPort = core::rect<s32>(core::position2d<s32>(0,0), size);
+	// make sure width and height are multiples of 2
+	core::dimension2d<s32> realSize(size);
 
-	if (ScreenSize != size)
+	if (realSize.Width % 2)
+		realSize.Width += 1;
+
+	if (realSize.Height % 2)
+		realSize.Height += 1;
+
+	if (ScreenSize != realSize)
 	{
-		ScreenSize = size;
+		if (ViewPort.getWidth() == ScreenSize.Width &&
+			ViewPort.getHeight() == ScreenSize.Height)
+		{
+			ViewPort = core::rect<s32>(core::position2d<s32>(0,0), realSize);
+		}
+
+		ScreenSize = realSize;
 
 		bool resetRT = (RenderTargetSurface == BackBuffer);
 
 		BackBuffer->drop();
-		BackBuffer = new CImage(ECF_A1R5G5B5, size);
+		BackBuffer = new CImage(ECF_A1R5G5B5, realSize);
 
 		if (resetRT)
 			setRenderTarget(BackBuffer);

source/Irrlicht/CSoftwareDriver2.cpp

@@ -299,7 +299,7 @@ bool CSoftwareDriver2::queryFeature(E_VIDEO_DRIVER_FEATURE feature)
 
 	default:
 		return false;
-	};
+	}
 }
 
 
@@ -378,10 +378,8 @@ bool CSoftwareDriver2::setTexture(u32 stage, video::ITexture* texture)
 	if (Texture[stage])
 		Texture[stage]->grab();
 
-	if ( Texture[stage] )
-	{
+	if (Texture[stage])
 		Texmap[stage].Texture = (video::CSoftwareTexture2*) Texture[stage];
-	}
 
 	setCurrentShader();
 	return true;
@@ -464,7 +462,6 @@ bool CSoftwareDriver2::setRenderTarget(video::ITexture* texture, bool clearBackB
 	else
 	{
 		setRenderTarget(BackBuffer);
-		//setRenderTarget((video::CImage*)0);
 	}
 
 	if (RenderTargetSurface && (clearBackBuffer || clearZBuffer))
@@ -1629,18 +1626,29 @@ void CSoftwareDriver2::draw2DRectangle(SColor color, const core::rect<s32>& pos,
 //! the window was resized.
 void CSoftwareDriver2::OnResize(const core::dimension2d<s32>& size)
 {
-	if (ViewPort.getWidth() == ScreenSize.Width &&
-		ViewPort.getHeight() == ScreenSize.Height)
-		ViewPort = core::rect<s32>(core::position2d<s32>(0,0), size);
+	// make sure width and height are multiples of 2
+	core::dimension2d<s32> realSize(size);
+
+	if (realSize.Width % 2)
+		realSize.Width += 1;
 
-	if (ScreenSize != size)
+	if (realSize.Height % 2)
+		realSize.Height += 1;
+
+	if (ScreenSize != realSize)
 	{
-		ScreenSize = size;
+		if (ViewPort.getWidth() == ScreenSize.Width &&
+			ViewPort.getHeight() == ScreenSize.Height)
+		{
+			ViewPort = core::rect<s32>(core::position2d<s32>(0,0), realSize);
+		}
+
+		ScreenSize = realSize;
 
 		bool resetRT = (RenderTargetSurface == BackBuffer);
 
 		BackBuffer->drop();
-		BackBuffer = new CImage(ECF_SOFTWARE2, size);
+		BackBuffer = new CImage(ECF_SOFTWARE2, realSize);
 
 		if (resetRT)
 			setRenderTarget(BackBuffer);