freeminer
/
irrlicht-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Just some cleanup. 

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4662 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2014-01-13 14:34:59 +00:00
parent f2c944ec0f
commit 6b5d98ac07
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/27.HelloWorld_Android/android_tools.cpp
View File

@ -1,3 +1,6 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "android_tools.h"
namespace irr

10
examples/27.HelloWorld_Android/main.cpp
View File

@ -135,7 +135,7 @@ int run ( IrrlichtDevice *device )
{
stringw str = L"FPS: ";
str += (s32)device->getVideoDriver()->getFPS();
// stat->setText ( str.c_str() );
stat->setText ( str.c_str() );
}
}
device->yield(); // probably nicer to the battery
@ -184,6 +184,7 @@ int example_helloworld(android_app* app)
if (font)
skin->setFont(font);
// A field to show some text. Comment out stat->setText in run() if you want to see the dpi instead of the fps.
IGUIStaticText *text = guienv->addStaticText(stringw(displayMetrics.xdpi).c_str(),
rect<s32>(15,15,300,60), false, false, 0, GUI_INFO_FPS );
@ -194,8 +195,9 @@ int example_helloworld(android_app* app)
if ( logo && logo->getRelativePosition().getWidth() < minLogoWidth )
{
// Scale to make it better visible on high-res devices
// We could also work with displayMetrics.widthPixels, but it's generally better to work with the windowWidth which already subtract
// We could also work with displayMetrics.widthPixels, but it's generally better to work with the windowWidth which already subtracts
// things like a taskbar which your device might have.
// Even better would be using dpi here - but when we would miss an example of how to access nativeWindow ;-)
logo->setScaleImage(true);
core::rect<s32> logoPos(logo->getRelativePosition());
f32 scale = (f32)minLogoWidth/(f32)logoPos.getWidth();
@ -236,8 +238,12 @@ int example_helloworld(android_app* app)
*/
smgr->addCameraSceneNode(0, vector3df(0,30,-40), vector3df(0,5,0));
/*
Mainloop. Application never quit themself in Android. The OS is responsible for that.
*/
run(device);
/* Cleanup */
device->setEventReceiver(0);
device->closeDevice();
device->drop();