luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6288 through r6336 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6337 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2022-04-15 18:51:09 +00:00
parent 67469c8899
commit 2d63fdba3d
115 changed files with 1828 additions and 1154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/makeColorKeyTexture.cpp
View File

@@ -27,12 +27,12 @@ static bool doTestWith(E_DRIVER_TYPE driverType,
cube->setMaterialTexture(0, driver->getTexture("../media/wall.bmp"));
cube->setMaterialFlag(video::EMF_LIGHTING, false);
ITexture * Texture = device->getVideoDriver()->getTexture("../media/portal2.bmp");
ITexture * texture = device->getVideoDriver()->getTexture("../media/portal2.bmp");
device->getVideoDriver()->makeColorKeyTexture(Texture,
device->getVideoDriver()->makeColorKeyTexture(texture,
position2d<s32>(64,64),
zeroTexels);
device->getVideoDriver()->makeColorKeyTexture(Texture,
device->getVideoDriver()->makeColorKeyTexture(texture,
position2d<s32>(64,64),
zeroTexels);
(void)smgr->addCameraSceneNode();
@@ -40,9 +40,9 @@ static bool doTestWith(E_DRIVER_TYPE driverType,
driver->beginScene(video::ECBF_COLOR | video::ECBF_DEPTH, SColor(255,100,101,140));
smgr->drawAll();
driver->draw2DImage(Texture,
driver->draw2DImage(texture,
position2di(40, 40),
rect<s32>(0, 0, Texture->getSize().Width, Texture->getSize().Height),
recti(texture->getOriginalSize()),
0,
SColor(255,255,255,255),
true);