Fix OpenGL texture matrix setup, found by pc0de. Sorry for the inconvenience,...

Fix OpenGL texture matrix setup, found by pc0de. Sorry for the inconvenience, was probably very late when I changed that code.

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

source/Irrlicht/COpenGLDriver.cpp

@@ -919,15 +919,13 @@ void COpenGLDriver::setTransform(E_TRANSFORMATION_STATE state, const core::matri
 			if (!isRTT && mat.isIdentity() )
 				glLoadIdentity();
 			else
-			{
-				if (isRTT)
 			{
 				GLfloat glmat[16];
+				if (isRTT)
 					createGLTextureMatrix(glmat, mat * TextureFlipMatrix);
-					glLoadMatrixf(glmat);
-				}
 				else
-					glLoadMatrixf(mat.pointer());
+					createGLTextureMatrix(glmat, mat);
+				glLoadMatrixf(glmat);
 			}
 			break;
 		}

tests/tests-last-passed-at.txt

 Tests finished. 59 tests of 59 passed.
 Compiled as DEBUG
-Test suite pass at GMT Tue Dec 21 16:26:07 2010
+Test suite pass at GMT Tue Dec 28 19:10:59 2010
 

tests/textureRenderStates.cpp

@@ -147,11 +147,7 @@ static bool renderAndRemove(video::E_DRIVER_TYPE driverType)
 
 static bool testTextureMatrixInMixedScenes(video::E_DRIVER_TYPE driverType)
 {
-	SIrrlichtCreationParameters cp;
-	cp.DriverType = driverType;
-	cp.WindowSize = dimension2du(160,120);
-
-	irr::IrrlichtDevice* device = createDeviceEx(cp);
+	irr::IrrlichtDevice* device = createDevice(driverType, dimension2du(160,120));
 	if (!device)
 		return true;
 
@@ -194,6 +190,62 @@ static bool testTextureMatrixInMixedScenes(video::E_DRIVER_TYPE driverType)
 	return result;
 } 
 
+// animated texture matrix test.
+static bool textureMatrix(video::E_DRIVER_TYPE driverType)
+{
+	irr::IrrlichtDevice* device = createDevice(driverType, dimension2du(160,120));
+	if (!device)
+		return true;
+
+	video::IVideoDriver* driver = device->getVideoDriver();
+	scene::ISceneManager* sceneManager = device->getSceneManager();
+
+	scene::ICameraSceneNode* camera = sceneManager->addCameraSceneNode();
+	camera->setPosition(vector3df(0,0,-10));
+
+	// set up plane mesh to face the camera
+	scene::IMesh* mesh = sceneManager->getGeometryCreator()->createPlaneMesh(dimension2df(150,150), core::dimension2du(1,1),0,core::dimension2df(1,1));
+	scene::IMeshSceneNode* node = sceneManager->addMeshSceneNode(mesh, 0, -1, vector3df(0, 0, 150), vector3df(-90, 0, 0));
+	if (mesh)
+		mesh->drop();
+
+	// set the hillplane material texture & save a reference
+	// to the texture matrix.
+	video::SMaterial& material = node->getMaterial(0);
+	video::ITexture* tex = driver->getTexture("../media/water.jpg");
+
+	material.setTexture(0,tex);
+	material.setFlag(video::EMF_LIGHTING,false);
+	matrix4& textureMatrix = material.TextureLayer[0].getTextureMatrix();
+
+	const vector2df rcenter, scale(1.f, 1.f);
+	vector2df trans;
+
+	trans.X += 0.0005f;
+	textureMatrix.buildTextureTransform(0.f, rcenter, trans, scale);
+
+	driver->beginScene(true, true, video::SColor(255,100,101,140));
+	sceneManager->drawAll();
+	driver->endScene();
+
+	bool result = takeScreenshotAndCompareAgainstReference(driver, "-textureMatrix.png");
+
+	trans.X += 0.45f;
+	textureMatrix.buildTextureTransform(0.f, rcenter, trans, scale);
+
+	driver->beginScene(true, true, video::SColor(255,100,101,140));
+	sceneManager->drawAll();
+	driver->endScene();
+
+	result &= takeScreenshotAndCompareAgainstReference(driver, "-textureMatrix2.png");
+
+	device->closeDevice();
+	device->run();
+	device->drop();
+
+	return result;
+}
+
 bool textureRenderStates(void)
 {
 	bool passed = true;
@@ -222,6 +274,9 @@ bool textureRenderStates(void)
 	passed &= manyTextures(video::EDT_DIRECT3D9);
 	passed &= manyTextures(video::EDT_DIRECT3D8);
 
+	passed &= textureMatrix(video::EDT_OPENGL);
+	passed &= textureMatrix(video::EDT_DIRECT3D9);
+
 	return passed;
 }