minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-06-28 14:26:06 +02:00
Code Issues Projects Releases Wiki Activity

Merging r6128 through r6139 from trunk to ogl-es branch.

Browse Source 
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
This commit is contained in:
cutealien
2020-09-29 20:22:28 +00:00
parent 048aa500b9
commit 8b9947f9f6
15 changed files with 107 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/Demo/CDemo.cpp
View File

@ -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
}
}