Merging r6075 through r6106 from trunk to ogl-es branch.

Burnings renderer changes.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6116 dfc29bdd-3216-0410-991c-e03cc46cb475

1 files changed, 5 insertions, 3 deletions

diff --git a/examples/16.Quake3MapShader/main.cpp b/examples/16.Quake3MapShader/main.cpp
index e8a318d..38062c5 100644
--- a/examples/16.Quake3MapShader/main.cpp
+++ b/examples/16.Quake3MapShader/main.cpp
@@ -318,7 +318,7 @@ int IRRCALLCONV main(int argc, char* argv[])
 	device->getCursorControl()->setVisible(false);

 

 	// load the engine logo

-	gui->addImage(driver->getTexture("irrlichtlogo2.png"),

+	gui->addImage(driver->getTexture("irrlichtlogo3.png"),

 			core::position2d<s32>(10, 10));

 

 	// show the driver logo

@@ -335,6 +335,8 @@ int IRRCALLCONV main(int argc, char* argv[])
 		case video::EDT_DIRECT3D9:

 			gui->addImage(driver->getTexture("directxlogo.png"), pos);

 			break;

+		default:

+			break;

 	}

 

 	/*

@@ -355,14 +357,14 @@ int IRRCALLCONV main(int argc, char* argv[])
 		driver->endScene();

 

 		int fps = driver->getFPS();

-		//if (lastFPS != fps)

+		if (1 || lastFPS != fps)

 		{

-			io::IAttributes * const attr = smgr->getParameters();

 			core::stringw str = L"Q3 [";

 			str += driver->getName();

 			str += "] FPS:";

 			str += fps;

 #ifdef _IRR_SCENEMANAGER_DEBUG			

+			io::IAttributes * const attr = smgr->getParameters();

 			str += " Cull:";

 			str += attr->getAttributeAsInt("calls");

 			str += "/";