Commit d4c81c44 authored by hybrid's avatar hybrid

Merged from 1.7 branch, revisions 3358-3364. This was the revert of the win32...

Merged from 1.7 branch, revisions 3358-3364. This was the revert of the win32 device change, which caused most test fails, and a few test updates. Moreover, updated the reference screenshots for burnings video tests. These all seemed to be correct (just the lights test was a little strong?)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3365 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 3c0e2b82
......@@ -582,8 +582,8 @@ CIrrDeviceWin32::CIrrDeviceWin32(const SIrrlichtCreationParameters& params)
HWnd = CreateWindow( ClassName, __TEXT(""), style, windowLeft, windowTop,
realWidth, realHeight, NULL, NULL, hInstance, NULL);
CreationParams.WindowId = HWnd;
CreationParams.WindowSize.Width = realWidth;
CreationParams.WindowSize.Height = realHeight;
// CreationParams.WindowSize.Width = realWidth;
// CreationParams.WindowSize.Height = realHeight;
ShowWindow(HWnd, SW_SHOW);
UpdateWindow(HWnd);
......
......@@ -11,13 +11,13 @@ using namespace video;
/** Tests the offset capability of the fly circle animator */
bool flyCircleAnimator(void)
{
IrrlichtDevice *device = createDevice(video::EDT_BURNINGSVIDEO,
IrrlichtDevice *device = createDevice(video::EDT_BURNINGSVIDEO,
core::dimension2du(160,120), 32);
if (!device)
return false;
if (!device)
return false;
IVideoDriver* driver = device->getVideoDriver();
ISceneManager* smgr = device->getSceneManager();
IVideoDriver* driver = device->getVideoDriver();
ISceneManager* smgr = device->getSceneManager();
const f32 offsetDegrees[] = { 0.f, 45.f, 135.f, 270.f };
......@@ -25,10 +25,9 @@ bool flyCircleAnimator(void)
{
IBillboardSceneNode * node = smgr->addBillboardSceneNode();
// Have the animator rotate around the Z axis plane, rather than the default Y axis
ISceneNodeAnimator * animator =
smgr->createFlyCircleAnimator(vector3df(0, 0, 0), 30.f,
0.001f, vector3df(0, 0, 1),
(offsetDegrees[i] / 360.f));
ISceneNodeAnimator * animator = smgr->createFlyCircleAnimator(
vector3df(0, 0, 0), 30.f, 0.001f,
vector3df(0, 0, 1), (offsetDegrees[i] / 360.f));
if(!node || !animator)
return false;
......@@ -44,7 +43,7 @@ bool flyCircleAnimator(void)
bool result = false;
// Don't do device->run() since I need the time to remain at 0.
// Don't do device->run() since I need the time to remain at 0.
if (driver->beginScene(true, true, video::SColor(0, 80, 80, 80)))
{
smgr->drawAll();
......@@ -52,7 +51,8 @@ bool flyCircleAnimator(void)
result = takeScreenshotAndCompareAgainstReference(driver, "-flyCircleAnimator.png", 100);
}
device->drop();
device->drop();
return result;
return result;
}
<?xml version="1.0"?>
<root>
<element_position id1="152722522" id2="3" x="301" y="118" />
</root>
......@@ -159,8 +159,8 @@ bool testXML(void)
result &= simple_xml(device->getFileSystem());
logTestString("Test XML reader CDATA support.\n");
result &= cdata(device->getFileSystem());
// logTestString("Test XML reader attribute support.\n");
// result &= attributeValues(device->getFileSystem()); // TODO: this bug is still open!
logTestString("Test XML reader attribute support.\n");
result &= attributeValues(device->getFileSystem());
device->drop();
return result;
......
Tests finished. 1 test of 1 passed.
Compiled as DEBUG
Test suite pass at GMT Sun Jul 18 12:05:54 2010
Tests finished. 55 tests of 55 passed.
Compiled as DEBUG
Test suite pass at GMT Sun Jul 18 15:41:35 2010
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment