Commit ebf823a8 authored by hybrid's avatar hybrid

Fixed logo position and image extension recognition. Added supported formats to window text.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1015 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 4f17b1d0
...@@ -76,10 +76,13 @@ void loadModel(const c8* fn) ...@@ -76,10 +76,13 @@ void loadModel(const c8* fn)
// if a texture is loaded apply it to the current model.. // if a texture is loaded apply it to the current model..
if ( extension == ".jpg" || if ( extension == ".jpg" ||
extension == ".png" ||
extension == ".tga" ||
extension == ".pcx" || extension == ".pcx" ||
extension == ".png" ||
extension == ".ppm" ||
extension == ".pgm" ||
extension == ".pbm" ||
extension == ".psd" || extension == ".psd" ||
extension == ".tga" ||
extension == ".bmp" extension == ".bmp"
) )
{ {
...@@ -664,7 +667,7 @@ int main() ...@@ -664,7 +667,7 @@ int main()
// load the irrlicht engine logo // load the irrlicht engine logo
IGUIImage *img = IGUIImage *img =
env->addImage(driver->getTexture("irrlichtlogo2.png"), 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 // lock the logo's edges to the bottom left corner of the screen
img->setAlignment(EGUIA_UPPERLEFT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT); img->setAlignment(EGUIA_UPPERLEFT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT);
......
<?xml version="1.0"?> <?xml version="1.0"?>
<config> <config>
<!--This is a config file for the Irrlicht Engine Mesh Viewer.--> <!--This is a config file for the Irrlicht Engine Mesh Viewer.-->
<startUpModel file="dwarf.x" /> <startUpModel file="dwarf.x" />
<messageText caption="Irrlicht Engine Mesh Viewer">Welcome to the Mesh Viewer of the &quot;Irrlicht Engine&quot;!. <messageText caption="Irrlicht Engine Mesh Viewer">Welcome to the Mesh Viewer of the &quot;Irrlicht Engine&quot;!.
This program is able to load and display all 3D geometry and models the Irrlicht Engine can. This program is able to load and display all 3D geometry and models the Irrlicht Engine can.
Controls: Left mouse to rotate, right mouse to move, both buttons to zoom. Escape to Stop FPS Camera Controls: Left mouse to rotate, right mouse to move, both buttons to zoom. Escape to Stop FPS Camera
Supported formats are: Supported formats are:
- Irrlicht scene and mesh formats (.irr, .irrmesh, .xml)
- 3D Studio (.3ds) - 3D Studio (.3ds)
- COLLADA (.dae, .xml) - Blitz3D (.b3d)
- COLLADA 1.2/1.3 (.dae, .xml)
- Cartography shop 4 (.csm) - Cartography shop 4 (.csm)
- DirectX (.x) - DirectX (.x)
- DeleD (.dmf) - DeleD (.dmf)
...@@ -16,10 +18,12 @@ Supported formats are: ...@@ -16,10 +18,12 @@ Supported formats are:
- Milkshape (.ms3d) - Milkshape (.ms3d)
- My3D (.my3D) - My3D (.my3D)
- OCT (.oct) - OCT (.oct)
- Ogre3d (.mesh)
- Pulsar LMTools (.lmts) - Pulsar LMTools (.lmts)
- Quake 3 levels (.bsp) - Quake 3 levels (.bsp)
- Quake 2 models (.md2) - 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. 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> </messageText>
</config> </config>
\ No newline at end of file
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