MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
hybrid 2007-10-01 08:59:15 +00:00
parent 4f17b1d093
commit ebf823a832
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/09.Meshviewer/main.cpp
View File

@ -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);

10
media/config.xml
View File

@ -1,14 +1,16 @@
<?xml version="1.0"?>
<config>
<!--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;!.
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
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,10 +18,12 @@ 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>
</config>
</config>