From 8b9947f9f6e5444eb34f42eecfa5b4cfdeed25d8 Mon Sep 17 00:00:00 2001 From: cutealien Date: Tue, 29 Sep 2020 20:22:28 +0000 Subject: Merging r6128 through r6139 from trunk to ogl-es branch. Note: I could not merge 2 OSX project files as I'm not sure how to correctly resolve their conflicts. Maybe old version for those files are still OK, as ogl-es branch got updated once before (leaving trunk behind). In case it causes problems I hope someone can send another patch for those 2 files: source/Irrlicht/Irrlicht.xcodeproj/xcshareddata/xcschemes source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6140 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 6c073ab..b50b6d3 100644 --- a/examples/Demo/CDemo.cpp +++ b/examples/Demo/CDemo.cpp @@ -424,12 +424,13 @@ void CDemo::loadSceneData() model1->setPosition(core::vector3df(100,40,-80)); model1->setScale(core::vector3df(2,2,2)); model1->setMD2Animation(scene::EMAT_STAND); - model1->setMaterialFlag(video::EMF_LIGHTING, false); + model1->setMaterialFlag(video::EMF_LIGHTING, true); + model1->getMaterial(0).Shininess = 40.f; model1->setMaterialFlag(video::EMF_NORMALIZE_NORMALS, true); model1->setMaterialType(video::EMT_SPHERE_MAP); model1->setAutomaticCulling(scene::EAC_OFF); // avoid shadows not updating scene::IShadowVolumeSceneNode * shadVol = model1->addShadowVolumeSceneNode(); - shadVol->setOptimization(scene::ESV_NONE); // Sydney has broken shadows otherwise + if(shadVol) shadVol->setOptimization(scene::ESV_NONE); // Sydney has broken shadows otherwise } model2 = sm->addAnimatedMeshSceneNode(mesh); @@ -443,7 +444,7 @@ void CDemo::loadSceneData() model2->setMaterialFlag(video::EMF_NORMALIZE_NORMALS, true); model2->setAutomaticCulling(scene::EAC_OFF); // avoid shadows not updating scene::IShadowVolumeSceneNode * shadVol = model2->addShadowVolumeSceneNode(); - shadVol->setOptimization(scene::ESV_NONE); // Sydney has broken shadows otherwise + if (shadVol) shadVol->setOptimization(scene::ESV_NONE); // Sydney has broken shadows otherwise } } -- cgit v1.2.3