Merging r6145 through r6171 from trunk to ogl-es branch

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6172 dfc29bdd-3216-0410-991c-e03cc46cb475
2025-06-28 06:20:21 +02:00 · 2020-12-19 15:03:11 +00:00
parent 01920bf808
commit fa0b1cb509
117 changed files with 8063 additions and 6758 deletions
--- a/tests/flyCircleAnimator.cpp
+++ b/tests/flyCircleAnimator.cpp
@ -48,7 +48,7 @@ bool flyCircleAnimator(void)
 	{
 		smgr->drawAll();
 		driver->endScene();
-		result = takeScreenshotAndCompareAgainstReference(driver, "-flyCircleAnimator.png", 100);
+		result = takeScreenshotAndCompareAgainstReference(driver, "-flyCircleAnimator.png");
 	}

 	device->closeDevice();
--- a/Video-2dmatFilter.png
+++ b/Video-2dmatFilter.png
--- a/Video-ambient-lighting.png
+++ b/Video-ambient-lighting.png
--- a/Video-draw2DImage4cFilter.png
+++ b/Video-draw2DImage4cFilter.png
--- a/tests/media/Burning's
+++ b/tests/media/Burning's
--- a/Video-multiTexture.png
+++ b/Video-multiTexture.png
--- a/tests/media/Burning's
+++ b/tests/media/Burning's
--- a/Video-planeMatrix-scaledClip.png
+++ b/Video-planeMatrix-scaledClip.png
--- a/Video-renderMipmap.png
+++ b/Video-renderMipmap.png
--- a/Video-stencilShadow.png
+++ b/Video-stencilShadow.png
--- a/tests/media/Burning's
+++ b/tests/media/Burning's
--- a/Video-terrainSceneNode-1.png
+++ b/Video-terrainSceneNode-1.png
--- a/Video-terrainSceneNode-2.png
+++ b/Video-terrainSceneNode-2.png
--- a/Video-testGeometryCreator.png
+++ b/Video-testGeometryCreator.png
--- a/Video-testTerrainMesh.png
+++ b/Video-testTerrainMesh.png
--- a/Video-textureMatrix2.png
+++ b/Video-textureMatrix2.png
--- a/Video-textureRenderStates.png
+++ b/Video-textureRenderStates.png
--- a/Video-writeImageToFile.png
+++ b/Video-writeImageToFile.png
--- a/tests/tests-last-passed-at.txt
+++ b/tests/tests-last-passed-at.txt
@ -1,4 +1,4 @@
 Tests finished. 72 tests of 72 passed.
-Compiled as RELEASE
-Test suite pass at GMT Sun Oct 25 15:03:26 2020
+Compiled as DEBUG
+Test suite pass at GMT Tue Dec 01 13:34:31 2020