From 20b3d56987ca7b7a9d7f27b0a32a93f12e8dc530 Mon Sep 17 00:00:00 2001 From: cutealien Date: Fri, 12 Jun 2020 20:41:49 +0000 Subject: 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 --- examples/Demo/CDemo.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'examples/Demo/CDemo.cpp') diff --git a/examples/Demo/CDemo.cpp b/examples/Demo/CDemo.cpp index 49dd7b6..6c073ab 100644 --- a/examples/Demo/CDemo.cpp +++ b/examples/Demo/CDemo.cpp @@ -497,6 +497,7 @@ void CDemo::loadSceneData() bill = sm->addBillboardSceneNode(0, core::dimension2d(100,100), waypoint[r]+ core::vector3df(0,20,0)); bill->setMaterialFlag(video::EMF_LIGHTING, false); + bill->setMaterialFlag(video::EMF_ZWRITE_ENABLE, false); bill->setMaterialTexture(0, driver->getTexture(mediaPath + "portal1.bmp")); bill->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR); bill->addAnimator(anim); @@ -583,7 +584,7 @@ void CDemo::createLoadingScreen() const io::path mediaPath = getExampleMediaPath(); // irrlicht logo - device->getGUIEnvironment()->addImage(device->getVideoDriver()->getTexture(mediaPath + "irrlichtlogo2.png"), + device->getGUIEnvironment()->addImage(device->getVideoDriver()->getTexture(mediaPath + "irrlichtlogo3.png"), core::position2d(5,5)); // loading text @@ -648,8 +649,8 @@ void CDemo::shoot() else { // doesnt collide with wall - core::vector3df start = camera->getPosition(); - core::vector3df end = (camera->getTarget() - start); + start = camera->getPosition(); + end = (camera->getTarget() - start); end.normalize(); start += end*8.0f; end = start + (end * camera->getFarValue()); -- cgit v1.2.3