Fixed logo position and image extension recognition. Added supported formats to window text.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@1015 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
parent
5a3afd7336
commit
c37e24c8c9
@ -76,10 +76,13 @@ void loadModel(const c8* fn)
|
||||
|
||||
// if a texture is loaded apply it to the current model..
|
||||
if ( extension == ".jpg" ||
|
||||
extension == ".png" ||
|
||||
extension == ".tga" ||
|
||||
extension == ".pcx" ||
|
||||
extension == ".png" ||
|
||||
extension == ".ppm" ||
|
||||
extension == ".pgm" ||
|
||||
extension == ".pbm" ||
|
||||
extension == ".psd" ||
|
||||
extension == ".tga" ||
|
||||
extension == ".bmp"
|
||||
)
|
||||
{
|
||||
@ -664,7 +667,7 @@ int main()
|
||||
// load the irrlicht engine logo
|
||||
IGUIImage *img =
|
||||
env->addImage(driver->getTexture("irrlichtlogo2.png"),
|
||||
core::position2d<s32>(10, driver->getScreenSize().Height - 64));
|
||||
core::position2d<s32>(10, driver->getScreenSize().Height - 128));
|
||||
|
||||
// lock the logo's edges to the bottom left corner of the screen
|
||||
img->setAlignment(EGUIA_UPPERLEFT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT);
|
||||
|
@ -7,8 +7,10 @@ This program is able to load and display all 3D geometry and models the Irrlicht
|
||||
Controls: Left mouse to rotate, right mouse to move, both buttons to zoom. Escape to Stop FPS Camera
|
||||
|
||||
Supported formats are:
|
||||
- Irrlicht scene and mesh formats (.irr, .irrmesh, .xml)
|
||||
- 3D Studio (.3ds)
|
||||
- COLLADA (.dae, .xml)
|
||||
- Blitz3D (.b3d)
|
||||
- COLLADA 1.2/1.3 (.dae, .xml)
|
||||
- Cartography shop 4 (.csm)
|
||||
- DirectX (.x)
|
||||
- DeleD (.dmf)
|
||||
@ -16,9 +18,11 @@ Supported formats are:
|
||||
- Milkshape (.ms3d)
|
||||
- My3D (.my3D)
|
||||
- OCT (.oct)
|
||||
- Ogre3d (.mesh)
|
||||
- Pulsar LMTools (.lmts)
|
||||
- Quake 3 levels (.bsp)
|
||||
- Quake 2 models (.md2)
|
||||
- Stereolithography format (.stl)
|
||||
|
||||
Please note that this program is also a demo of the user interface capabilities of the engine, so for example the combo box in the toolbar has no function.
|
||||
</messageText>
|
||||
|
Loading…
x
Reference in New Issue
Block a user